770 files changed, 68375 insertions, 116183 deletions

diff --git a/cpp/src/Freeze/.depend.mak b/cpp/src/Freeze/.depend.mak
deleted file mode 100755
index 0f96c3f9385..00000000000
--- a/cpp/src/Freeze/.depend.mak
+++ /dev/null
@@ -1,2956 +0,0 @@
-
-BackgroundSaveEvictor.h: \
-    "$(slicedir)\Freeze\BackgroundSaveEvictor.ice" \
-    "$(slicedir)/Freeze/Evictor.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ServantLocator.ice" \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Freeze/Exception.ice"
-
-CatalogData.h: \
-    "$(slicedir)\Freeze\CatalogData.ice"
-
-Connection.h: \
-    "$(slicedir)\Freeze\Connection.ice" \
-    "$(slicedir)/Freeze/Transaction.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/CommunicatorF.ice"
-
-ConnectionF.h: \
-    "$(slicedir)\Freeze\ConnectionF.ice"
-
-DB.h: \
-    "$(slicedir)\Freeze\DB.ice"
-
-Evictor.h: \
-    "$(slicedir)\Freeze\Evictor.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ServantLocator.ice" \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Freeze/Exception.ice"
-
-EvictorF.h: \
-    "$(slicedir)\Freeze\EvictorF.ice"
-
-EvictorStorage.h: \
-    "$(slicedir)\Freeze\EvictorStorage.ice" \
-    "$(slicedir)/Ice/Identity.ice"
-
-Exception.h: \
-    "$(slicedir)\Freeze\Exception.ice"
-
-Transaction.h: \
-    "$(slicedir)\Freeze\Transaction.ice"
-
-TransactionalEvictor.h: \
-    "$(slicedir)\Freeze\TransactionalEvictor.ice" \
-    "$(slicedir)/Freeze/Evictor.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ServantLocator.ice" \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Freeze/Exception.ice"
-
-PingObject.h: \
-    PingObject.ice
-
-BackgroundSaveEvictorI.obj: \
-	BackgroundSaveEvictorI.cpp \
-    "BackgroundSaveEvictorI.h" \
-    "EvictorI.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ObjectStore.h" \
-    "$(includedir)\Freeze\EvictorStorage.h" \
-    "TransactionI.h" \
-    "EvictorIteratorI.h" \
-    "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "Util.h" \
-
-Catalog.obj: \
-	Catalog.cpp \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-
-CatalogIndexList.obj: \
-	CatalogIndexList.cpp \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Freeze\CatalogIndexList.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-
-ConnectionI.obj: \
-	ConnectionI.cpp \
-    "ConnectionI.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "TransactionI.h" \
-    "SharedDbEnv.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "MapI.h" \
-
-EvictorI.obj: \
-	EvictorI.cpp \
-    "EvictorI.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ObjectStore.h" \
-    "$(includedir)\Freeze\EvictorStorage.h" \
-    "TransactionI.h" \
-    "EvictorIteratorI.h" \
-    "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "Util.h" \
-    "PingObject.h" \
-
-EvictorIteratorI.obj: \
-	EvictorIteratorI.cpp \
-    "EvictorIteratorI.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ObjectStore.h" \
-    "$(includedir)\Freeze\EvictorStorage.h" \
-    "TransactionI.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "EvictorI.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "Util.h" \
-
-Index.obj: \
-	Index.cpp \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "IndexI.h" \
-    "EvictorI.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ObjectStore.h" \
-    "$(includedir)\Freeze\EvictorStorage.h" \
-    "TransactionI.h" \
-    "EvictorIteratorI.h" \
-    "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-
-IndexI.obj: \
-	IndexI.cpp \
-    "IndexI.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "EvictorI.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ObjectStore.h" \
-    "$(includedir)\Freeze\EvictorStorage.h" \
-    "TransactionI.h" \
-    "EvictorIteratorI.h" \
-    "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "Util.h" \
-
-MapDb.obj: \
-	MapDb.cpp \
-    "MapDb.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "ConnectionI.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "TransactionI.h" \
-    "SharedDbEnv.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "Util.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "$(includedir)\Freeze\CatalogIndexList.h" \
-
-MapI.obj: \
-	MapI.cpp \
-    "MapI.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "ConnectionI.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "TransactionI.h" \
-    "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "MapDb.h" \
-    "Util.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "$(includedir)\Freeze\CatalogIndexList.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-ObjectStore.obj: \
-	ObjectStore.cpp \
-    "ObjectStore.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\EvictorStorage.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "TransactionI.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "EvictorI.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "EvictorIteratorI.h" \
-    "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "BackgroundSaveEvictorI.h" \
-    "Util.h" \
-    "IndexI.h" \
-
-SharedDbEnv.obj: \
-	SharedDbEnv.cpp \
-    "SharedDbEnv.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "Util.h" \
-    "MapDb.h" \
-    "ConnectionI.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "TransactionI.h" \
-    "TransactionalEvictorContext.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\EvictorStorage.h" \
-    "EvictorI.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ObjectStore.h" \
-    "EvictorIteratorI.h" \
-    "$(includedir)\Freeze\CatalogIndexList.h" \
-    "$(includedir)\IceUtil\MutexPtrTryLock.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-TransactionalEvictorContext.obj: \
-	TransactionalEvictorContext.cpp \
-    "TransactionalEvictorContext.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\EvictorStorage.h" \
-    "EvictorI.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ObjectStore.h" \
-    "TransactionI.h" \
-    "EvictorIteratorI.h" \
-    "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "TransactionalEvictorI.h" \
-    "Util.h" \
-    "ConnectionI.h" \
-
-TransactionalEvictorI.obj: \
-	TransactionalEvictorI.cpp \
-    "TransactionalEvictorI.h" \
-    "EvictorI.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ObjectStore.h" \
-    "$(includedir)\Freeze\EvictorStorage.h" \
-    "TransactionI.h" \
-    "EvictorIteratorI.h" \
-    "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "Util.h" \
-    "TransactionalEvictorContext.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-TransactionHolder.obj: \
-	TransactionHolder.cpp \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-
-TransactionI.obj: \
-	TransactionI.cpp \
-    "TransactionI.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "ConnectionI.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "SharedDbEnv.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-
-Util.obj: \
-	Util.cpp \
-    "Util.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-
-BackgroundSaveEvictor.obj: \
-	BackgroundSaveEvictor.cpp \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-CatalogData.obj: \
-	CatalogData.cpp \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-Connection.obj: \
-	Connection.cpp \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-ConnectionF.obj: \
-	ConnectionF.cpp \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-DB.obj: \
-	DB.cpp \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-Evictor.obj: \
-	Evictor.cpp \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-EvictorF.obj: \
-	EvictorF.cpp \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-EvictorStorage.obj: \
-	EvictorStorage.cpp \
-    "$(includedir)\Freeze\EvictorStorage.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-Exception.obj: \
-	Exception.cpp \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-Transaction.obj: \
-	Transaction.cpp \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-TransactionalEvictor.obj: \
-	TransactionalEvictor.cpp \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-PingObject.obj: \
-	PingObject.cpp \
-    "PingObject.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
diff --git a/cpp/src/Freeze/.gitignore b/cpp/src/Freeze/.gitignore
deleted file mode 100644
index fb47282b2ab..00000000000
--- a/cpp/src/Freeze/.gitignore
+++ /dev/null
@@ -1,31 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
-BackgroundSaveEvictor.cpp
-CatalogData.cpp
-Connection.cpp
-ConnectionF.cpp
-DB.cpp
-Evictor.cpp
-EvictorF.cpp
-EvictorStorage.cpp
-Exception.cpp
-Transaction.cpp
-TransactionalEvictor.cpp
-PingObject.cpp
-BackgroundSaveEvictor.h
-CatalogData.h
-Connection.h
-ConnectionF.h
-DB.h
-Evictor.h
-EvictorF.h
-EvictorStorage.h
-Exception.h
-Transaction.h
-TransactionalEvictor.h
-PingObject.h
-Catalog.cpp
-CatalogIndexList.cpp
diff --git a/cpp/src/Freeze/BackgroundSaveEvictorI.cpp b/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
deleted file mode 100644
index 00aa94add88..00000000000
--- a/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
+++ /dev/null
@@ -1,1410 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/BackgroundSaveEvictorI.h>
-#include <Freeze/Initialize.h>
-#include <IceUtil/AbstractMutex.h>
-#include <IceUtil/StringUtil.h>
-#include <Freeze/Util.h>
-
-#include <Freeze/ObjectStore.h>
-
-#include <IceUtil/Mutex.h>
-#include <IceUtil/MutexPtrLock.h>
-
-#include <typeinfo>
-
-using namespace std;
-using namespace Freeze;
-using namespace Ice;
-
-namespace
-{
-
-//
-// Fatal error callback
-//
-
-Freeze::FatalErrorCallback fatalErrorCallback = 0;
-IceUtil::Mutex* fatalErrorCallbackMutex = 0;
-
-class Init
-{
-public:
-
-    Init()
-    {
-        fatalErrorCallbackMutex = new IceUtil::Mutex;
-    }
-
-    ~Init()
-    {
-        delete fatalErrorCallbackMutex;
-        fatalErrorCallbackMutex = 0;
-    }
-};
-Init init;
-
-void 
-handleFatalError(const Freeze::BackgroundSaveEvictorPtr& evictor, const Ice::CommunicatorPtr& communicator)
-{
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(fatalErrorCallbackMutex);
-    if(fatalErrorCallback != 0)
-    {
-        fatalErrorCallback(evictor, communicator);
-    }
-    else
-    {
-        ::abort();
-    }
-}
-
-//
-// The timer is used to ensure the streaming of some object does not take more than
-// timeout ms. We only measure the time necessary to acquire the lock on the object
-// (servant), not the streaming itself.
-//
-class WatchDogTask : public IceUtil::TimerTask
-{
-public:
-    
-    WatchDogTask(BackgroundSaveEvictorI& evictor) : _evictor(evictor)
-    {
-    }
-
-    virtual void runTimerTask()
-    {
-        Error out(_evictor.communicator()->getLogger());
-        out << "Fatal error: streaming watch dog timed out.";
-        out.flush();
-        handleFatalError(&_evictor, _evictor.communicator());
-    }
-    
-private:
-
-    BackgroundSaveEvictorI& _evictor;
-};
-
-}
-
-//
-// createEvictor functions
-// 
-
-Freeze::BackgroundSaveEvictorPtr
-Freeze::createBackgroundSaveEvictor(const ObjectAdapterPtr& adapter, 
-                                    const string& envName, 
-                                    const string& filename,
-                                    const ServantInitializerPtr& initializer,
-                                    const vector<IndexPtr>& indices,
-                                    bool createDb)
-{
-    return new BackgroundSaveEvictorI(adapter, envName, 0, filename, initializer, indices, createDb);
-}
-
-BackgroundSaveEvictorPtr
-Freeze::createBackgroundSaveEvictor(const ObjectAdapterPtr& adapter, 
-                                    const string& envName, 
-                                    DbEnv& dbEnv, 
-                                    const string& filename,
-                                    const ServantInitializerPtr& initializer,
-                                    const vector<IndexPtr>& indices,
-                                    bool createDb)
-{
-    return new BackgroundSaveEvictorI(adapter, envName, &dbEnv, filename, initializer, indices, createDb);
-}
-
-FatalErrorCallback 
-Freeze::registerFatalErrorCallback(FatalErrorCallback cb)
-{
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(fatalErrorCallbackMutex);
-    FatalErrorCallback result = fatalErrorCallback;
-    fatalErrorCallback = cb;
-    return result;
-}
-
-//
-// BackgroundSaveEvictorI
-//
-
-Freeze::BackgroundSaveEvictorI::BackgroundSaveEvictorI(const ObjectAdapterPtr& adapter, 
-                                                       const string& envName, 
-                                                       DbEnv* dbEnv, 
-                                                       const string& filename, 
-                                                       const ServantInitializerPtr& initializer,
-                                                       const vector<IndexPtr>& indices,
-                                                       bool createDb) :
-    EvictorI<BackgroundSaveEvictorElement>(adapter, envName, dbEnv, filename, FacetTypeMap(), initializer, indices, createDb),
-    IceUtil::Thread("Freeze background save evictor thread"),
-    _currentEvictorSize(0),
-    _savingThreadDone(false)
-{
-    string propertyPrefix = string("Freeze.Evictor.") + envName + '.' + _filename; 
-    
-    //
-    // By default, we save every minute or when the size of the modified queue
-    // reaches 10.
-    //
-
-    _saveSizeTrigger = _communicator->getProperties()->
-        getPropertyAsIntWithDefault(propertyPrefix + ".SaveSizeTrigger", 10);
-
-    Int savePeriod = _communicator->getProperties()->
-        getPropertyAsIntWithDefault(propertyPrefix + ".SavePeriod", 60 * 1000);
-
-    _savePeriod = IceUtil::Time::milliSeconds(savePeriod);
-   
-    //
-    // By default, we save at most 10 * SaveSizeTrigger objects per transaction
-    //
-    _maxTxSize = _communicator->getProperties()->
-        getPropertyAsIntWithDefault(propertyPrefix + ".MaxTxSize", 10 * _saveSizeTrigger);
-    
-    if(_maxTxSize <= 0)
-    {
-        _maxTxSize = 100;
-    }   
-
-    //
-    // By default, no stream timeout
-    //
-    _streamTimeout = _communicator->getProperties()->
-        getPropertyAsIntWithDefault(propertyPrefix+ ".StreamTimeout", 0) * 1000;
-    
-    if(_streamTimeout > 0)
-    {
-        _timer = IceInternal::getInstanceTimer(_communicator);
-    }
-
-    //
-    // Start saving thread
-    //
-    __setNoDelete(true);
-    start();
-    __setNoDelete(false);
-}
-
-
-Ice::ObjectPrx
-Freeze::BackgroundSaveEvictorI::addFacet(const ObjectPtr& servant, const Identity& ident, const string& facet)
-{
-    checkIdentity(ident);
-    checkServant(servant);
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-   
-    ObjectStore<BackgroundSaveEvictorElement>* store = findStore(facet, _createDb);
-    
-    if(store == 0)
-    {
-        throw NotFoundException(__FILE__, __LINE__, "addFacet: could not open database for facet '"
-                                + facet + "'");
-    }
-
-    bool alreadyThere = false;
-
-    for(;;)
-    {
-        //
-        // Create a new entry
-        //
-        
-        BackgroundSaveEvictorElementPtr element = new BackgroundSaveEvictorElement(*store);
-        element->status = dead;
-        BackgroundSaveEvictorElementPtr oldElt = store->putIfAbsent(ident, element);
-      
-        if(oldElt != 0)
-        {
-            element = oldElt;
-        }
-
-        {
-            Lock sync(*this);
-
-            if(element->stale)
-            {
-                //
-                // Try again
-                // 
-                continue;
-            }
-            fixEvictPosition(element);
-
-            IceUtil::Mutex::Lock lock(element->mutex);
-        
-            switch(element->status)
-            {
-                case clean:
-                case created:
-                case modified:
-                {
-                    alreadyThere = true;
-                    break;
-                }  
-                case destroyed:
-                {
-                    element->status = modified;
-                    element->rec.servant = servant;
-                    
-                    //
-                    // No need to push it on the modified queue, as a destroyed object
-                    // is either already on the queue or about to be saved. When saved,
-                    // it becomes dead.
-                    //
-                    break;
-                }
-                case dead:
-                {
-                    element->status = created;
-                    ObjectRecord& rec = element->rec;
-
-                    rec.servant = servant;
-                    if(store->keepStats())
-                    {
-                        rec.stats.creationTime = IceUtil::Time::now(IceUtil::Time::Monotonic).toMilliSeconds();
-                        rec.stats.lastSaveTime = 0;
-                        rec.stats.avgSaveTime = 0;
-                    }
-                    addToModifiedQueue(element);
-                    break;
-                }
-                default:
-                {
-                    assert(0);
-                    break;
-                }
-            }
-        }
-        break; // for(;;)
-    }
-    
-    if(alreadyThere)
-    {
-        AlreadyRegisteredException ex(__FILE__, __LINE__);
-        ex.kindOfObject = "servant";
-        ex.id = _communicator->identityToString(ident);
-        if(!facet.empty())
-        {
-            ex.id += " -f " + IceUtilInternal::escapeString(facet, "");
-        }
-        throw ex;
-    }
-
-    if(_trace >= 1)
-    {
-        Trace out(_communicator->getLogger(), "Freeze.Evictor");
-        out << "added object \"" << _communicator->identityToString(ident) << "\"";
-        if(!facet.empty())
-        {
-            out << " with facet \"" << facet << "\"";
-        }
-        out << " to Db \"" << _filename << "\"";
-    }
-
-    ObjectPrx obj = _adapter->createProxy(ident);
-    if(!facet.empty())
-    {
-        obj = obj->ice_facet(facet);
-    }
-    return obj;
-}
-
-Ice::ObjectPtr
-Freeze::BackgroundSaveEvictorI::removeFacet(const Identity& ident, const string& facet)
-{
-    checkIdentity(ident);
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-   
-    ObjectStore<BackgroundSaveEvictorElement>* store = findStore(facet, false);
-    ObjectPtr servant = 0;
-
-    if(store != 0)
-    {
-        for(;;)
-        {
-            //
-            // Retrieve object
-            //
-            
-            BackgroundSaveEvictorElementPtr element = store->pin(ident);
-            if(element != 0)
-            {
-                Lock sync(*this);
-                if(element->stale)
-                {
-                    //
-                    // Try again
-                    // 
-                    continue;
-                }
-            
-                fixEvictPosition(element);
-                {
-                    IceUtil::Mutex::Lock lock(element->mutex);
-                    
-                    switch(element->status)
-                    {
-                        case clean:
-                        {
-                            servant = element->rec.servant;
-                            element->status = destroyed;
-                            element->rec.servant = 0;
-                            addToModifiedQueue(element);
-                            break;
-                        }
-                        case created:
-                        {
-                            servant = element->rec.servant;
-                            element->status = dead;
-                            element->rec.servant = 0;
-                            break;
-                        }
-                        case modified:
-                        {
-                            servant = element->rec.servant;
-                            element->status = destroyed;
-                            element->rec.servant = 0;
-                            //
-                            // Not necessary to push it on the modified queue, as a modified
-                            // element is either on the queue already or about to be saved
-                            // (at which point it becomes clean)
-                            //
-                            break;
-                        }  
-                        case destroyed:
-                        case dead:
-                        {
-                            break;
-                        }
-                        default:
-                        {
-                            assert(0);
-                            break;
-                        }
-                    }
-                }
-                if(element->keepCount > 0)
-                {
-                    assert(servant != 0);
-
-                    element->keepCount = 0;
-                    //
-                    // Add to front of evictor queue
-                    //
-                    // Note that save evicts dead objects
-                    //
-                    _evictorList.push_front(element);
-                    _currentEvictorSize++;
-                    element->evictPosition = _evictorList.begin();
-                }
-            }
-            break; // for(;;)  
-        }
-    }
-    
-    if(servant == 0)
-    {
-        NotRegisteredException ex(__FILE__, __LINE__);
-        ex.kindOfObject = "servant";
-        ex.id = _communicator->identityToString(ident);
-        if(!facet.empty())
-        {
-            ex.id += " -f " + IceUtilInternal::escapeString(facet, "");
-        }
-        throw ex;
-    }
-
-    if(_trace >= 1)
-    {
-        Trace out(_communicator->getLogger(), "Freeze.Evictor");
-        out << "removed object \"" << _communicator->identityToString(ident) << "\"";
-        if(!facet.empty())
-        {
-            out << " with facet \"" << facet << "\"";
-        }
-        out << " from Db \"" << _filename << "\"";
-    }
-    return servant;
-}
-
-void
-Freeze::BackgroundSaveEvictorI::keep(const Identity& ident)
-{
-    keepFacet(ident, "");
-}
-
-void
-Freeze::BackgroundSaveEvictorI::keepFacet(const Identity& ident, const string& facet)
-{
-    checkIdentity(ident);
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-
-    bool notThere = false;
-
-    ObjectStore<BackgroundSaveEvictorElement>* store = findStore(facet, false);
-    if(store == 0)
-    {
-        notThere = true;
-    }
-    else
-    {
-        for(;;)
-        {
-            BackgroundSaveEvictorElementPtr element = store->pin(ident);
-            if(element == 0)
-            {
-                notThere = true;
-                break;
-            }
-            
-            Lock sync(*this);
-            
-            if(element->stale)
-            {
-                //
-                // try again
-                //
-                continue;
-            }
-            
-            
-            {
-                IceUtil::Mutex::Lock lockElement(element->mutex);
-                if(element->status == destroyed || element->status == dead)
-                {
-                    notThere = true;
-                    break;
-                }
-            }
-            
-            //
-            // Found!
-            //
-
-            if(element->keepCount == 0)
-            {
-                if(element->usageCount < 0)
-                {
-                    //
-                    // New object
-                    //
-                    element->usageCount = 0;
-                }
-                else
-                {
-                    _evictorList.erase(element->evictPosition);
-                    _currentEvictorSize--;
-                }
-                element->keepCount = 1;
-            }
-            else
-            {
-                element->keepCount++;
-            }
-            break;
-        }
-    }
-
-    if(notThere)
-    {
-        NotRegisteredException ex(__FILE__, __LINE__);
-        ex.kindOfObject = "servant";
-        ex.id = _communicator->identityToString(ident);
-        if(!facet.empty())
-        {
-            ex.id += " -f " + IceUtilInternal::escapeString(facet, "");
-        }
-        throw ex;
-    }
-}
-
-void
-Freeze::BackgroundSaveEvictorI::release(const Identity& ident)
-{
-    releaseFacet(ident, "");
-}
-
-void
-Freeze::BackgroundSaveEvictorI::releaseFacet(const Identity& ident, const string& facet)
-{
-    checkIdentity(ident);
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-
-    ObjectStore<BackgroundSaveEvictorElement>* store = findStore(facet, false);
-
-    if(store != 0)
-    {
-        Lock sync(*this);
-        
-        BackgroundSaveEvictorElementPtr element = store->getIfPinned(ident);
-        if(element != 0)
-        {
-            assert(!element->stale);
-            if(element->keepCount > 0) 
-            {
-                if(--element->keepCount == 0)
-                {
-                    //
-                    // Add to front of evictor queue
-                    //
-                    // Note that the element cannot be destroyed or dead since
-                    // its keepCount was > 0.
-                    //
-                    _evictorList.push_front(element);
-                    _currentEvictorSize++;
-                    element->evictPosition = _evictorList.begin();
-                }
-                //
-                // Success
-                //
-                return;
-            }
-        }
-    }
-    
-    NotRegisteredException ex(__FILE__, __LINE__);
-    ex.kindOfObject = "servant";
-    ex.id = _communicator->identityToString(ident);
-    if(!facet.empty())
-    {
-        ex.id += " -f " + IceUtilInternal::escapeString(facet, "");
-    }
-    throw ex;
-}
-
-
-bool
-Freeze::BackgroundSaveEvictorI::hasFacet(const Identity& ident, const string& facet)
-{
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-    checkIdentity(ident);
-    ObjectStore<BackgroundSaveEvictorElement>* store = findStore(facet, false);
-
-    if(store == 0)
-    {
-        return false;
-    }
-
-    {
-        Lock sync(*this);  
-        BackgroundSaveEvictorElementPtr element = store->getIfPinned(ident);
-        if(element != 0)
-        {
-            assert(!element->stale);    
-            
-            IceUtil::Mutex::Lock lock(element->mutex);
-            return element->status != dead && element->status != destroyed;
-        }
-    }
-    return store->dbHasObject(ident, 0);
-}
-
-bool
-Freeze::BackgroundSaveEvictorI::hasAnotherFacet(const Identity& ident, const string& facet)
-{
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-
-    //
-    // If the object exists in another store, throw FacetNotExistException 
-    // instead of returning 0 (== ObjectNotExistException)
-    // 
-    StoreMap storeMapCopy;
-    {
-        Lock sync(*this);
-        storeMapCopy = _storeMap;
-    }       
-        
-    for(StoreMap::iterator p = storeMapCopy.begin(); p != storeMapCopy.end(); ++p)
-    {
-        //
-        // Do not check again the given facet
-        //
-        if((*p).first != facet)
-        { 
-            ObjectStore<BackgroundSaveEvictorElement>* store = (*p).second;
-            
-            bool inCache = false;
-            {
-                Lock sync(*this);
-                
-                BackgroundSaveEvictorElementPtr element = store->getIfPinned(ident);
-                if(element != 0)
-                {
-                    inCache = true;
-                    assert(!element->stale);    
-                    
-                    IceUtil::Mutex::Lock lock(element->mutex);
-                    if(element->status != dead && element->status != destroyed)
-                    {
-                        return true;
-                    }
-                }
-            }
-            if(!inCache)
-            {
-                if(store->dbHasObject(ident, 0))
-                {
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
-}
-
-
-ObjectPtr
-Freeze::BackgroundSaveEvictorI::locateImpl(const Current& current, LocalObjectPtr& cookie)
-{
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-
-    cookie = 0;
-
-    ObjectStore<BackgroundSaveEvictorElement>* store = findStore(current.facet, false);
-    if(store == 0)
-    {
-        if(_trace >= 2)
-        {
-            Trace out(_communicator->getLogger(), "Freeze.Evictor");
-            out << "locate could not find a database for facet \"" << current.facet << "\"";
-        }
-        return 0;
-    }
-    
-    for(;;)
-    {
-        BackgroundSaveEvictorElementPtr element = store->pin(current.id);
-        if(element == 0)
-        {
-            if(_trace >= 2)
-            {
-                Trace out(_communicator->getLogger(), "Freeze.Evictor");
-                out << "locate could not find \"" << _communicator->identityToString(current.id) << "\" in Db \""
-                    << _filename << "\"";
-            }
-            return 0;
-        }
-        
-        Lock sync(*this);
-
-        if(element->stale)
-        {
-            //
-            // try again
-            //
-            continue;
-        }
-
-
-        IceUtil::Mutex::Lock lockElement(element->mutex);
-        if(element->status == destroyed || element->status == dead)
-        {
-            if(_trace >= 2)
-            {
-                Trace out(_communicator->getLogger(), "Freeze.Evictor");
-                out << "locate found \"" << _communicator->identityToString(current.id) 
-                    << "\" in the cache for database \"" << current.facet << "\" but it was dead or destroyed";
-            }
-            return 0;
-        }
-
-        //
-        // It's a good one!
-        //
-        if(_trace >= 2)
-        {
-            Trace out(_communicator->getLogger(), "Freeze.Evictor");
-            out << "locate found \"" << _communicator->identityToString(current.id) << "\" in Db \"" 
-                << _filename << "\"";
-        }
-
-        fixEvictPosition(element);
-        element->usageCount++;
-        cookie = element;
-        assert(element->rec.servant != 0);
-        return element->rec.servant;
-    }
-}
-
-void
-Freeze::BackgroundSaveEvictorI::finished(const Current& current, const ObjectPtr& servant, const LocalObjectPtr& cookie)
-{
-    assert(servant != 0);
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-
-    if(cookie != 0)
-    {
-        BackgroundSaveEvictorElementPtr element = BackgroundSaveEvictorElementPtr::dynamicCast(cookie);
-        assert(element);
-    
-        bool enqueue = false;
-        
-        if((servant->ice_operationAttributes(current.operation) & 0x1) != 0)
-        {
-            IceUtil::Mutex::Lock lock(element->mutex);
-            
-            if(element->status == clean)
-            {
-                //
-                // Assume this operation updated the object
-                // 
-                element->status = modified;
-                enqueue = true;
-            }
-        }
-        
-        Lock sync(*this);
-
-        //
-        // Only elements with a usageCount == 0 can become stale and we own 
-        // one count!
-        // 
-        assert(!element->stale);
-        assert(element->usageCount >= 1);
-        
-        //
-        // Decrease the usage count of the evictor queue element.
-        //
-        element->usageCount--;
-        
-        if(enqueue)
-        {
-            addToModifiedQueue(element);
-        }
-        else if(element->usageCount == 0 && element->keepCount == 0)
-        {
-            //
-            // Evict as many elements as necessary.
-            //
-            evict();
-        }
-    }
-}
-
-void
-Freeze::BackgroundSaveEvictorI::deactivate(const string&)
-{
-    if(_deactivateController.deactivate())
-    {
-        try
-        {
-            saveNow();
-
-            Lock sync(*this);
-     
-            //
-            // Set the evictor size to zero, meaning that we will evict
-            // everything possible.
-            //
-            _evictorSize = 0;
-            evict();
-            
-            _savingThreadDone = true;
-            notifyAll();
-            sync.release();
-            getThreadControl().join();
-            
-            closeDbEnv();
-        }
-        catch(...)
-        {
-            _deactivateController.deactivationComplete();
-            throw;
-        }
-        _deactivateController.deactivationComplete();
-    }
-}
-
-Freeze::BackgroundSaveEvictorI::~BackgroundSaveEvictorI()
-{
-    if(!_deactivateController.deactivated())
-    {
-        Warning out(_communicator->getLogger());
-        out << "evictor has not been deactivated";
-    }
-}
-
-
-void
-Freeze::BackgroundSaveEvictorI::run()
-{
-    try
-    {
-        for(;;)
-        {
-            deque<BackgroundSaveEvictorElementPtr> allObjects;
-            deque<BackgroundSaveEvictorElementPtr> deadObjects;
-
-            size_t saveNowThreadsSize = 0;
-            
-            {
-                Lock sync(*this);
-
-                while(!_savingThreadDone &&
-                      (_saveNowThreads.size() == 0) &&
-                      (_saveSizeTrigger < 0 || static_cast<Int>(_modifiedQueue.size()) < _saveSizeTrigger))
-                {
-                    if(_savePeriod == IceUtil::Time::milliSeconds(0))
-                    {
-                        wait();
-                    }
-                    else if(timedWait(_savePeriod) == false)
-                    {
-                        //
-                        // Timeout, so let's save
-                        //
-                        break; // while
-                    }                           
-                }
-                
-                saveNowThreadsSize = _saveNowThreads.size();
-                
-                if(_savingThreadDone)
-                {
-                    assert(_modifiedQueue.size() == 0);
-                    assert(saveNowThreadsSize == 0);
-                    break; // for(;;)
-                }
-                
-                //
-                // Check first if there is something to do!
-                //
-                if(_modifiedQueue.size() == 0)
-                {
-                    if(saveNowThreadsSize > 0)
-                    {
-                        _saveNowThreads.clear();
-                        notifyAll();
-                    }
-                    continue; // for(;;)
-                }
-                
-                _modifiedQueue.swap(allObjects);
-            }
-            
-            const size_t size = allObjects.size();
-            
-            deque<StreamedObjectPtr> streamedObjectQueue;
-            
-            Long streamStart = IceUtil::Time::now(IceUtil::Time::Monotonic).toMilliSeconds();
-            
-            //
-            // Stream each element
-            //
-            for(size_t i = 0; i < size; i++)
-            {
-                BackgroundSaveEvictorElementPtr& element = allObjects[i];
-                
-                bool tryAgain;
-                do
-                {
-                    tryAgain = false;
-                    ObjectPtr servant = 0;
-                    
-                    //
-                    // These elements can't be stale as only elements with 
-                    // usageCount == 0 can become stale, and the modifiedQueue
-                    // (us now) owns one count.
-                    //
-
-                    IceUtil::Mutex::Lock lockElement(element->mutex);
-                    Byte status = element->status;
-                    
-                    switch(status)
-                    {
-                        case created:
-                        case modified:
-                        {
-                            servant = element->rec.servant;
-                            break;
-                        }   
-                        case destroyed:
-                        {
-                            size_t index = streamedObjectQueue.size();
-                            streamedObjectQueue.resize(index + 1);
-                            streamedObjectQueue[index] = new StreamedObject;
-                            stream(element, streamStart, streamedObjectQueue[index]);
-
-                            element->status = dead;
-                            deadObjects.push_back(element);
-
-                            break;
-                        }   
-                        case dead:
-                        {
-                            deadObjects.push_back(element);
-                            break;
-                        }
-                        default:
-                        {
-                            //
-                            // Nothing to do (could be a duplicate)
-                            //
-                            break;
-                        }
-                    }
-                    if(servant == 0)
-                    {
-                        lockElement.release();
-                    }
-                    else
-                    {
-                        IceUtil::AbstractMutex* mutex = dynamic_cast<IceUtil::AbstractMutex*>(servant.get());
-                        if(mutex != 0)
-                        {
-                            //
-                            // Lock servant and then element so that user can safely lock
-                            // servant and call various Evictor operations
-                            //
-                            
-                            IceUtil::AbstractMutex::TryLock lockServant(*mutex);
-                            if(!lockServant.acquired())
-                            {
-                                lockElement.release();
-
-                                IceUtil::TimerTaskPtr watchDogTask;
-                                if(_timer)
-                                {
-                                    watchDogTask = new WatchDogTask(*this);
-                                    _timer->schedule(watchDogTask, IceUtil::Time::milliSeconds(_streamTimeout));
-                                }
-                                lockServant.acquire();
-                                if(watchDogTask)
-                                {
-                                    _timer->cancel(watchDogTask);
-                                    watchDogTask = 0;
-                                }
-
-                                lockElement.acquire();
-                                status = element->status;
-                            }
-  
-                            switch(status)
-                            {
-                                case created:
-                                case modified:
-                                {
-                                    if(servant == element->rec.servant)
-                                    {
-                                        size_t index = streamedObjectQueue.size();
-                                        streamedObjectQueue.resize(index + 1);
-                                        streamedObjectQueue[index] = new StreamedObject;
-                                        stream(element, streamStart, streamedObjectQueue[index]);
-
-                                        element->status = clean;
-                                    }
-                                    else
-                                    {
-                                        tryAgain = true;
-                                    }
-                                    break;
-                                }
-                                case destroyed:
-                                {
-                                    lockServant.release();
-                                    
-                                    size_t index = streamedObjectQueue.size();
-                                    streamedObjectQueue.resize(index + 1);
-                                    streamedObjectQueue[index] = new StreamedObject;
-                                    stream(element, streamStart, streamedObjectQueue[index]);
-
-                                    element->status = dead;
-                                    deadObjects.push_back(element);
-                                    break;
-                                }   
-                                case dead:
-                                {
-                                    deadObjects.push_back(element);
-                                    break;
-                                }
-                                default:
-                                {
-                                    //
-                                    // Nothing to do (could be a duplicate)
-                                    //
-                                    break;
-                                }
-                            }
-                        }
-                        else
-                        {
-                            DatabaseException ex(__FILE__, __LINE__);
-			    Ice::Object& servant = *element->rec.servant;
-                            ex.message = string(typeid(servant).name()) + " does not implement IceUtil::AbstractMutex";
-                            throw ex;
-                        }
-                    }
-                } while(tryAgain);
-            }
-            
-            if(_trace >= 1)
-            {
-                Long now = IceUtil::Time::now(IceUtil::Time::Monotonic).toMilliSeconds();
-                Trace out(_communicator->getLogger(), "Freeze.Evictor");
-                out << "streamed " << streamedObjectQueue.size() << " objects in " 
-                    << static_cast<Int>(now - streamStart) << " ms";
-            }
-            
-            //
-            // Now let's save all these streamed objects to disk using a transaction
-            //
-            
-            //
-            // Each time we get a deadlock, we reduce the number of objects to save
-            // per transaction
-            //
-            size_t txSize = streamedObjectQueue.size();
-            if(txSize > static_cast<size_t>(_maxTxSize))
-            {
-                txSize = static_cast<size_t>(_maxTxSize);
-            }
-            bool tryAgain;
-            
-            do
-            {
-                tryAgain = false;
-                
-                while(streamedObjectQueue.size() > 0)
-                {
-                    if(txSize > streamedObjectQueue.size())
-                    {
-                        txSize = streamedObjectQueue.size();
-                    }
-                    
-                    Long saveStart = IceUtil::Time::now(IceUtil::Time::Monotonic).toMilliSeconds();
-                   
-                    try
-                    {
-                        DbTxn* tx = 0;
-                        _dbEnv->getEnv()->txn_begin(0, &tx, 0);
-
-                        long txnId = 0;
-                        if(_txTrace >= 1)
-                        {
-                            txnId = (tx->id() & 0x7FFFFFFF) + 0x80000000L;
-                            Trace out(_communicator->getLogger(), "Freeze.Evictor");
-                            out << "started transaction " << hex << txnId << dec << " in saving thread";
-                        }
-
-                        try
-                        {       
-                            for(size_t i = 0; i < txSize; i++)
-                            {
-                                StreamedObjectPtr obj = streamedObjectQueue[i];
-                                Dbt key, value;
-                                obj->key->getDbt(key);
-                                if(obj->value)
-                                {
-                                    obj->value->getDbt(value);
-                                }
-                                obj->store->save(key, value, obj->status, tx);
-                            }
-                        }
-                        catch(...)
-                        {
-                            tx->abort();
-                            if(_txTrace >= 1)
-                            {
-                                Trace out(_communicator->getLogger(), "Freeze.Evictor");
-                                out << "rolled back transaction " << hex << txnId << dec;
-                            }
-                            throw;
-                        }
-                        tx->commit(0);
-
-                        if(_txTrace >= 1)
-                        {
-                            Trace out(_communicator->getLogger(), "Freeze.Evictor");
-                            out << "committed transaction " << hex << txnId << dec;
-                        }
-
-                        streamedObjectQueue.erase(streamedObjectQueue.begin(), streamedObjectQueue.begin() + txSize);
-                        
-                        if(_trace >= 1)
-                        {
-                            Long now = IceUtil::Time::now(IceUtil::Time::Monotonic).toMilliSeconds();
-                            Trace out(_communicator->getLogger(), "Freeze.Evictor");
-                            out << "saved " << txSize << " objects in " 
-                                << static_cast<Int>(now - saveStart) << " ms";
-                        }
-                    }
-                    catch(const DbDeadlockException&)
-                    {
-                        if(_deadlockWarning)
-                        {
-                            Warning out(_communicator->getLogger());
-                            out << "Deadlock in Freeze::BackgroundSaveEvictorI::run while writing into Db \"" + _filename
-                                + "\"; retrying ...";
-                        }
-                        
-                        tryAgain = true;
-                        txSize = (txSize + 1)/2;
-                    }
-                    catch(const DbException& dx)
-                    {
-                        DatabaseException ex(__FILE__, __LINE__);
-                        ex.message = dx.what();
-                        throw ex;
-                    }
-                } 
-            }
-            while(tryAgain);
-            
-            {
-                Lock sync(*this);
-               
-                //
-                // Release usage count
-                //
-                for(deque<BackgroundSaveEvictorElementPtr>::iterator p = allObjects.begin();
-                    p != allObjects.end(); p++)
-                {
-                    BackgroundSaveEvictorElementPtr& element = *p;
-                    element->usageCount--;
-                }
-                allObjects.clear();
-
-                for(deque<BackgroundSaveEvictorElementPtr>::iterator q = deadObjects.begin();
-                    q != deadObjects.end(); q++)
-                {
-                    BackgroundSaveEvictorElementPtr& element = *q;
-                    if(!element->stale)
-                    {
-                        //
-                        // Can be stale when there are duplicate elements on the
-                        // deadObjecst queue
-                        //
-
-                        if(!element->stale && element->usageCount == 0 && element->keepCount == 0)
-                        {
-                            //
-                            // Get rid of unused dead elements
-                            //
-                            IceUtil::Mutex::Lock lockElement(element->mutex);
-                            if(element->status == dead)
-                            {
-                                evict(element);
-                            }
-                        }
-                    }
-                }
-                deadObjects.clear();
-                evict();
-                
-                if(saveNowThreadsSize > 0)
-                {
-                    _saveNowThreads.erase(_saveNowThreads.begin(), _saveNowThreads.begin() + saveNowThreadsSize);
-                    notifyAll();
-                }
-            }
-        }
-    }
-    catch(const std::exception& ex)
-    {
-        Error out(_communicator->getLogger());
-        out << "Saving thread killed by exception: " << ex;
-        out.flush();
-        handleFatalError(this, _communicator);
-    }
-    catch(...)
-    {
-        Error out(_communicator->getLogger());
-        out << "Saving thread killed by unknown exception";
-        out.flush();
-        handleFatalError(this, _communicator);
-    }
-}
-
-Freeze::TransactionIPtr
-Freeze::BackgroundSaveEvictorI::beforeQuery()
-{
-    saveNow();
-    return 0;
-}
-
-void
-Freeze::BackgroundSaveEvictorI::saveNow()
-{
-    Lock sync(*this);
-    
-    IceUtil::ThreadControl myself;
-
-    _saveNowThreads.push_back(myself);
-    notifyAll();
-    do
-    {
-        wait();
-    }
-    while(find(_saveNowThreads.begin(), _saveNowThreads.end(), myself) != _saveNowThreads.end());
-}
-
-void
-Freeze::BackgroundSaveEvictorI::evict()
-{
-    //
-    // Must be called with *this locked
-    //
-
-    assert(_currentEvictorSize == _evictorList.size());
-
-    list<BackgroundSaveEvictorElementPtr>::reverse_iterator p = _evictorList.rbegin();
-    
-    while(_currentEvictorSize > _evictorSize)
-    {
-        //
-        // Get the last unused element from the evictor queue.
-        //
-        while(p != _evictorList.rend())
-        {
-            if((*p)->usageCount == 0)
-            {
-                break; // Fine, servant is not in use (and not in the modifiedQueue)
-            }
-            ++p;
-        }
-        if(p == _evictorList.rend())
-        {
-            //
-            // All servants are active, can't evict any further.
-            //
-            break;
-        }
-
-        BackgroundSaveEvictorElementPtr& element = *p;
-        assert(!element->stale);
-        assert(element->keepCount == 0);
-
-        if(_trace >= 2 || (_trace >= 1 && _evictorList.size() % 50 == 0))
-        {
-            string facet = element->store.facet();
-
-            Trace out(_communicator->getLogger(), "Freeze.Evictor");
-            out << "evicting \"" << _communicator->identityToString(element->cachePosition->first) << "\" ";
-            if(facet != "")
-            {
-                out << "-f \"" << facet << "\" ";
-            }
-            out << "from the queue\n" 
-                << "number of elements in the queue: " << _currentEvictorSize;
-        }
-        
-        //
-        // Remove last unused element from the evictor queue.
-        //
-        element->stale = true;
-        element->store.unpin(element->cachePosition);
-        p = list<BackgroundSaveEvictorElementPtr>::reverse_iterator(_evictorList.erase(element->evictPosition));
-        _currentEvictorSize--;
-    }
-}
-
-void 
-Freeze::BackgroundSaveEvictorI::fixEvictPosition(const BackgroundSaveEvictorElementPtr& element)
-{
-    assert(!element->stale);
-    
-    if(element->keepCount == 0)
-    {
-        if(element->usageCount < 0)
-        {
-            //
-            // New object
-            //
-            element->usageCount = 0;
-            _currentEvictorSize++;
-        }
-        else
-        {
-            _evictorList.erase(element->evictPosition);
-        }
-        _evictorList.push_front(element);
-        element->evictPosition = _evictorList.begin();
-    }
-}
-
-void 
-Freeze::BackgroundSaveEvictorI::evict(const BackgroundSaveEvictorElementPtr& element)
-{
-    assert(!element->stale);
-    assert(element->keepCount == 0);
-
-    _evictorList.erase(element->evictPosition);
-    _currentEvictorSize--;
-    element->stale = true;
-    element->store.unpin(element->cachePosition);
-}
-
-
-void
-Freeze::BackgroundSaveEvictorI::addToModifiedQueue(const BackgroundSaveEvictorElementPtr& element)
-{
-    element->usageCount++;
-    _modifiedQueue.push_back(element);
-    
-    if(_saveSizeTrigger >= 0 && static_cast<Int>(_modifiedQueue.size()) >= _saveSizeTrigger)
-    {
-        notifyAll();
-    }
-}
-
-
-void
-Freeze::BackgroundSaveEvictorI::stream(const BackgroundSaveEvictorElementPtr& element, Long streamStart,
-                                       const StreamedObjectPtr& obj)
-{
-    assert(element->status != dead);
-    
-    obj->status = element->status;
-    obj->store = &element->store;
-
-    const Identity& ident = element->cachePosition->first;
-    obj->key = new ObjectStoreBase::KeyMarshaler(ident, _communicator, _encoding);
-
-    if(element->status != destroyed)
-    {
-        const bool keepStats = obj->store->keepStats();
-        if(keepStats)
-        {
-            EvictorIBase::updateStats(element->rec.stats, streamStart);
-        }
-        obj->value = new ObjectStoreBase::ValueMarshaler(element->rec, _communicator, _encoding, keepStats);
-    }
-}
-
-Freeze::BackgroundSaveEvictorElement::BackgroundSaveEvictorElement(ObjectRecord& r,
-                                                                   ObjectStore<BackgroundSaveEvictorElement>& s) :
-    store(s),
-    usageCount(-1),
-    keepCount(0),
-    stale(true),
-    rec(r),
-    status(clean)
-{
-}
-
-Freeze::BackgroundSaveEvictorElement::BackgroundSaveEvictorElement(ObjectStore<BackgroundSaveEvictorElement>& s) :
-    store(s),
-    usageCount(-1),
-    keepCount(0),
-    stale(true),
-    status(clean)
-{
-    const Statistics cleanStats = { 0 };
-    rec.stats = cleanStats;
-}
-
-Freeze::BackgroundSaveEvictorElement::~BackgroundSaveEvictorElement()
-{
-}
-
-void 
-Freeze::BackgroundSaveEvictorElement::init(ObjectStore<BackgroundSaveEvictorElement>::Position p)
-{
-    stale = false;
-    cachePosition = p;
-}
diff --git a/cpp/src/Freeze/BackgroundSaveEvictorI.h b/cpp/src/Freeze/BackgroundSaveEvictorI.h
deleted file mode 100644
index f3af1e6e475..00000000000
--- a/cpp/src/Freeze/BackgroundSaveEvictorI.h
+++ /dev/null
@@ -1,191 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_BACKGROUND_SAVE_EVICTOR_I_H
-#define FREEZE_BACKGROUND_SAVE_EVICTOR_I_H
-
-#include <Freeze/EvictorI.h>
-#include <Freeze/BackgroundSaveEvictor.h>
-
-namespace Freeze
-{
-    //
-    // Clean object; can become modified or destroyed
-    //
-    static const Ice::Byte clean = 0;
-
-    //
-    // New object; can become clean, dead or destroyed
-    //
-    static const Ice::Byte created = 1;
-
-    //
-    // Modified object; can become clean or destroyed
-    //
-    static const Ice::Byte modified = 2;
-
-    //
-    // Being saved. Can become dead or created
-    //
-    static const Ice::Byte destroyed = 3;
-
-    //
-    // Exists only in the Evictor; for example the object was created
-    // and later destroyed (without a save in between), or it was
-    // destroyed on disk but is still in use. Can become created.
-    //
-    static const Ice::Byte dead = 4;
-
-class BackgroundSaveEvictorI;
-
-struct BackgroundSaveEvictorElement;
-typedef IceUtil::Handle<BackgroundSaveEvictorElement> BackgroundSaveEvictorElementPtr;
-
-struct BackgroundSaveEvictorElement : public Ice::LocalObject
-{
-    BackgroundSaveEvictorElement(ObjectRecord&, ObjectStore<BackgroundSaveEvictorElement>&);
-    BackgroundSaveEvictorElement(ObjectStore<BackgroundSaveEvictorElement>&);
-    ~BackgroundSaveEvictorElement();
-
-    void init(ObjectStore<BackgroundSaveEvictorElement>::Position);
-
-    //
-    // Immutable
-    //
-    ObjectStore<BackgroundSaveEvictorElement>& store;
-
-    //
-    // Immutable once set
-    //
-    ObjectStore<BackgroundSaveEvictorElement>::Position cachePosition;
-
-    //
-    // Protected by EvictorI
-    //
-    std::list<BackgroundSaveEvictorElementPtr>::iterator evictPosition;
-    int usageCount;
-    int keepCount;
-    bool stale;
-    
-    //
-    // Protected by mutex
-    // 
-    IceUtil::Mutex mutex;
-    ObjectRecord rec;
-    Ice::Byte status;
-};
-
-
-class BackgroundSaveEvictorI : public BackgroundSaveEvictor, public EvictorI<BackgroundSaveEvictorElement>, 
-                               public IceUtil::Thread
-{
-public:
-
-    BackgroundSaveEvictorI(const Ice::ObjectAdapterPtr&, const std::string&, DbEnv*, const std::string&, 
-                           const ServantInitializerPtr&, const std::vector<IndexPtr>&, bool);
- 
-    virtual Ice::ObjectPrx addFacet(const Ice::ObjectPtr&, const Ice::Identity&, const std::string&);
-    virtual Ice::ObjectPtr removeFacet(const Ice::Identity&, const std::string&);
-
-    virtual void keep(const Ice::Identity&);
-    virtual void keepFacet(const Ice::Identity&, const std::string&);
-
-    virtual void release(const Ice::Identity&);
-    virtual void releaseFacet(const Ice::Identity&, const std::string&);
-
-    virtual bool hasFacet(const Ice::Identity&, const std::string&);
-
-    virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&);
-    virtual void deactivate(const std::string&);
-
-    virtual ~BackgroundSaveEvictorI();
-    
-
-    virtual TransactionIPtr beforeQuery();
-
-    //
-    // Thread
-    //
-    virtual void run();
-
-    struct StreamedObject : public IceUtil::Shared
-    {
-        StreamedObject() :
-            key(0), value(0)
-        {
-        }
-
-        ~StreamedObject()
-        {
-            delete key;
-            delete value;
-        }
-
-        ObjectStoreBase::KeyMarshaler* key;
-        ObjectStoreBase::ValueMarshaler* value;
-        Ice::Byte status;
-        ObjectStore<BackgroundSaveEvictorElement>* store;
-
-    private:
-
-        StreamedObject(const StreamedObject&) {}
-        void operator=(const StreamedObject&) {}
-    };
-    typedef IceUtil::Handle<StreamedObject> StreamedObjectPtr;
-
-protected:
-   
-    virtual bool hasAnotherFacet(const Ice::Identity&, const std::string&);
-    
-    virtual Ice::ObjectPtr locateImpl(const Ice::Current&, Ice::LocalObjectPtr&);
-   
-    virtual void evict();
-
-private:
-
-    void saveNow();
-
-    void evict(const BackgroundSaveEvictorElementPtr&);
-    void addToModifiedQueue(const BackgroundSaveEvictorElementPtr&);
-    void fixEvictPosition(const BackgroundSaveEvictorElementPtr&);
-
-    void stream(const BackgroundSaveEvictorElementPtr&, Ice::Long, const StreamedObjectPtr&);
-  
-    //
-    // The _evictorList contains a list of all objects we keep,
-    // with the most recently used first.
-    //
-    std::list<BackgroundSaveEvictorElementPtr> _evictorList;
-    std::list<BackgroundSaveEvictorElementPtr>::size_type _currentEvictorSize;
-
-    //
-    // The _modifiedQueue contains a queue of all modified objects
-    // Each element in the queue "owns" a usage count, to ensure the
-    // element containing the pointed element remains in the cache.
-    //
-    std::deque<BackgroundSaveEvictorElementPtr> _modifiedQueue;
-
-    bool _savingThreadDone;
-    long _streamTimeout;
-    IceUtil::TimerPtr _timer;
-    
-    //
-    // Threads that have requested a "saveNow" and are waiting for
-    // its completion
-    //
-    std::deque<IceUtil::ThreadControl> _saveNowThreads;
-
-    Ice::Int _saveSizeTrigger;
-    Ice::Int _maxTxSize;
-    IceUtil::Time _savePeriod;
-};
-
-}
-
-#endif
diff --git a/cpp/src/Freeze/ConnectionI.cpp b/cpp/src/Freeze/ConnectionI.cpp
deleted file mode 100644
index 01406cb616e..00000000000
--- a/cpp/src/Freeze/ConnectionI.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/ConnectionI.h>
-#include <Freeze/MapI.h>
-#include <Freeze/Initialize.h>
-
-using namespace Ice;
-using namespace Freeze;
-using namespace std;
-
-Freeze::TransactionPtr
-Freeze::ConnectionI::beginTransaction()
-{
-    return beginTransactionI();
-}
-
-Freeze::TransactionIPtr
-Freeze::ConnectionI::beginTransactionI()
-{
-    if(_transaction)
-    {
-        throw TransactionAlreadyInProgressException(__FILE__, __LINE__);
-    }
-    closeAllIterators();
-    _transaction = new TransactionI(this);
-    return _transaction;
-}
-
-Freeze::TransactionPtr
-Freeze::ConnectionI::currentTransaction() const
-{
-    return _transaction;
-}
-
-void
-Freeze::ConnectionI::removeMapIndex(const string& mapName, const string& indexName)
-{
-    if(_dbEnv == 0)
-    {
-        throw DatabaseException(__FILE__, __LINE__, "Closed connection");
-    }
-
-    string filename = mapName + "." + indexName;
-
-    DbTxn* txn = dbTxn();
-    try
-    {
-        _dbEnv->getEnv()->dbremove(txn, filename.c_str(), 0, txn != 0 ? 0 : DB_AUTO_COMMIT);
-    }
-    catch(const DbDeadlockException& dx)
-    {
-        throw DeadlockException(__FILE__, __LINE__, dx.what(), _transaction);
-    }
-    catch(const DbException& dx)
-    {
-        if(dx.get_errno() == ENOENT)
-        {
-            throw IndexNotFoundException(__FILE__, __LINE__, mapName, indexName);
-        }
-        else
-        {
-            throw DatabaseException(__FILE__, __LINE__, dx.what());
-        }
-    }
-}
-
-
-void
-Freeze::ConnectionI::close()
-{
-    if(_transaction)
-    {
-        _transaction->rollbackInternal(true);
-        assert(_transaction == 0);
-    }
-
-    while(!_mapList.empty())
-    {
-        (*_mapList.begin())->close();
-    }
-
-    _dbEnv = 0;
-}
-
-CommunicatorPtr
-Freeze::ConnectionI::getCommunicator() const
-{
-    return _communicator;
-}
-
-EncodingVersion
-Freeze::ConnectionI::getEncoding() const
-{
-    return _encoding;
-}
-
-string
-Freeze::ConnectionI::getName() const
-{
-    return _envName;
-}
-
-void
-Freeze::ConnectionI::__incRef()
-{
-    IceUtil::Mutex::Lock sync(_refCountMutex->mutex);
-    _refCount++;
-}
-
-
-void
-Freeze::ConnectionI::__decRef()
-{
-    IceUtil::Mutex::Lock sync(_refCountMutex->mutex);
-    if(--_refCount == 0)
-    {
-        sync.release();
-        delete this;
-    }
-    else if(_refCount == 1 && _transaction != 0 && _transaction->dbTxn() != 0 && _transaction->__getRefNoSync() == 1)
-    {
-        sync.release();
-        if(_transaction)
-        {
-            //
-            // This makes the transaction release the last refcount on the connection
-            //
-            _transaction->rollbackInternal(true);
-        }
-    }
-}
-
-int
-Freeze::ConnectionI::__getRef() const
-{
-    IceUtil::Mutex::Lock sync(_refCountMutex->mutex);
-    return _refCount;
-}
-
-int
-Freeze::ConnectionI::__getRefNoSync() const
-{
-    return _refCount;
-}
-
-
-Freeze::ConnectionI::~ConnectionI()
-{
-    try
-    {
-        close();
-    }
-    catch(const DatabaseException& ex)
-    {
-        Ice::Error error(_communicator->getLogger());
-        error << "Freeze: closing connection Freeze.DbEnv: " << _envName << " raised DatabaseException: " << ex.what();
-    }
-}
-
-Freeze::ConnectionI::ConnectionI(const SharedDbEnvPtr& dbEnv) :
-    _communicator(dbEnv->getCommunicator()),
-    _encoding(dbEnv->getEncoding()),
-    _dbEnv(dbEnv),
-    _envName(dbEnv->getEnvName()),
-    _trace(_communicator->getProperties()->getPropertyAsInt("Freeze.Trace.Map")),
-    _txTrace(_communicator->getProperties()->getPropertyAsInt("Freeze.Trace.Transaction")),
-    _deadlockWarning(_communicator->getProperties()->getPropertyAsInt("Freeze.Warn.Deadlocks") > 0),
-    _refCountMutex(new SharedMutex),
-    _refCount(0)
-{
-}
-
-void
-Freeze::ConnectionI::closeAllIterators()
-{
-    for(list<MapHelperI*>::iterator p = _mapList.begin(); p != _mapList.end();
-        ++p)
-    {
-        (*p)->closeAllIterators();
-    }
-}
-
-void
-Freeze::ConnectionI::registerMap(MapHelperI* m)
-{
-    _mapList.push_back(m);
-}
-
-void
-Freeze::ConnectionI::unregisterMap(MapHelperI* m)
-{
-    _mapList.remove(m);
-}
-
-Freeze::ConnectionPtr
-Freeze::createConnection(const CommunicatorPtr& communicator, const string& envName)
-{
-
-    return new ConnectionI(SharedDbEnv::get(communicator, envName, 0));
-}
-
-Freeze::ConnectionPtr
-Freeze::createConnection(const CommunicatorPtr& communicator, const string& envName, DbEnv& dbEnv)
-{
-    return new ConnectionI(SharedDbEnv::get(communicator, envName, &dbEnv));
-}
diff --git a/cpp/src/Freeze/ConnectionI.h b/cpp/src/Freeze/ConnectionI.h
deleted file mode 100644
index e32058dccab..00000000000
--- a/cpp/src/Freeze/ConnectionI.h
+++ /dev/null
@@ -1,172 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_CONNECTIONI_H
-#define FREEZE_CONNECTIONI_H
-
-#include <Freeze/Connection.h>
-#include <Freeze/Initialize.h>
-#include <Freeze/TransactionI.h>
-#include <Freeze/SharedDbEnv.h>
-#include <list>
-
-namespace Freeze
-{
-
-class MapHelperI;
-
-//
-// A mutex shared by a connection and all its transactions
-// (for refcounting thread-safety)
-//
-struct SharedMutex : public IceUtil::Shared
-{
-    IceUtil::Mutex mutex;
-};
-typedef IceUtil::Handle<SharedMutex> SharedMutexPtr;
-
-
-class ConnectionI : public Connection
-{
-public:
-
-    virtual TransactionPtr beginTransaction();
-
-    virtual TransactionPtr currentTransaction() const;
-
-    virtual void removeMapIndex(const std::string&, const std::string&);
-
-    virtual void close();
-    
-    virtual Ice::CommunicatorPtr getCommunicator() const;
-
-    virtual Ice::EncodingVersion getEncoding() const;
-
-    virtual std::string getName() const;
-
-    //
-    // Custom refcounting implementation
-    //
-    virtual void __incRef();
-    virtual void __decRef();
-    virtual int __getRef() const;
- 
-    virtual ~ConnectionI();
-
-    ConnectionI(const SharedDbEnvPtr&);
-
-    TransactionIPtr beginTransactionI();
-
-    void closeAllIterators();
-
-    void registerMap(MapHelperI*);
-
-    void unregisterMap(MapHelperI*);
-
-    void clearTransaction();
-
-    DbTxn* dbTxn() const;
-
-    const SharedDbEnvPtr& dbEnv() const;
-       
-    const Ice::CommunicatorPtr& communicator() const;
-    const Ice::EncodingVersion& encoding() const;
-
-    const std::string&  envName() const;
-    
-    Ice::Int trace() const;
-
-    Ice::Int txTrace() const;
-
-    bool deadlockWarning() const;
-
-private:
-
-    friend class TransactionI;
-
-    int __getRefNoSync() const;
-
-    const Ice::CommunicatorPtr _communicator;
-    const Ice::EncodingVersion _encoding;
-    SharedDbEnvPtr _dbEnv;
-    const std::string _envName;
-    TransactionIPtr _transaction;
-    std::list<MapHelperI*> _mapList;
-    const Ice::Int _trace;
-    const Ice::Int _txTrace;
-    const bool _deadlockWarning;
-    SharedMutexPtr _refCountMutex;
-    int _refCount;
-};  
-typedef IceUtil::Handle<ConnectionI> ConnectionIPtr;
-
-inline void
-ConnectionI::clearTransaction()
-{
-    _transaction = 0;
-}
-
-inline DbTxn*
-ConnectionI::dbTxn() const
-{
-    if(!_transaction)
-    {
-        return 0;
-    }
-    else
-    {
-        return _transaction->dbTxn();
-    }
-}
-
-inline const SharedDbEnvPtr&
-ConnectionI::dbEnv() const
-{
-    return _dbEnv;
-}
-
-inline const std::string& 
-ConnectionI::envName() const
-{
-    return _envName;
-}
-
-inline const Ice::CommunicatorPtr&
-ConnectionI::communicator() const
-{
-    return _communicator;
-}
-
-inline const Ice::EncodingVersion&
-ConnectionI::encoding() const
-{
-    return _encoding;
-}
-
-inline Ice::Int
-ConnectionI::trace() const
-{
-    return _trace;
-}
-
-inline Ice::Int
-ConnectionI::txTrace() const
-{
-    return _txTrace;
-}
-
-inline bool
-ConnectionI::deadlockWarning() const
-{
-    return _deadlockWarning;
-}
-
-}
-
-#endif
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp
deleted file mode 100644
index 872b70121a3..00000000000
--- a/cpp/src/Freeze/EvictorI.cpp
+++ /dev/null
@@ -1,365 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/EvictorI.h>
-#include <Freeze/Initialize.h>
-#include <Freeze/Util.h>
-#include <Freeze/EvictorIteratorI.h>
-#include <Freeze/PingObject.h>
-
-#include <IceUtil/IceUtil.h>
-
-#include <IceUtil/StringConverter.h>
-
-#include <typeinfo>
-
-using namespace std;
-using namespace Freeze;
-using namespace Ice;
-using namespace IceUtil;
-
-//
-// Static members
-//
-
-string Freeze::EvictorIBase::defaultDb = "$default";
-string Freeze::EvictorIBase::indexPrefix = "$index:";
-
-
-//
-// DeactivateController
-//
-
-Freeze::DeactivateController::Guard::Guard(const DeactivateController& controller) :
-    _controller(const_cast<DeactivateController&>(controller))
-{
-    Lock sync(controller);
-    if(controller._deactivated || _controller._deactivating)
-    {
-        throw EvictorDeactivatedException(__FILE__, __LINE__);
-    }
-    _controller._guardCount++;
-}
-
-Freeze::DeactivateController::Guard::~Guard()
-{
-    Lock sync(_controller);
-    _controller._guardCount--;
-    if(_controller._deactivating && _controller._guardCount == 0)
-    {
-        //
-        // Notify all the threads -- although we only want to
-        // reach the thread doing the deactivation.
-        //
-        _controller.notifyAll();
-    }
-}
-
-Freeze::DeactivateController::DeactivateController(EvictorIBase* evictor) :
-    _evictor(evictor),
-    _deactivating(false),
-    _deactivated(false),
-    _guardCount(0)
-{
-}
-
-bool
-Freeze::DeactivateController::deactivated() const
-{
-    Lock sync(*this);
-    return _deactivated || _deactivating;
-}
-
-bool
-Freeze::DeactivateController::deactivate()
-{
-    Lock sync(*this);
-
-    if(_deactivated)
-    {
-        return false;
-    }
-
-    if(_deactivating)
-    {
-        //
-        // Wait for deactivated
-        //
-        while(!_deactivated)
-        {
-            wait();
-        }
-        return false;
-    }
-    else
-    {
-        _deactivating = true;
-        while(_guardCount > 0)
-        {
-            if(_evictor->trace() >= 1)
-            {
-                Trace out(_evictor->communicator()->getLogger(), "Freeze.Evictor");
-                out << "Waiting for " << _guardCount << " threads to complete before starting deactivation.";
-            }
-
-            wait();
-        }
-
-        if(_evictor->trace() >= 1)
-        {
-            Trace out(_evictor->communicator()->getLogger(), "Freeze.Evictor");
-            out << "Starting deactivation.";
-        }
-        return true;
-    }
-}
-
-void
-Freeze::DeactivateController::deactivationComplete()
-{
-    if(_evictor->trace() >= 1)
-    {
-        Trace out(_evictor->communicator()->getLogger(), "Freeze.Evictor");
-        out << "Deactivation complete.";
-    }
-
-    Lock sync(*this);
-    _deactivated = true;
-    _deactivating = false;
-    notifyAll();
-}
-
-
-//
-// EvictorIBase
-//
-
-Freeze::EvictorIBase::EvictorIBase(const ObjectAdapterPtr& adapter,
-                                   const string& envName,
-                                   DbEnv* dbEnv,
-                                   const string& filename,
-                                   const FacetTypeMap& facetTypes,
-                                   const ServantInitializerPtr& initializer,
-                                   bool createDb) :
-    _evictorSize(10),
-    _facetTypes(facetTypes),
-    _deactivateController(this),
-    _adapter(adapter),
-    _communicator(adapter->getCommunicator()),
-    _initializer(initializer),
-    _dbEnv(SharedDbEnv::get(_communicator, envName, dbEnv)),
-    _filename(filename),
-    _createDb(createDb),
-    _trace(0),
-    _txTrace(0),
-    _pingObject(new PingObject)
-{
-    _encoding = _dbEnv->getEncoding();
-
-    _trace = _communicator->getProperties()->getPropertyAsInt("Freeze.Trace.Evictor");
-    _txTrace = _communicator->getProperties()->getPropertyAsInt("Freeze.Trace.Transaction");
-    _deadlockWarning = (_communicator->getProperties()->getPropertyAsInt("Freeze.Warn.Deadlocks") > 0);
-}
-
-
-void
-Freeze::EvictorIBase::setSize(Int evictorSize)
-{
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-
-    Lock sync(*this);
-
-    //
-    // Ignore requests to set the evictor size to values smaller than zero.
-    //
-    if(evictorSize < 0)
-    {
-        return;
-    }
-
-    //
-    // Update the evictor size.
-    //
-    _evictorSize = static_cast<size_t>(evictorSize);
-
-    //
-    // Evict as many elements as necessary.
-    //
-    evict();
-}
-
-Int
-Freeze::EvictorIBase::getSize()
-{
-    Lock sync(*this);
-    return static_cast<Int>(_evictorSize);
-}
-
-
-Ice::ObjectPrx
-Freeze::EvictorIBase::add(const ObjectPtr& servant, const Identity& ident)
-{
-    return addFacet(servant, ident, "");
-}
-
-Ice::ObjectPtr
-Freeze::EvictorIBase::remove(const Identity& ident)
-{
-    return removeFacet(ident, "");
-}
-
-bool
-Freeze::EvictorIBase::hasObject(const Identity& ident)
-{
-    return hasFacet(ident, "");
-}
-
-ObjectPtr
-Freeze::EvictorIBase::locate(const Current& current, LocalObjectPtr& cookie)
-{
-    //
-    // Special ice_ping() handling
-    //
-    if(current.operation == "ice_ping")
-    {
-        if(hasFacet(current.id, current.facet))
-        {
-            if(_trace >= 3)
-            {
-                Trace out(_communicator->getLogger(), "Freeze.Evictor");
-                out << "ice_ping found \"" << _communicator->identityToString(current.id)
-                    << "\" with facet \"" << current.facet + "\"";
-            }
-
-            cookie = 0;
-            return _pingObject;
-        }
-        else if(hasAnotherFacet(current.id, current.facet))
-        {
-            if(_trace >= 3)
-            {
-                Trace out(_communicator->getLogger(), "Freeze.Evictor");
-                out << "ice_ping raises FacetNotExistException for \"" << _communicator->identityToString(current.id)
-                    << "\" with facet \"" << current.facet + "\"";
-            }
-            throw FacetNotExistException(__FILE__, __LINE__);
-        }
-        else
-        {
-            if(_trace >= 3)
-            {
-                Trace out(_communicator->getLogger(), "Freeze.Evictor");
-                out << "ice_ping will raise ObjectNotExistException for \""
-                    << _communicator->identityToString(current.id)  << "\" with facet \"" << current.facet + "\"";
-            }
-            return 0;
-        }
-    }
-
-    ObjectPtr result = locateImpl(current, cookie);
-
-    if(result == 0)
-    {
-        if(hasAnotherFacet(current.id, current.facet))
-        {
-            throw FacetNotExistException(__FILE__, __LINE__);
-        }
-    }
-    return result;
-}
-
-
-void
-Freeze::EvictorIBase::initialize(const Identity& ident, const string& facet, const ObjectPtr& servant)
-{
-    if(_initializer != 0)
-    {
-        _initializer->initialize(_adapter, ident, facet, servant);
-    }
-}
-
-void
-Freeze::EvictorIBase::updateStats(Statistics& stats, IceUtil::Int64 time)
-{
-    IceUtil::Int64 diff = time - (stats.creationTime + stats.lastSaveTime);
-    if(stats.lastSaveTime == 0)
-    {
-        stats.lastSaveTime = diff;
-        stats.avgSaveTime = diff;
-    }
-    else
-    {
-        stats.lastSaveTime = time - stats.creationTime;
-        stats.avgSaveTime = static_cast<IceUtil::Int64>(stats.avgSaveTime * 0.95 + diff * 0.05);
-    }
-}
-
-
-const string&
-Freeze::EvictorIBase::filename() const
-{
-    return _filename;
-}
-
-vector<string>
-Freeze::EvictorIBase::allDbs() const
-{
-    vector<string> result;
-
-    try
-    {
-        Db db(_dbEnv->getEnv(), 0);
-
-        //
-        // Berkeley DB expects file paths to be UTF8 encoded.
-        //
-        db.open(0, nativeToUTF8(_filename, IceUtil::getProcessStringConverter()).c_str(), 0, DB_UNKNOWN,
-                DB_RDONLY, 0);
-
-        Dbc* dbc = 0;
-        db.cursor(0, &dbc, 0);
-
-        Dbt dbKey;
-        dbKey.set_flags(DB_DBT_MALLOC);
-
-        Dbt dbValue;
-        dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-        bool more = true;
-        while(more)
-        {
-            more = (dbc->get(&dbKey, &dbValue, DB_NEXT) == 0);
-            if(more)
-            {
-                string dbName(static_cast<char*>(dbKey.get_data()), dbKey.get_size());
-
-                if(dbName.find(indexPrefix) != 0)
-                {
-                    result.push_back(dbName);
-                }
-                free(dbKey.get_data());
-            }
-        }
-
-        dbc->close();
-        db.close(0);
-    }
-    catch(const DbException& dx)
-    {
-        if(dx.get_errno() != ENOENT)
-        {
-            DatabaseException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-    }
-
-    return result;
-}
-
diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h
deleted file mode 100644
index b76a29018d2..00000000000
--- a/cpp/src/Freeze/EvictorI.h
+++ /dev/null
@@ -1,355 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_EVICTOR_I_H
-#define FREEZE_EVICTOR_I_H
-
-#include <IceUtil/IceUtil.h>
-#include <Ice/Ice.h>
-#include <Freeze/Freeze.h>
-#include <Freeze/ObjectStore.h>
-#include <Freeze/EvictorIteratorI.h>
-#include <Freeze/SharedDbEnv.h>
-#include <Freeze/Index.h>
-#include <Freeze/DB.h>
-#include <list>
-#include <vector>
-#include <deque>
-
-class DbTxn;
-
-namespace Freeze
-{
-
-class EvictorIBase;
-
-//
-// Helper class to prevent deactivation while the Evictor is in use
-//
-class DeactivateController : private IceUtil::Monitor<IceUtil::Mutex>
-{
-public:
-
-    //
-    // Prevents deactivation; the constructor raises
-    // EvictorDeactivatedException if _deactivated or _deactivating is true.
-    //
-    class Guard
-    {
-    public:
-        Guard(const DeactivateController&);
-        ~Guard();
-
-    private:
-        DeactivateController& _controller;
-    };
-
-    DeactivateController(EvictorIBase*);
-
-    //
-    // Used mostly in asserts
-    //
-    bool deactivated() const;
-
-    //
-    // Returns true if this thread is supposed to do the deactivation and
-    // call deactivationComplete() once done.
-    //
-    bool deactivate();
-
-    void deactivationComplete();
-
-private:
-
-    friend class Guard;
-
-    EvictorIBase* _evictor;
-    bool _deactivating;
-    bool _deactivated;
-    int _guardCount;
-};
-
-
-class EvictorIBase : public virtual Evictor, public IceUtil::Monitor<IceUtil::Mutex>
-{
-public:
-
-    virtual TransactionIPtr beforeQuery() = 0;
-
-    virtual void setSize(Ice::Int);
-    virtual Ice::Int getSize();
-
-    virtual Ice::ObjectPrx add(const Ice::ObjectPtr&, const Ice::Identity&);
-    virtual Ice::ObjectPtr remove(const Ice::Identity&);
-
-    virtual bool hasObject(const Ice::Identity&);
-
-    virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&);
-
-    DeactivateController& deactivateController();
-    const Ice::CommunicatorPtr& communicator() const;
-    const Ice::EncodingVersion& encoding() const;
-    const SharedDbEnvPtr& dbEnv() const;
-    const std::string& filename() const;
-
-    bool deadlockWarning() const;
-    Ice::Int trace() const;
-    Ice::Int txTrace() const;
-
-    void initialize(const Ice::Identity&, const std::string&, const Ice::ObjectPtr&);
-
-
-    static void updateStats(Statistics&, IceUtil::Int64);
-
-    static std::string defaultDb;
-    static std::string indexPrefix;
-
-protected:
-
-    EvictorIBase(const Ice::ObjectAdapterPtr&, const std::string&, DbEnv*, const std::string&,
-             const FacetTypeMap&, const ServantInitializerPtr&, bool);
-
-
-    virtual bool hasAnotherFacet(const Ice::Identity&, const std::string&) = 0;
-
-    virtual Ice::ObjectPtr locateImpl(const Ice::Current&, Ice::LocalObjectPtr&) = 0;
-
-    virtual void evict() = 0;
-
-    std::vector<std::string> allDbs() const;
-
-    size_t _evictorSize;
-
-    FacetTypeMap _facetTypes;
-
-    DeactivateController _deactivateController;
-
-    Ice::ObjectAdapterPtr _adapter;
-    Ice::CommunicatorPtr _communicator;
-    Ice::EncodingVersion _encoding;
-
-    ServantInitializerPtr _initializer;
-
-    SharedDbEnvPtr _dbEnv;
-
-    std::string _filename;
-    bool _createDb;
-
-    Ice::Int _trace;
-    Ice::Int _txTrace;
-
-    bool _deadlockWarning;
-
-private:
-
-    Ice::ObjectPtr _pingObject;
-};
-
-typedef IceUtil::Handle<EvictorIBase> EvictorIBasePtr;
-
-
-template<class T>
-class EvictorI : public EvictorIBase
-{
-public:
-
-    virtual EvictorIteratorPtr
-    getIterator(const std::string& facet, Ice::Int batchSize)
-    {
-        DeactivateController::Guard deactivateGuard(_deactivateController);
-
-        TransactionIPtr tx = beforeQuery();
-        return new EvictorIteratorI(findStore(facet, false), tx, batchSize);
-    }
-
-protected:
-
-    EvictorI(const Ice::ObjectAdapterPtr& adapter, const std::string& envName, DbEnv* dbEnv,
-             const std::string& filename, const FacetTypeMap& facetTypes,
-             const ServantInitializerPtr& initializer, const std::vector<IndexPtr>& indices, bool createDb) :
-        EvictorIBase(adapter, envName, dbEnv, filename, facetTypes, initializer, createDb)
-    {
-        std::string propertyPrefix = std::string("Freeze.Evictor.") + envName + '.' + filename;
-        bool populateEmptyIndices =
-            (_communicator->getProperties()->
-             getPropertyAsIntWithDefault(propertyPrefix + ".PopulateEmptyIndices", 0) != 0);
-
-        //
-        // Instantiate all Dbs in 2 steps:
-        // (1) iterate over the indices and create ObjectStore with indices
-        // (2) open ObjectStores without indices
-        //
-        std::vector<std::string> dbs = allDbs();
-
-        //
-        // Add default db in case it's not there
-        //
-        dbs.push_back(defaultDb);
-
-        for(std::vector<IndexPtr>::const_iterator i = indices.begin(); i != indices.end(); ++i)
-        {
-            std::string facet = (*i)->facet();
-
-            typename StoreMap::iterator q = _storeMap.find(facet);
-            if(q == _storeMap.end())
-            {
-                //
-                // New db
-                //
-                std::vector<IndexPtr> storeIndices;
-
-                for(std::vector<IndexPtr>::const_iterator r = i; r != indices.end(); ++r)
-                {
-                    if((*r)->facet() == facet)
-                    {
-                        storeIndices.push_back(*r);
-                    }
-                }
-                std::string facetType;
-                FacetTypeMap::const_iterator ft = facetTypes.find(facet);
-                if(ft != facetTypes.end())
-                {
-                    facetType = ft->second;
-                }
-                ObjectStore<T>* store = new ObjectStore<T>(facet, facetType,_createDb, this, storeIndices, populateEmptyIndices);
-                _storeMap.insert(typename StoreMap::value_type(facet, store));
-            }
-        }
-
-        for(std::vector<std::string>::iterator p = dbs.begin(); p != dbs.end(); ++p)
-        {
-            std::string facet = *p;
-            if(facet == defaultDb)
-            {
-                facet = "";
-            }
-#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
-            std::pair<typename StoreMap::iterator, bool> ir =
-                _storeMap.insert(typename StoreMap::value_type(facet, static_cast<ObjectStore<T>*>(nullptr)));
-#else
-            std::pair<typename StoreMap::iterator, bool> ir =
-                _storeMap.insert(typename StoreMap::value_type(facet, 0));
-#endif
-
-            if(ir.second)
-            {
-                std::string facetType;
-                FacetTypeMap::const_iterator ft = facetTypes.find(facet);
-                if(ft != facetTypes.end())
-                {
-                    facetType = ft->second;
-                }
-
-                ir.first->second = new ObjectStore<T>(facet, facetType, _createDb, this);
-            }
-        }
-    }
-
-    ObjectStore<T>*
-    findStore(const std::string& facet, bool createIt)
-    {
-        Lock sync(*this);
-        ObjectStore<T>* os = 0;
-
-        typename StoreMap::const_iterator p = _storeMap.find(facet);
-        if(p != _storeMap.end())
-        {
-            os = (*p).second;
-        }
-        else if(createIt)
-        {
-            std::string facetType;
-            typename FacetTypeMap::const_iterator q = _facetTypes.find(facet);
-            if(q != _facetTypes.end())
-            {
-                facetType = q->second;
-            }
-            os = new ObjectStore<T>(facet, facetType, true, this);
-            _storeMap.insert(typename StoreMap::value_type(facet, os));
-        }
-        return os;
-    }
-
-    void
-    closeDbEnv()
-    {
-        for(typename StoreMap::iterator p = _storeMap.begin(); p != _storeMap.end(); ++p)
-        {
-            delete (*p).second;
-        }
-
-        _dbEnv = 0;
-        _initializer = 0;
-    }
-
-    typedef std::map<std::string, ObjectStore<T>*> StoreMap;
-    StoreMap _storeMap;
-};
-
-
-inline DeactivateController&
-EvictorIBase::deactivateController()
-{
-    return _deactivateController;
-}
-
-inline const Ice::CommunicatorPtr&
-EvictorIBase::communicator() const
-{
-    return _communicator;
-}
-
-inline const Ice::EncodingVersion&
-EvictorIBase::encoding() const
-{
-    return _encoding;
-}
-
-inline const SharedDbEnvPtr&
-EvictorIBase::dbEnv() const
-{
-    return _dbEnv;
-}
-
-inline bool
-EvictorIBase::deadlockWarning() const
-{
-    return _deadlockWarning;
-}
-
-inline Ice::Int
-EvictorIBase::trace() const
-{
-    return _trace;
-}
-
-//
-// Helper function
-//
-inline void
-checkIdentity(const Ice::Identity& ident)
-{
-    if(ident.name.size() == 0)
-    {
-        throw Ice::IllegalIdentityException(__FILE__, __LINE__, ident);
-    }
-}
-
-inline void
-checkServant(const Ice::ObjectPtr& servant)
-{
-    if(servant == 0)
-    {
-        throw Ice::IllegalServantException(__FILE__, __LINE__, "cannot add null servant to Freeze Evictor");
-    }
-}
-
-}
-
-#endif
diff --git a/cpp/src/Freeze/EvictorIteratorI.cpp b/cpp/src/Freeze/EvictorIteratorI.cpp
deleted file mode 100644
index 8895e404e45..00000000000
--- a/cpp/src/Freeze/EvictorIteratorI.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/EvictorIteratorI.h>
-#include <Freeze/ObjectStore.h>
-#include <Freeze/EvictorI.h>
-#include <Freeze/Util.h>
-
-using namespace std;
-using namespace Freeze;
-using namespace Ice;
-
-
-Freeze::EvictorIteratorI::EvictorIteratorI(ObjectStoreBase* store, const TransactionIPtr& tx, Int batchSize) :
-    _store(store),
-    _batchSize(static_cast<size_t>(batchSize)),
-    _key(1024),
-    _more(store != 0),
-    _initialized(false),
-    _tx(tx)
-{
-    _batchIterator = _batch.end();
-}
-
-
-bool
-Freeze::EvictorIteratorI::hasNext()
-{
-    if(_batchIterator != _batch.end()) 
-    {
-        return true;
-    }
-    else
-    {
-        _batchIterator = nextBatch();
-        return (_batchIterator != _batch.end());
-    }
-}
-
-Identity
-Freeze::EvictorIteratorI::next()
-{
-    if(hasNext())
-    {
-        return *_batchIterator++;
-    }
-    else
-    {
-        throw Freeze::NoSuchElementException(__FILE__, __LINE__);
-    }
-}
-
-
-vector<Identity>::const_iterator
-Freeze::EvictorIteratorI::nextBatch()
-{
-    _batch.clear();
-
-    if(!_more)
-    {
-        return _batch.end();
-    }
-
-    DeactivateController::Guard 
-        deactivateGuard(_store->evictor()->deactivateController());
-     
-    Key firstKey = _key;
-
-    const CommunicatorPtr& communicator = _store->communicator();
-    const EncodingVersion& encoding = _store->encoding();
-   
-    DbTxn* txn = _tx == 0 ? 0: _tx->dbTxn();
-
-    try
-    {
-        for(;;)
-        {
-            _batch.clear();
-            
-            Dbt dbKey;
-            initializeOutDbt(_key, dbKey);
-
-            Dbt dbValue;
-            dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-           
-            Dbc* dbc = 0;
-            try
-            {
-                //
-                // Move to the first record
-                // 
-                u_int32_t flags = DB_NEXT;
-
-                if(_initialized)
-                {
-                    //
-                    // _key represents the next element not yet returned
-                    // if it has been deleted, we want the one after
-                    //
-                    flags = DB_SET_RANGE;
-
-                    //
-                    // Will be used as input as well
-                    //
-                    dbKey.set_size(static_cast<u_int32_t>(firstKey.size()));
-                }
-                
-                _store->db()->cursor(txn, &dbc, 0);
-
-                bool done = false;
-                do
-                {
-                    for(;;)
-                    {
-                        try
-                        {
-                            //
-                            // It is critical to set key size to key capacity before the
-                            // get, as a resize that increases the size inserts 0
-                            //
-                            _key.resize(_key.capacity());
-
-                            _more = (dbc->get(&dbKey, &dbValue, flags) == 0);
-                            if(_more)
-                            {
-                                _key.resize(dbKey.get_size());
-                                _initialized = true;
-
-                                flags = DB_NEXT;
-                    
-                                Ice::Identity ident;
-                                ObjectStoreBase::unmarshal(ident, _key, communicator, encoding);
-                                if(_batch.size() < _batchSize)
-                                {
-                                    _batch.push_back(ident);
-                                }
-                                else
-                                {
-                                    //
-                                    // Keep the last element in _key
-                                    //
-                                    done = true;
-                                }
-                            }
-                            break;
-                        }
-                        catch(const DbDeadlockException&)
-                        {
-                            throw;
-                        }
-                        catch(const DbException& dx)
-                        {
-                            handleDbException(dx, _key, dbKey, __FILE__, __LINE__);
-                        }
-                    }
-                }
-                while(!done && _more);
-
-                Dbc* toClose = dbc;
-                dbc = 0;
-                toClose->close();
-                break; // for (;;)
-            }
-            catch(const DbDeadlockException&)
-            {
-                if(dbc != 0)
-                {
-                    try
-                    {
-                        dbc->close();
-                    }
-                    catch(const DbDeadlockException&)
-                    {
-                        if(_tx != 0)
-                        {
-                            throw;
-                        }
-                        // Else, ignored
-                    }
-                }
-                
-                if(_tx == 0)
-                {
-                    _key = firstKey;
-                    //
-                    // Retry
-                    //
-                }
-                else
-                {
-                    throw;
-                }
-            }
-            catch(...)
-            {
-                if(dbc != 0)
-                {
-                    try
-                    {
-                        dbc->close();
-                    }
-                    catch(const DbDeadlockException&)
-                    {
-                        if(_tx != 0)
-                        {
-                            throw;
-                        }
-                        // Else, ignored
-                    }
-                }
-                throw;
-            }
-        }
-    }
-    catch(const DbDeadlockException& dx)
-    {
-        throw DeadlockException(__FILE__, __LINE__, dx.what(), _tx);
-    }
-    catch(const DbException& dx)
-    {
-        handleDbException(dx, __FILE__, __LINE__);
-    }
-    
-    if(_batch.size() == 0)
-    {
-        return _batch.end();
-    }
-    else
-    {
-        return _batch.begin();
-    }
-}
diff --git a/cpp/src/Freeze/EvictorIteratorI.h b/cpp/src/Freeze/EvictorIteratorI.h
deleted file mode 100644
index 7f91777d788..00000000000
--- a/cpp/src/Freeze/EvictorIteratorI.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_EVICTOR_ITERATOR_I_H
-#define FREEZE_EVICTOR_ITERATOR_I_H
-
-#include <Ice/Ice.h>
-#include <Freeze/Freeze.h>
-#include <vector>
-
-namespace Freeze
-{
-
-class TransactionI;
-typedef IceUtil::Handle<TransactionI> TransactionIPtr;
-
-
-class ObjectStoreBase;
-
-class EvictorIteratorI : public EvictorIterator
-{
-public:
-
-    EvictorIteratorI(ObjectStoreBase*, const TransactionIPtr&, Ice::Int);
-
-    virtual bool hasNext();
-    virtual Ice::Identity next();
-
-private:
-
-    std::vector<Ice::Identity>::const_iterator
-    nextBatch();
-
-    ObjectStoreBase* _store;
-    size_t _batchSize;
-    std::vector<Ice::Identity>::const_iterator _batchIterator;
-
-    Key _key;
-    std::vector<Ice::Identity> _batch;
-    bool _more;
-    bool _initialized;
-    TransactionIPtr _tx;
-};
-
-}
-
-#endif
diff --git a/cpp/src/Freeze/Freeze.rc b/cpp/src/Freeze/Freeze.rc
deleted file mode 100644
index 87bb7d60a4f..00000000000
--- a/cpp/src/Freeze/Freeze.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "freeze36d\0"
- #define ORIGINALFILENAME "freeze36d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "freeze36\0"
- #define ORIGINALFILENAME "freeze36.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "Freeze C++ Library\0"
-            VALUE "FileVersion", "3.6.3\0"
-            VALUE "InternalName", INTERNALNAME
-            VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
-            VALUE "OriginalFilename", ORIGINALFILENAME
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
diff --git a/cpp/src/Freeze/Index.cpp b/cpp/src/Freeze/Index.cpp
deleted file mode 100644
index 73beddf9c6e..00000000000
--- a/cpp/src/Freeze/Index.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/Index.h>
-#include <Freeze/IndexI.h>
-
-using namespace Freeze;
-using namespace Ice;
-using namespace std;
-
-Freeze::Index::~Index()
-{
-    delete _impl;
-}
-
-Freeze::Index::Index(const string& name, const string& facet) :
-    _name(name),
-    _facet(facet),
-    _impl(new IndexI(*this))
-{
-}
-
-const string&
-Freeze::Index::name() const
-{
-    return _name;
-}
-
-const string&
-Freeze::Index::facet() const
-{
-    return _facet;
-}
-  
-vector<Identity>
-Freeze::Index::untypedFindFirst(const Key& bytes, Int firstN) const
-{
-    return _impl->untypedFindFirst(bytes, firstN);
-}   
-
-vector<Identity>
-Freeze::Index::untypedFind(const Key& bytes) const
-{
-    return _impl->untypedFind(bytes);
-}
-    
-Int
-Freeze::Index::untypedCount(const Key& bytes) const
-{
-    return _impl->untypedCount(bytes);
-}
diff --git a/cpp/src/Freeze/IndexI.cpp b/cpp/src/Freeze/IndexI.cpp
deleted file mode 100644
index 7219666e728..00000000000
--- a/cpp/src/Freeze/IndexI.cpp
+++ /dev/null
@@ -1,447 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/IndexI.h>
-#include <Freeze/Util.h>
-#include <Freeze/ObjectStore.h>
-#include <Freeze/EvictorI.h>
-
-#include <IceUtil/StringConverter.h>
-
-using namespace Freeze;
-using namespace Ice;
-using namespace std;
-
-
-static int 
-callback(Db* secondary, const Dbt* key, const Dbt* value, Dbt* result)
-{
-    void* indexObj = secondary->get_app_private();
-    IndexI* index = static_cast<IndexI*>(indexObj);
-    assert(index != 0);
-    return index->secondaryKeyCreate(secondary, key, value, result);
-}
-
-
-Freeze::IndexI::IndexI(Index& index) :
-    _index(index),
-    _store(0)
-{
-}
- 
-vector<Identity>
-Freeze::IndexI::untypedFindFirst(const Key& bytes, Int firstN) const
-{
-    DeactivateController::Guard 
-        deactivateGuard(_store->evictor()->deactivateController());
-
-    Dbt dbKey;
-    initializeInDbt(bytes, dbKey);
-#if (DB_VERSION_MAJOR <= 4) || (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR <= 1)
-    //
-    // When we have a custom-comparison function, Berkeley DB returns
-    // the key on-disk (when it finds one). We disable this behavior:
-    // (ref Oracle SR 5925672.992)
-    //
-    dbKey.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-#else
-    //
-    // In DB > 5.1 we can not set DB_DBT_PARTIAL in the key Dbt,
-    // when using DB_SET, we must resize the Dbt key param to hold enought
-    // space or Dbc::get fails with DB_BUFFER_SMALL.
-    //
-    dbKey.set_flags(DB_DBT_USERMEM);
-    dbKey.set_ulen(static_cast<u_int32_t>(bytes.size()));
-#endif
-                
-    Key pkey(1024);
-    Dbt pdbKey;
-    initializeOutDbt(pkey, pdbKey);
-
-    Dbt dbValue;
-    dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-    const Ice::CommunicatorPtr& communicator = _store->communicator();
-    const Ice::EncodingVersion& encoding = _store->encoding();
-
-    TransactionIPtr transaction = _store->evictor()->beforeQuery();
-    DbTxn* tx = transaction == 0 ? 0 : transaction->dbTxn();
-
-    vector<Identity> identities;
-
-    try
-    {
-        for(;;)
-        {
-            Dbc* dbc = 0;
-            identities.clear();
-
-            try
-            {
-                //
-                // Move to the first record
-                // 
-                _db->cursor(tx, &dbc, 0);
-                u_int32_t flags = DB_SET;
-
-                bool found;
-                
-                do
-                {
-                    for(;;)
-                    {
-                        try
-                        {
-                            //
-                            // It is critical to set key size to key capacity before the
-                            // get, as a resize that increases the size inserts 0
-                            //
-                            pkey.resize(pkey.capacity());
-
-                            found = (dbc->pget(&dbKey, &pdbKey, &dbValue, flags) == 0);
-                            if(found)
-                            {
-                                pkey.resize(pdbKey.get_size());
-                                
-                                Ice::Identity ident;
-                                ObjectStoreBase::unmarshal(ident, pkey, communicator, encoding);
-                                identities.push_back(ident);
-                                flags = DB_NEXT_DUP;
-                            }
-                            break; // for(;;)
-                        }
-                        catch(const DbDeadlockException&)
-                        {
-                            throw;
-                        }
-                        catch(const DbException& dx)
-                        {
-                            handleDbException(dx, pkey, pdbKey, __FILE__, __LINE__);
-                        }
-                    }
-                }                   
-                while((firstN <= 0 || identities.size() < static_cast<size_t>(firstN)) && found);
-
-                Dbc* toClose = dbc;
-                dbc = 0;
-                toClose->close();
-                break; // for (;;)
-            }
-            catch(const DbDeadlockException&)
-            {
-                if(dbc != 0)
-                {
-                    try
-                    {
-                        dbc->close();
-                    }
-                    catch(const DbDeadlockException&)
-                    {
-                        if(tx != 0)
-                        {
-                            throw;
-                        }
-                        // Else ignored
-                    }
-                }
-
-                if(_store->evictor()->deadlockWarning())
-                {
-                    Warning out(_store->communicator()->getLogger());
-                    out << "Deadlock in Freeze::IndexI::untypedFindFirst while searching \"" 
-                        << _store->evictor()->filename() + "/" + _dbName << "\"; retrying ...";
-                }
-
-                if(tx != 0)
-                {
-                    throw;
-                }
-                // Else retry
-            }
-            catch(...)
-            {
-                if(dbc != 0)
-                {
-                    try
-                    {
-                        dbc->close();
-                    }
-                    catch(const DbDeadlockException&)
-                    {
-                        if(tx != 0)
-                        {
-                            throw;
-                        }
-                        // Else ignored
-                    }
-                }
-                throw;
-            }
-        }
-    }
-    catch(const DbDeadlockException& dx)
-    {
-        throw DeadlockException(__FILE__, __LINE__, dx.what(), transaction);
-    }
-    catch(const DbException& dx)
-    {
-        handleDbException(dx, __FILE__, __LINE__);
-    }
-    
-    return identities;
-}
-    
-vector<Identity>
-Freeze::IndexI::untypedFind(const Key& bytes) const
-{
-    return untypedFindFirst(bytes, 0);
-}
-
-Int
-Freeze::IndexI::untypedCount(const Key& bytes) const
-{
-    DeactivateController::Guard 
-        deactivateGuard(_store->evictor()->deactivateController());
-
-    Dbt dbKey;
-    initializeInDbt(bytes, dbKey);
-#if (DB_VERSION_MAJOR <= 4) || (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR <= 1)
-    //
-    // When we have a custom-comparison function, Berkeley DB returns
-    // the key on-disk (when it finds one). We disable this behavior:
-    // (ref Oracle SR 5925672.992)
-    //
-    dbKey.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-#else
-    //
-    // In DB > 5.1 we can not set DB_DBT_PARTIAL in the key Dbt,
-    // when using DB_SET, we must resize the Dbt key param to hold enought
-    // space or Dbc::get fails with DB_BUFFER_SMALL.
-    //
-    dbKey.set_flags(DB_DBT_USERMEM);
-    dbKey.set_ulen(static_cast<u_int32_t>(bytes.size()));
-#endif
-    
-    Dbt dbValue;
-    dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-    TransactionIPtr transaction = _store->evictor()->beforeQuery();
-    DbTxn* tx = transaction == 0 ? 0 : transaction->dbTxn();
-
-    Int result = 0;
-    
-    try
-    {
-        for(;;)
-        {
-            Dbc* dbc = 0;
-            
-            try
-            {
-                //
-                // Move to the first record
-                // 
-                _db->cursor(tx, &dbc, 0);
-                bool found = (dbc->get(&dbKey, &dbValue, DB_SET) == 0);
-                
-                if(found)
-                {
-                    db_recno_t count = 0;
-                    dbc->count(&count, 0);
-                    result = static_cast<Int>(count);
-                }
-                
-                Dbc* toClose = dbc;
-                dbc = 0;
-                toClose->close();
-                break; // for (;;)
-            }
-            catch(const DbDeadlockException&)
-            {
-                if(dbc != 0)
-                {
-                    try
-                    {
-                        dbc->close();
-                    }
-                    catch(const DbDeadlockException&)
-                    {
-                        if(tx != 0)
-                        {
-                            throw;
-                        }
-                        // Else ignored
-                    }
-                }
-
-                if(_store->evictor()->deadlockWarning())
-                {
-                    Warning out(_store->communicator()->getLogger());
-                    out << "Deadlock in Freeze::IndexI::untypedCount while searching \"" 
-                        << _store->evictor()->filename() + "/" + _dbName << "\"; retrying ...";
-                }
-
-                if(tx != 0)
-                {
-                    throw;
-                }
-                // Else retry
-                
-            }
-            catch(...)
-            {
-                if(dbc != 0)
-                {
-                    try
-                    {
-                        dbc->close();
-                    }
-                    catch(const DbDeadlockException&)
-                    {
-                        if(tx != 0)
-                        {
-                            throw;
-                        }
-                        // Else ignored
-                    }
-                }
-                throw;
-            }
-        }
-    }
-    catch(const DbDeadlockException& dx)
-    {
-        throw DeadlockException(__FILE__, __LINE__, dx.what(), transaction);
-    }
-    catch(const DbException& dx)
-    {
-        DatabaseException ex(__FILE__, __LINE__);
-        ex.message = dx.what();
-        throw ex;
-    }
-    
-    return result;
-}
-
-void
-Freeze::IndexI::associate(ObjectStoreBase* store, DbTxn* txn, 
-                          bool createDb, bool populateIndex)
-{
-    assert(txn != 0);
-    _store = store;
-    _index._communicator = store->communicator();
-    _index._encoding = store->encoding();
-    
-    _db.reset(new Db(store->evictor()->dbEnv()->getEnv(), 0));
-    _db->set_flags(DB_DUP | DB_DUPSORT);
-    _db->set_app_private(this);
-
-    _dbName = EvictorIBase::indexPrefix + store->dbName() + "." + _index.name();
-
-    Ice::PropertiesPtr properties = store->communicator()->getProperties();
-    string propPrefix = "Freeze.Evictor." + store->evictor()->filename() + ".";
-
-    int btreeMinKey = properties->getPropertyAsInt(propPrefix + _dbName + ".BtreeMinKey");
-    if(btreeMinKey > 2)
-    {
-        if(store->evictor()->trace() >= 1)
-        {
-            Trace out(store->evictor()->communicator()->getLogger(), "Freeze.Evictor");
-            out << "Setting \"" << store->evictor()->filename() + "." + _dbName << "\"'s btree minkey to " << btreeMinKey;
-        }
-        _db->set_bt_minkey(btreeMinKey);
-    }
-        
-    bool checksum = properties->getPropertyAsInt(propPrefix + "Checksum") > 0;
-    if(checksum)
-    {
-        //
-        // No tracing on purpose
-        //
-
-        _db->set_flags(DB_CHKSUM);
-    }
-    
-    //
-    // pagesize can't change
-    //
-
-    u_int32_t flags = 0;
-    if(createDb)
-    {
-        flags = DB_CREATE;
-    }
-
-    //
-    //
-    // Berkeley DB expects file paths to be UTF8 encoded. We keep 
-    // _dbName as a native string here, while it might have
-    // been better to convert it to UTF-8, changing this isn't
-    // possible without potentially breaking backward compatibility
-    // with deployed databases.
-    //
-    _db->open(txn, 
-              IceUtil::nativeToUTF8(store->evictor()->filename(), IceUtil::getProcessStringConverter()).c_str(),
-              _dbName.c_str(), DB_BTREE, flags, FREEZE_DB_MODE);
-
-    flags = 0;
-    if(populateIndex)
-    {
-        flags = DB_CREATE;
-    }
-    store->db()->associate(txn, _db.get(), callback, flags);
-}
-
-int
-Freeze::IndexI::secondaryKeyCreate(Db* /*secondary*/, const Dbt* /*dbKey*/, 
-                                   const Dbt* dbValue, Dbt* result)
-{
-    const Ice::CommunicatorPtr& communicator = _store->communicator();
-    const Ice::EncodingVersion& encoding = _store->encoding();
-
-    ObjectRecord rec;
-    Byte* first = static_cast<Byte*>(dbValue->get_data());
-    Value value(first, first + dbValue->get_size());
-    ObjectStoreBase::unmarshal(rec, value, communicator, encoding, _store->keepStats());
-
-    Key bytes;
-    if(_index.marshalKey(rec.servant, bytes))
-    {
-        result->set_flags(DB_DBT_APPMALLOC);
-        void* data = malloc(bytes.size());
-        memcpy(data, &bytes[0], bytes.size());
-        result->set_data(data);
-        result->set_size(static_cast<u_int32_t>(bytes.size()));
-        return 0;
-    }
-    else
-    {
-        //
-        // Don't want to index this one
-        //
-        return DB_DONOTINDEX;
-    }
-}
-
-void
-Freeze::IndexI::close()
-{
-    if(_db.get() != 0)
-    {
-        try
-        {
-            _db->close(0);
-        }
-        catch(const DbException& dx)
-        {
-            throw DatabaseException(__FILE__, __LINE__, dx.what());
-        }
-        _db.reset(0);   
-    }
-}
diff --git a/cpp/src/Freeze/IndexI.h b/cpp/src/Freeze/IndexI.h
deleted file mode 100644
index a4baad214a2..00000000000
--- a/cpp/src/Freeze/IndexI.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_INDEX_I_H
-#define FREEZE_INDEX_I_H
-
-#include <Ice/Ice.h>
-#include <Freeze/Index.h>
-#include <Freeze/EvictorI.h>
-
-namespace Freeze
-{
-
-class ObjectStoreBase;
-
-class IndexI
-{
-public:
-    
-    IndexI(Index&);
-
-    std::vector<Ice::Identity> untypedFindFirst(const Key&, Ice::Int) const;
-    
-    std::vector<Ice::Identity> untypedFind(const Key&) const;
-    
-    Ice::Int untypedCount(const Key&) const;
-    
-    void
-    associate(ObjectStoreBase*, DbTxn*, bool, bool);
-
-    int
-    secondaryKeyCreate(Db*, const Dbt*, const Dbt*, Dbt*);
-
-    void
-    close();
-    
-private:
-
-    Index& _index;
-    std::string _dbName;
-    IceUtil::UniquePtr<Db> _db;
-    ObjectStoreBase* _store;
-};
-
-}
-#endif
-
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile
deleted file mode 100644
index bfbff526c37..00000000000
--- a/cpp/src/Freeze/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME     = $(call mklibfilename,Freeze,$(VERSION))
-SONAME          = $(call mksoname,Freeze,$(SOVERSION))
-LIBNAME		= $(call mklibname,Freeze)
-
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-
-SLICE_OBJS      = BackgroundSaveEvictor.o \
-		  CatalogData.o \
-		  Connection.o \
-		  ConnectionF.o \
-		  DB.o \
-		  Evictor.o \
-		  EvictorF.o \
-		  EvictorStorage.o \
-		  Exception.o \
-		  Transaction.o \
-		  TransactionalEvictor.o \
-		  PingObject.o
-
-OBJS	        = BackgroundSaveEvictorI.o \
-		  Catalog.o \
-		  CatalogIndexList.o \
-		  ConnectionI.o \
-		  EvictorI.o \
-		  EvictorIteratorI.o \
-		  Index.o \
-		  IndexI.o \
-		  MapDb.o \
-		  MapI.o \
-		  ObjectStore.o \
-		  SharedDbEnv.o \
-		  TransactionalEvictorContext.o \
-		  TransactionalEvictorI.o \
-		  TransactionHolder.o \
-		  TransactionI.o \
-		  Util.o \
-                  $(SLICE_OBJS)
-
-HDIR		= $(headerdir)/Freeze
-SDIR		= $(slicedir)/Freeze
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS $(DB_FLAGS)
-SLICE2CPPFLAGS	:= --ice --include-dir Freeze --dll-export FREEZE_API $(SLICE2CPPFLAGS)
-LINKWITH	:= $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(DB_RPATH_LINK) $(DB_LIBS)
-
-# The slice2freeze rules are structured like this to avoid issues with
-# parallel make.
-$(HDIR)/Catalog.h: Catalog.cpp
-Catalog.cpp: $(SDIR)/CatalogData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	rm -f  $(HDIR)/Catalog.h Catalog.cpp
-	$(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::Catalog,string,Freeze::CatalogData \
-	Catalog $(slicedir)/Freeze/CatalogData.ice
-	mv Catalog.h $(HDIR)/Catalog.h
-
-clean::
-	-rm -f $(HDIR)/Catalog.h Catalog.cpp
-
-$(HDIR)/CatalogIndexList.h: CatalogIndexList.cpp
-CatalogIndexList.cpp: $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	rm -f  $(HDIR)/CatalogIndexList.h CatalogIndexList.cpp
-	$(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::CatalogIndexList,string,Ice::StringSeq \
-	CatalogIndexList ../../../slice/Ice/BuiltinSequences.ice
-	mv CatalogIndexList.h $(HDIR)/CatalogIndexList.h
-
-clean::
-	-rm -f $(HDIR)/CatalogIndexList.h CatalogIndexList.cpp
-
-$(libdir)/$(LIBFILENAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	@mkdir -p $(libdir)$(cpp11libdirsuffix)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak
deleted file mode 100644
index aef06c25f2a..00000000000
--- a/cpp/src/Freeze/Makefile.mak
+++ /dev/null
@@ -1,115 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME     	= $(top_srcdir)\lib\freeze$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\freeze$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-SLICE_OBJS	= .\BackgroundSaveEvictor.obj \
-		  .\CatalogData.obj \
-		  .\Connection.obj \
-		  .\ConnectionF.obj \
-		  .\DB.obj \
-		  .\Evictor.obj \
-		  .\EvictorF.obj \
-		  .\EvictorStorage.obj \
-		  .\Exception.obj \
-		  .\Transaction.obj \
-		  .\TransactionalEvictor.obj \
-		  .\PingObject.obj
-
-OBJS		= .\BackgroundSaveEvictorI.obj \
-		  .\Catalog.obj \
-		  .\CatalogIndexList.obj \
-		  .\ConnectionI.obj \
-		  .\EvictorI.obj \
-		  .\EvictorIteratorI.obj \
-		  .\Index.obj \
-		  .\IndexI.obj \
-		  .\MapDb.obj \
-		  .\MapI.obj \
-		  .\ObjectStore.obj \
-		  .\SharedDbEnv.obj \
-		  .\TransactionalEvictorContext.obj \
-		  .\TransactionalEvictorI.obj \
-		  .\TransactionHolder.obj \
-		  .\TransactionI.obj \
-		  .\Util.obj \
-		  $(SLICE_OBJS)
-
-HDIR		= $(headerdir)\Freeze
-SDIR		= $(slicedir)\Freeze
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-$(OBJS)		: $(DB_NUPKG)
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS -DWIN32_LEAN_AND_MEAN $(DB_CPPFLAGS)
-SLICE2CPPFLAGS	= --ice --include-dir Freeze --dll-export FREEZE_API $(SLICE2CPPFLAGS)
-LINKWITH	= $(LIBS) $(DB_LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = Freeze.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) Freeze.res
-	$(LINK) $(BASE):0x25000000 $(LD_DLLFLAGS) $(DB_LDFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-		$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-$(HDIR)/Catalog.h Catalog.cpp: $(SDIR)/CatalogData.ice "$(SLICE2FREEZE)" "$(SLICEPARSERLIB)"
-	del /q $(HDIR)\Catalog.h Catalog.cpp
-	"$(SLICE2FREEZE)" $(SLICE2CPPFLAGS) --dict Freeze::Catalog,string,Freeze::CatalogData \
-	Catalog $(slicedir)/Freeze/CatalogData.ice
-	move Catalog.h $(HDIR)
-
-$(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(slicedir)/Ice/BuiltinSequences.ice "$(SLICE2FREEZE)" $(SLICEPARSERLIB)
-	del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp
-	"$(SLICE2FREEZE)" $(SLICE2CPPFLAGS) --dict Freeze::CatalogIndexList,string,Ice::StringSeq \
-	CatalogIndexList $(slicedir)/Ice/BuiltinSequences.ice
-	move CatalogIndexList.h $(HDIR)
-
-clean::
-	-del /q Catalog.cpp $(HDIR)\Catalog.h
-	-del /q CatalogIndexList.cpp $(HDIR)\CatalogIndexList.h
-	-del /q DB.cpp $(HDIR)\DB.h
-	-del /q BackgroundSaveEvictor.cpp $(HDIR)\BackgroundSaveEvictor.h
-	-del /q CatalogData.cpp $(HDIR)\CatalogData.h
-	-del /q Connection.cpp $(HDIR)\Connection.h
-	-del /q ConnectionF.cpp $(HDIR)\ConnectionF.h
-	-del /q Exception.cpp $(HDIR)\Exception.h
-	-del /q EvictorF.cpp $(HDIR)\EvictorF.h
-	-del /q Evictor.cpp $(HDIR)\Evictor.h
-	-del /q EvictorStorage.cpp $(HDIR)\EvictorStorage.h
-	-del /q Transaction.cpp $(HDIR)\Transaction.h
-	-del /q TransactionalEvictor.cpp $(HDIR)\TransactionalEvictor.h
-	-del /q PingObject.cpp PingObject.h
-	-del /q Freeze.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/Freeze/MapDb.cpp b/cpp/src/Freeze/MapDb.cpp
deleted file mode 100644
index d495b2811b8..00000000000
--- a/cpp/src/Freeze/MapDb.cpp
+++ /dev/null
@@ -1,506 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/MapDb.h>
-#include <Freeze/Exception.h>
-#include <Freeze/Util.h>
-#include <Freeze/Catalog.h>
-#include <Freeze/CatalogIndexList.h>
-#include <algorithm>
-
-#include <IceUtil/StringConverter.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceUtil;
-using namespace Freeze;
-
-namespace
-{
-
-const string _catalogName = "__catalog";
-const string _catalogIndexListName = "__catalogIndexList";
-
-}
-
-extern "C" 
-{
-#if (DB_VERSION_MAJOR <= 5)
-    static int customCompare(DB* db, const DBT* dbt1, const DBT* dbt2)
-#else
-    static int customCompare(DB* db, const DBT* dbt1, const DBT* dbt2, size_t*)
-#endif
-    {
-	MapDb* me = static_cast<MapDb*>(db->app_private);
-	Ice::Byte* first = static_cast<Ice::Byte*>(dbt1->data);
-	Key k1(first, first + dbt1->size);
-	first = static_cast<Ice::Byte*>(dbt2->data);
-	Key k2(first, first + dbt2->size);
-	
-	return me->getKeyCompare()->compare(k1, k2);
-    }
-}
-
-const string&
-Freeze::catalogName()
-{
-    return _catalogName;
-}
-
-const string&
-Freeze::catalogIndexListName()
-{
-    return _catalogIndexListName;
-}
-
-Freeze::MapDb::~MapDb()
-{
-    if(_trace >= 1)
-    {
-        Trace out(_communicator->getLogger(), "Freeze.Map");
-        out << "closing Db \"" << _dbName << "\"";
-    }
-
-    clearIndices();
-
-    if(get_DB() != 0)
-    {
-        try
-        {
-            close(0);
-        }
-        catch(const ::DbException& dx)
-        {
-            Ice::Error error(_communicator->getLogger());
-            error << "Freeze.Map: closing Db " << _dbName << " raised DbException: " << dx.what();
-        }
-    }
-}
-  
-Freeze::MapDb::MapDb(const ConnectionIPtr& connection, 
-                     const string& dbName,
-                     const string& key,
-                     const string& value,
-                     const KeyCompareBasePtr& keyCompare,
-                     const vector<MapIndexBasePtr>& indices,
-                     bool createDb) :
-    Db(connection->dbEnv()->getEnv(), 0),
-    _communicator(connection->communicator()),
-    _encoding(connection->encoding()),
-    _dbName(dbName),
-    _trace(connection->trace()),
-    _keyCompare(keyCompare)
-{
-    if(_trace >= 1)
-    {
-        Trace out(_communicator->getLogger(), "Freeze.Map");
-        out << "opening Db \"" << _dbName << "\"";
-    }
-
-    Catalog catalog(connection, _catalogName);
-   
-    TransactionPtr tx = connection->currentTransaction();
-    bool ownTx = (tx == 0);
-
-    for(;;)
-    {
-        try
-        {
-            if(ownTx)
-            {
-                tx = 0;
-                tx = connection->beginTransaction();
-            }
-
-            Catalog::iterator ci = catalog.find(_dbName);
-        
-            if(ci != catalog.end())
-            {
-                if(ci->second.evictor)
-                {
-                    throw DatabaseException(__FILE__, __LINE__, _dbName + " is an evictor database");
-                }
-                
-                _key = ci->second.key;
-                _value = ci->second.value;
-                checkTypes(key, value);
-            }
-            else
-            {
-                _key = key;
-                _value = value;
-            }
-    
-            set_app_private(this);
-            if(_keyCompare->compareEnabled())
-            {
-                set_bt_compare(&customCompare);
-            }
-            
-            PropertiesPtr properties = _communicator->getProperties();
-            string propPrefix = "Freeze.Map." + _dbName + ".";
-            
-            int btreeMinKey = properties->getPropertyAsInt(propPrefix + "BtreeMinKey");
-            if(btreeMinKey > 2)
-            {
-                if(_trace >= 1)
-                {
-                    Trace out(_communicator->getLogger(), "Freeze.Map");
-                    out << "Setting \"" << _dbName << "\"'s btree minkey to " << btreeMinKey;
-                }
-                set_bt_minkey(btreeMinKey);
-            }
-            
-            bool checksum = properties->getPropertyAsInt(propPrefix + "Checksum") > 0;
-            if(checksum)
-            {
-                if(_trace >= 1)
-                {
-                    Trace out(_communicator->getLogger(), "Freeze.Map");
-                    out << "Turning checksum on for \"" << _dbName << "\"";
-                }
-                
-                set_flags(DB_CHKSUM);
-            }
-            
-            int pageSize = properties->getPropertyAsInt(propPrefix + "PageSize");
-            if(pageSize > 0)
-            {
-                if(_trace >= 1)
-                {
-                    Trace out(_communicator->getLogger(), "Freeze.Map");
-                    out << "Setting \"" << _dbName << "\"'s pagesize to " << pageSize;
-                }
-                set_pagesize(pageSize);
-            }
-            
-
-            DbTxn* txn = getTxn(tx);
-            
-            u_int32_t flags = DB_THREAD;
-            if(createDb)
-            {
-                flags |= DB_CREATE;
-            }
-
-            //
-            // Berkeley DB expects file paths to be UTF8 encoded.
-            //
-            open(txn, nativeToUTF8(_dbName, getProcessStringConverter()).c_str(), 0, DB_BTREE,
-                 flags, FREEZE_DB_MODE);
-            
-            StringSeq oldIndices;
-            StringSeq newIndices;
-            size_t oldSize = 0;
-            CatalogIndexList catalogIndexList(connection, _catalogIndexListName);
-            
-            if(createDb)
-            {
-                CatalogIndexList::iterator cil = catalogIndexList.find(_dbName);
-                if(cil != catalogIndexList.end())
-                {
-                    oldIndices = cil->second;
-                    oldSize = oldIndices.size();
-                }
-            } 
-            
-            for(vector<MapIndexBasePtr>::const_iterator p = indices.begin();
-                p != indices.end(); ++p)
-            {
-                const MapIndexBasePtr& indexBase = *p; 
-                assert(indexBase->_impl == 0);
-                assert(indexBase->_communicator == 0);
-                indexBase->_communicator = connection->communicator();
-                indexBase->_encoding = connection->encoding();
-                
-                IceUtil::UniquePtr<MapIndexI> indexI;
-
-                try
-                {
-                    indexI.reset(new MapIndexI(connection, *this, txn, createDb, indexBase));
-                }
-                catch(const DbDeadlockException&)
-                {
-                    throw;
-                }
-                catch(const DbException& dx)
-                {
-                    string message = "Error while opening index \"" + _dbName +
-                        "." + indexBase->name() + "\": " + dx.what();
-
-                    throw DatabaseException(__FILE__, __LINE__, message);
-                }
-                
-#ifdef NDEBUG
-                _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get()));
-#else
-                bool inserted = 
-                    _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get())).second;
-                assert(inserted);
-#endif
-                
-                indexBase->_impl = indexI.release();
-                
-                if(createDb)
-                {
-                    newIndices.push_back(indexBase->name());
-                    oldIndices.erase(std::remove(oldIndices.begin(), oldIndices.end(), indexBase->name()), oldIndices.end());
-                }
-            }
-            
-            if(ci == catalog.end())
-            {
-                CatalogData catalogData;
-                catalogData.evictor = false;
-                catalogData.key = key;
-                catalogData.value = value;
-                catalog.put(Catalog::value_type(_dbName, catalogData));
-            }
-            
-            if(createDb)
-            {
-                //
-                // Remove old indices and write the new ones
-                //
-                bool indexRemoved = false;
-
-                for(StringSeq::const_iterator q = oldIndices.begin(); q != oldIndices.end(); ++q)
-                {
-                    const string& index = *q;
-                    
-                    if(_trace >= 1)
-                    {
-                        Trace out(_communicator->getLogger(), "Freeze.Map");
-                        out << "removing old index \"" << index << "\" on Db \"" << _dbName << "\"";
-                    }
-                    
-                    try
-                    {
-                        connection->removeMapIndex(_dbName, *q);
-                        indexRemoved = true;
-                    }
-                    catch(const IndexNotFoundException&)
-                    {
-                        // Ignored
-                        
-                        if(_trace >= 1)
-                        {
-                            Trace out(_communicator->getLogger(), "Freeze.Map");
-                            out << "index \"" << index << "\" on Db \"" << _dbName << "\" does not exist";
-                        }
-                    }
-                }
-                
-                if(indexRemoved || oldSize != newIndices.size())
-                {
-                    if(newIndices.size() == 0)
-                    {
-                        catalogIndexList.erase(_dbName);
-                        if(_trace >= 1)
-                        {
-                            Trace out(_communicator->getLogger(), "Freeze.Map");
-                            out << "Removed catalogIndexList entry for Db \"" << _dbName << "\"";
-                        }
-                        
-                    }
-                    else
-                    {
-                        catalogIndexList.put(CatalogIndexList::value_type(_dbName, newIndices));
-                        if(_trace >= 1)
-                        {
-                            Trace out(_communicator->getLogger(), "Freeze.Map");
-                            out << "Updated catalogIndexList entry for Db \"" << _dbName << "\"";
-                        }
-                    }
-                }
-            }
-
-            if(ownTx)
-            {
-                tx->commit();
-            }
-            break; // for(;;)
-        }
-        catch(const DbDeadlockException& dx)
-        {
-            if(ownTx)
-            {
-                if(connection->deadlockWarning())
-                {
-                    Warning out(connection->communicator()->getLogger());
-                    out << "Deadlock in Freeze::MapDb::MapDb on Map \"" 
-                        << _dbName << "\"; retrying ...";
-                }
-
-                //
-                // Ignored, try again
-                //
-            }
-            else
-            {
-                throw DeadlockException(__FILE__, __LINE__, dx.what(), tx);
-            }
-        }
-        catch(const DbException& dx)
-        {
-            if(ownTx)
-            {
-                try
-                {
-                    tx->rollback();
-                }
-                catch(...)
-                {
-                }
-            }
-                
-            string message = "Error while opening Db \"" + _dbName +
-                "\": " + dx.what();
-
-            throw DatabaseException(__FILE__, __LINE__, message);
-        }
-        catch(...)
-        {
-            if(ownTx && tx != 0)
-            {   
-                try
-                {
-                    tx->rollback();
-                }
-                catch(...)
-                {
-                }
-            }
-            throw;
-        }
-    }
-}
-
-Freeze::MapDb::MapDb(const Ice::CommunicatorPtr& communicator, 
-                     const Ice::EncodingVersion& encoding,
-                     const string& dbName, 
-                     const string& keyTypeId, 
-                     const string& valueTypeId, 
-                     DbEnv* env) :
-    Db(env, 0),
-    _communicator(communicator),
-    _encoding(encoding),
-    _dbName(dbName),
-    _key(keyTypeId),
-    _value(valueTypeId),
-    _trace(communicator->getProperties()->getPropertyAsInt("Freeze.Trace.Map"))
-{
-    if(_trace >= 1)
-    {
-        Trace out(_communicator->getLogger(), "Freeze.Map");
-        out << "opening Db \"" << _dbName << "\"";
-    }
-
-    try
-    {
-        PropertiesPtr properties = _communicator->getProperties();
-        string propPrefix = "Freeze.Map." + _dbName + ".";
-        
-        int btreeMinKey = properties->getPropertyAsInt(propPrefix + "BtreeMinKey");
-        if(btreeMinKey > 2)
-        {
-            if(_trace >= 1)
-            {
-                Trace out(_communicator->getLogger(), "Freeze.Map");
-                out << "Setting \"" << _dbName << "\"'s btree minkey to " << btreeMinKey;
-            }
-            set_bt_minkey(btreeMinKey);
-        }
-        
-        bool checksum = properties->getPropertyAsInt(propPrefix + "Checksum") > 0;
-        if(checksum)
-        {
-            if(_trace >= 1)
-            {
-                Trace out(_communicator->getLogger(), "Freeze.Map");
-                out << "Turning checksum on for \"" << _dbName << "\"";
-            }
-
-            set_flags(DB_CHKSUM);
-        }
-        
-        int pageSize = properties->getPropertyAsInt(propPrefix + "PageSize");
-        if(pageSize > 0)
-        {
-            if(_trace >= 1)
-            {
-                Trace out(_communicator->getLogger(), "Freeze.Map");
-                out << "Setting \"" << _dbName << "\"'s pagesize to " << pageSize;
-            }
-            set_pagesize(pageSize);
-        }
-
-        u_int32_t flags = DB_THREAD | DB_CREATE | DB_AUTO_COMMIT;
-
-        //
-        // Berkeley DB expects file paths to be UTF8 encoded.
-        //
-        open(0, nativeToUTF8(_dbName, getProcessStringConverter()).c_str(), 0, DB_BTREE, flags,
-             FREEZE_DB_MODE);
-    }
-    catch(const ::DbException& dx)
-    {
-        throw DatabaseException(__FILE__, __LINE__, dx.what());
-    }
-}
-
-void
-Freeze::MapDb::connectIndices(const vector<MapIndexBasePtr>& indices) const
-{
-    for(vector<MapIndexBasePtr>::const_iterator p = indices.begin();
-        p != indices.end(); ++p)
-    {
-        const MapIndexBasePtr& indexBase = *p; 
-        assert(indexBase->_impl == 0);
-
-        IndexMap::const_iterator q = _indices.find(indexBase->name());
-
-        assert(q != _indices.end());
-        indexBase->_impl = q->second;
-        indexBase->_communicator = _communicator;
-        indexBase->_encoding = _encoding;
-    }
-}
-
-void
-Freeze::MapDb::clearIndices()
-{
-    try
-    {
-        for(IndexMap::iterator p = _indices.begin(); p != _indices.end(); ++p)
-        {
-            delete p->second;
-        }
-    }
-    catch(const ::DbException& dx)
-    {
-        throw DatabaseException(__FILE__, __LINE__, dx.what());
-    }
-    _indices.clear();
-}
-
-void
-Freeze::MapDb::checkTypes(const string& key, const string& value) const
-{
-    if(key != _key)
-    {
-        throw DatabaseException(__FILE__, __LINE__,
-                                _dbName + "'s key type is " + _key + ", not " + key);
-    }
-    if(value != _value)
-    {
-        throw DatabaseException(__FILE__, __LINE__,
-                                _dbName + "'s value type is " + _value + ", not " + value);
-    }
-}
diff --git a/cpp/src/Freeze/MapDb.h b/cpp/src/Freeze/MapDb.h
deleted file mode 100644
index bcdc37a27f6..00000000000
--- a/cpp/src/Freeze/MapDb.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_MAP_DB_H
-#define FREEZE_MAP_DB_H
-
-#include <IceUtil/Config.h>
-#include <db_cxx.h>
-#include <Freeze/ConnectionI.h>
-#include <Freeze/Map.h>
-
-
-namespace Freeze
-{
-
-class SharedDbEnv;
-class MapDb;
-
-class MapIndexI
-{
-public:
-    
-    MapIndexI(const ConnectionIPtr&, MapDb&, DbTxn*, bool, const MapIndexBasePtr&);
-
-    ~MapIndexI();
-   
-    IteratorHelper* begin(bool, const MapHelperI&) const;
-    IteratorHelper* untypedFind(const Key&, bool, const MapHelperI&, bool) const;
-    IteratorHelper* untypedLowerBound(const Key&, bool, const MapHelperI&) const;
-    IteratorHelper* untypedUpperBound(const Key&, bool, const MapHelperI&) const;
-
-    int untypedCount(const Key&, const ConnectionIPtr&) const;
-    
-    int secondaryKeyCreate(Db*, const Dbt*, const Dbt*, Dbt*);
-
-    const std::string& name() const
-    {
-        return _index->name();
-    }
-    
-    Db* db() const
-    {
-        return _db.get();
-    }
-
-    const MapIndexBasePtr& getKeyCompare() const
-    {
-        return _index;
-    }
-
-private:
-
-    const MapIndexBasePtr _index;
-    IceUtil::UniquePtr<Db> _db;
-    std::string _dbName;
-};
-
-
-//
-// A MapDb represents the Db object underneath Freeze Maps. Several Freeze Maps often
-// share the very same MapDb object; SharedDbEnv manages these shared MapDb objects.
-//
-
-class MapDb : public ::Db
-{
-public:
-    
-    MapDb(const ConnectionIPtr&, const std::string&, const std::string&, const std::string&,
-          const KeyCompareBasePtr&, const std::vector<MapIndexBasePtr>&, bool);
-    
-
-    //
-    // The constructor for catalogs
-    //
-    MapDb(const Ice::CommunicatorPtr&, const Ice::EncodingVersion&, const std::string&, const std::string&, 
-          const std::string&, DbEnv*);
-    
-    ~MapDb();
-
-    void connectIndices(const std::vector<MapIndexBasePtr>&) const;
-    void clearIndices();
-
-    void checkTypes(const std::string&, const std::string&) const;
-
-    const std::string& dbName() const;
-
-    const KeyCompareBasePtr& getKeyCompare() const;
-
-    typedef std::map<std::string, MapIndexI*> IndexMap;
-
-private:
-
-    const Ice::CommunicatorPtr _communicator;
-    const Ice::EncodingVersion _encoding;
-    const std::string _dbName;
-    std::string _key;
-    std::string _value;
-    const int _trace;
-
-    KeyCompareBasePtr _keyCompare;
-    IndexMap _indices;
-};
-
-inline const std::string& 
-MapDb::dbName() const
-{
-    return _dbName;
-}
-
-inline const Freeze::KeyCompareBasePtr&
-MapDb::getKeyCompare() const
-{
-    return _keyCompare;
-}
-
-}
-#endif
diff --git a/cpp/src/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp
deleted file mode 100644
index a94c79e6d5c..00000000000
--- a/cpp/src/Freeze/MapI.cpp
+++ /dev/null
@@ -1,2121 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/MapI.h>
-#include <Freeze/MapDb.h>
-#include <Freeze/Exception.h>
-#include <Freeze/Util.h>
-#include <Freeze/TransactionHolder.h>
-#include <Freeze/Catalog.h>
-#include <Freeze/CatalogIndexList.h>
-#include <IceUtil/UUID.h>
-#include <IceUtil/StringConverter.h>
-#include <stdlib.h>
-
-using namespace std;
-using namespace Ice;
-using namespace Freeze;
-
-//
-// MapIndexBase (from Map.h)
-//
-
-Freeze::MapIndexBase::~MapIndexBase()
-{
-}
-
-Freeze::MapIndexBase::MapIndexBase(const string& name, bool enabled) :
-    KeyCompareBase(enabled),
-    _name(name),
-    _impl(0),
-    _map(0)
-{
-}
-
-const string&
-MapIndexBase::name() const
-{
-    return _name;
-}
-
-IteratorHelper*
-Freeze::MapIndexBase::begin(bool ro) const
-{
-    return _impl->begin(ro, *_map);
-}
-
-IteratorHelper*
-Freeze::MapIndexBase::untypedFind(const Key& k, bool ro, bool onlyDups) const
-{
-    return _impl->untypedFind(k, ro, *_map, onlyDups);
-}
-
-IteratorHelper*
-Freeze::MapIndexBase::untypedLowerBound(const Key& k, bool ro) const
-{
-    return _impl->untypedLowerBound(k, ro, *_map);
-}
-
-IteratorHelper*
-Freeze::MapIndexBase::untypedUpperBound(const Key& k, bool ro) const
-{
-    return _impl->untypedUpperBound(k, ro, *_map);
-}
-
-int
-Freeze::MapIndexBase::untypedCount(const Key& k) const
-{
-    return _impl->untypedCount(k, _map->connection());
-}
-
-//
-// KeyCompareBase
-//
-Freeze::KeyCompareBase::KeyCompareBase(bool enabled) :
-    _enabled(enabled)
-{}
-
-bool
-Freeze::KeyCompareBase::compareEnabled() const
-{
-    return _enabled;
-}
-
-//
-// MapHelper (from Map.h)
-//
-
-/*static*/ Freeze::MapHelper*
-Freeze::MapHelper::create(const Freeze::ConnectionPtr& connection,
-                          const string& dbName,
-                          const string& key,
-                          const string& value,
-                          const Freeze::KeyCompareBasePtr& keyCompare,
-                          const std::vector<MapIndexBasePtr>& indices,
-                          bool createDb)
-{
-    Freeze::ConnectionIPtr connectionI = Freeze::ConnectionIPtr::dynamicCast(connection.get());
-    return new MapHelperI(connectionI, dbName, key, value, keyCompare, indices, createDb);
-}
-
-/*static*/ void
-Freeze::MapHelper::recreate(const Freeze::ConnectionPtr& connection,
-                            const string& dbName,
-                            const string& key,
-                            const string& value,
-                            const Freeze::KeyCompareBasePtr& keyCompare,
-                            const std::vector<MapIndexBasePtr>& indices)
-{
-    Freeze::ConnectionIPtr connectionI = Freeze::ConnectionIPtr::dynamicCast(connection.get());
-    if(connectionI == 0)
-    {
-        throw DatabaseException(__FILE__, __LINE__, "Invalid connection");
-    }
-
-    if(dbName == catalogName() || dbName == catalogIndexListName())
-    {
-        throw DatabaseException(__FILE__, __LINE__,
-                                "You cannot destroy recreate the \"" + dbName + "\" database");
-    }
-
-    if(connectionI->trace() >= 1)
-    {
-        Trace out(connectionI->communicator()->getLogger(), "Freeze.Map");
-        out << "Recreating \"" << dbName << "\"";
-    }
-
-    TransactionPtr tx = connectionI->currentTransaction();
-    bool ownTx = (tx == 0);
-
-    Dbt keyDbt;
-    keyDbt.set_flags(DB_DBT_REALLOC);
-    Dbt valueDbt;
-    valueDbt.set_flags(DB_DBT_REALLOC);
-
-    try
-    {
-        for(;;)
-        {
-            try
-            {
-                if(ownTx)
-                {
-                    tx = 0;
-                    tx = connectionI->beginTransaction();
-                }
-
-                DbTxn* txn = connectionI->dbTxn();
-
-                if(connectionI->trace() >= 2)
-                {
-                    Trace out(connectionI->communicator()->getLogger(), "Freeze.Map");
-                    out << "Removing all existing indices for \"" << dbName << "\"";
-                }
-                CatalogIndexList catalogIndexList(connection, catalogIndexListName());
-                CatalogIndexList::iterator p = catalogIndexList.find(dbName);
-                if(p != catalogIndexList.end())
-                {
-                    const StringSeq& indices = p->second;
-
-                    for(size_t i = 0; i < indices.size(); ++i)
-                    {
-                        try
-                        {
-                            connection->removeMapIndex(dbName, indices[i]);
-                        }
-                        catch(const IndexNotFoundException&)
-                        {
-                            //
-                            // Ignored
-                            //
-                        }
-                    }
-                    catalogIndexList.erase(p);
-                }
-
-                //
-                // Rename existing database
-                //
-                string oldDbName = dbName + ".old-" + IceUtil::generateUUID();
-
-                if(connectionI->trace() >= 2)
-                {
-                    Trace out(connectionI->communicator()->getLogger(), "Freeze.Map");
-                    out << "Renaming \"" << dbName << "\" to \"" << oldDbName << "\"";
-                }
-
-                connectionI->dbEnv()->getEnv()->dbrename(txn, dbName.c_str(), 0, oldDbName.c_str(), 0);
-
-                //
-                // Fortunately, DB closes oldDb automatically when it goes out of scope
-                //
-                Db oldDb(connectionI->dbEnv()->getEnv(), 0);
-
-                //
-                // Berkeley DB expects file paths to be UTF8 encoded.
-                //
-                oldDb.open(txn, IceUtil::nativeToUTF8(oldDbName, IceUtil::getProcessStringConverter()).c_str(),
-                           0, DB_BTREE, DB_THREAD, FREEZE_DB_MODE);
-
-                IceUtil::UniquePtr<MapDb> newDb(new MapDb(connectionI, dbName, key, value, keyCompare, indices, true));
-
-                if(connectionI->trace() >= 2)
-                {
-                    Trace out(connectionI->communicator()->getLogger(), "Freeze.Map");
-                    out << "Writing contents of \"" << oldDbName << "\" to fresh \"" << dbName << "\"";
-                }
-
-                //
-                // Now simply write all of oldDb into newDb
-                //
-                Dbc* dbc = 0;
-                oldDb.cursor(txn, &dbc, 0);
-
-                try
-                {
-                    while(dbc->get(&keyDbt, &valueDbt, DB_NEXT) == 0)
-                    {
-                        newDb->put(txn, &keyDbt, &valueDbt, 0);
-                    }
-                }
-                catch(...)
-                {
-                    dbc->close();
-                    throw;
-                }
-                dbc->close();
-
-                if(connectionI->trace() >= 2)
-                {
-                    Trace out(connectionI->communicator()->getLogger(), "Freeze.Map");
-                    out << "Transfer complete; removing \"" << oldDbName << "\"";
-                }
-                connectionI->dbEnv()->getEnv()->dbremove(txn, oldDbName.c_str(), 0, 0);
-
-                if(ownTx)
-                {
-                    tx->commit();
-                }
-
-                break; // for (;;)
-            }
-            catch(const DbDeadlockException& dx)
-            {
-                if(ownTx)
-                {
-                    if(connectionI->deadlockWarning())
-                    {
-                        Warning out(connectionI->communicator()->getLogger());
-                        out << "Deadlock in Freeze::MapHelperI::recreate on Db \""
-                            << dbName << "\"; retrying ...";
-                    }
-
-                    //
-                    // Ignored, try again
-                    //
-                }
-                else
-                {
-                    throw DeadlockException(__FILE__, __LINE__, dx.what(), tx);
-                }
-            }
-            catch(const DbException& dx)
-            {
-                if(ownTx)
-                {
-                    try
-                    {
-                        tx->rollback();
-                    }
-                    catch(...)
-                    {
-                    }
-                }
-
-                throw DatabaseException(__FILE__, __LINE__, dx.what());
-            }
-            catch(...)
-            {
-                if(ownTx && tx != 0)
-                {
-                    try
-                    {
-                        tx->rollback();
-                    }
-                    catch(...)
-                    {
-                    }
-                }
-                throw;
-            }
-        }
-        free(keyDbt.get_data());
-        free(valueDbt.get_data());
-    }
-    catch(...)
-    {
-        free(keyDbt.get_data());
-        free(valueDbt.get_data());
-
-        throw;
-    }
-}
-
-Freeze::MapHelper::~MapHelper()
-{
-}
-
-//
-// IteratorHelper (from Map.h)
-//
-
-Freeze::IteratorHelper*
-Freeze::IteratorHelper::create(const MapHelper& m, bool readOnly)
-{
-    const MapHelperI& actualMap = dynamic_cast<const MapHelperI&>(m);
-
-    IceUtil::UniquePtr<IteratorHelperI> r(new IteratorHelperI(actualMap, readOnly, 0, false));
-    if(r->next())
-    {
-        return r.release();
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-Freeze::IteratorHelper::~IteratorHelper() ICE_NOEXCEPT_FALSE
-{
-}
-
-//
-// MapCodecBase (from Map.h)
-//
-Freeze::MapCodecBase::MapCodecBase(const Ice::CommunicatorPtr& communicator, const Ice::EncodingVersion& encoding) :
-    _stream(IceInternal::getInstance(communicator).get(), encoding),
-    _dbt(0)
-{
-}
-
-Freeze::MapCodecBase::~MapCodecBase()
-{
-    delete _dbt;
-}
-
-void
-Freeze::MapCodecBase::init()
-{
-    _dbt = new Dbt;
-    initializeInDbt(_stream, *_dbt);
-}
-
-//
-// IteratorHelperI
-//
-
-Freeze::IteratorHelperI::IteratorHelperI(const MapHelperI& m, bool readOnly,
-                                         const MapIndexBasePtr& index,
-                                         bool onlyDups) :
-    _map(m),
-    _dbc(0),
-    _indexed(index != 0),
-    _onlyDups(onlyDups),
-    _tx(0)
-{
-    if(_map._trace >= 2)
-    {
-        Trace out(_map._connection->communicator()->getLogger(), "Freeze.Map");
-        out << "opening iterator on Db \"" << _map._dbName << "\"";
-        if(index != 0)
-        {
-            out << " with index \"" << index->name() << "\"";
-        }
-    }
-
-    DbTxn* txn = _map._connection->dbTxn();
-
-    if(txn == 0 && !readOnly)
-    {
-        //
-        // Need to start a transaction
-        //
-#ifdef ICE_CPP11
-        _tx.reset(new Tx(_map));
-#else
-        _tx = new Tx(_map);
-#endif
-        txn = _tx->getTxn();
-    }
-
-    try
-    {
-        if(index != 0)
-        {
-            index->_impl->db()->cursor(txn, &_dbc, 0);
-        }
-        else
-        {
-            _map._db->cursor(txn, &_dbc, 0);
-        }
-    }
-    catch(const ::DbException& dx)
-    {
-        DatabaseException ex(__FILE__, __LINE__);
-        ex.message = dx.what();
-        throw ex;
-    }
-
-    _map._iteratorList.push_back(this);
-}
-
-Freeze::IteratorHelperI::IteratorHelperI(const IteratorHelperI& it) :
-    _map(it._map),
-    _dbc(0),
-    _indexed(it._indexed),
-    _onlyDups(it._onlyDups),
-    _tx(0)
-{
-    if(_map._trace >= 2)
-    {
-        Trace out(_map._connection->communicator()->getLogger(), "Freeze.Map");
-        out << "duplicating iterator on Db \"" << _map._dbName << "\"";
-    }
-
-    try
-    {
-        it._dbc->dup(&_dbc, DB_POSITION);
-    }
-    catch(const ::DbException& dx)
-    {
-        DatabaseException ex(__FILE__, __LINE__);
-        ex.message = dx.what();
-        throw ex;
-    }
-
-    _tx = it._tx;
-    _map._iteratorList.push_back(this);
-}
-
-Freeze::IteratorHelperI::~IteratorHelperI() ICE_NOEXCEPT_FALSE
-{
-    close();
-}
-
-bool
-Freeze::IteratorHelperI::find(const Key& key) const
-{
-    Dbt dbKey;
-    initializeInDbt(key, dbKey);
-    return find(dbKey);
-}
-
-bool
-Freeze::IteratorHelperI::find(const Dbt& key) const
-{
-    assert((key.get_flags() & DB_DBT_USERMEM) != 0);
-    Dbt dbKey(key);
-
-#if (DB_VERSION_MAJOR <= 4) || (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR <= 1)
-    //
-    // When we have a custom-comparison function, Berkeley DB returns
-    // the key on-disk (when it finds one). We disable this behavior:
-    // (ref Oracle SR 5925672.992)
-    //
-    dbKey.set_flags(dbKey.get_flags() | DB_DBT_PARTIAL);
-#else
-    //
-    // In DB > 5.1 we can not set DB_DBT_PARTIAL in the key Dbt,
-    // when using DB_SET, we must resize the Dbt key param to hold enough
-    // space or Dbc::get fails with DB_BUFFER_SMALL.
-    //
-    dbKey.set_ulen(dbKey.get_size());
-#endif
-
-    //
-    // Keep 0 length since we're not interested in the data.
-    //
-    Dbt dbValue;
-    dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-    for(;;)
-    {
-        try
-        {
-            return _dbc->get(&dbKey, &dbValue, DB_SET) == 0;
-        }
-        catch(const ::DbDeadlockException& dx)
-        {
-            if(_tx != 0)
-            {
-                _tx->dead();
-            }
-
-            DeadlockException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-        catch(const ::DbException& dx)
-        {
-            DatabaseException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-    }
-}
-
-bool
-Freeze::IteratorHelperI::lowerBound(const Key& key) const
-{
-    //
-    // We retrieve the actual key for upperBound
-    //
-    Dbt dbKey;
-    _key = key;
-    initializeOutDbt(_key, dbKey);
-    dbKey.set_size(static_cast<u_int32_t>(_key.size()));
-
-    //
-    // Keep 0 length since we're not interested in the data
-    //
-    Dbt dbValue;
-    dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-    for(;;)
-    {
-        try
-        {
-            int err = _dbc->get(&dbKey, &dbValue, DB_SET_RANGE);
-            if(err == 0)
-            {
-                _key.resize(dbKey.get_size());
-                return true;
-            }
-            else if(err == DB_NOTFOUND)
-            {
-                return false;
-            }
-            else
-            {
-                //
-                // Bug in Freeze
-                //
-                assert(0);
-                throw DatabaseException(__FILE__, __LINE__);
-            }
-        }
-        catch(const ::DbDeadlockException& dx)
-        {
-            if(_tx != 0)
-            {
-                _tx->dead();
-            }
-
-            DeadlockException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-        catch(const ::DbException& dx)
-        {
-            handleDbException(dx, _key, dbKey, __FILE__, __LINE__);
-        }
-    }
-}
-
-bool
-Freeze::IteratorHelperI::upperBound(const Key& key) const
-{
-    if(lowerBound(key))
-    {
-        if(_key == key)
-        {
-            return next(true);
-        }
-        else
-        {
-            return true;
-        }
-    }
-    else
-    {
-        return false;
-    }
-}
-
-Freeze::IteratorHelper*
-Freeze::IteratorHelperI::clone() const
-{
-    return new IteratorHelperI(*this);
-}
-
-void
-Freeze::IteratorHelperI::get(const Key*& key, const Value*& value) const
-{
-    key = &_key;
-    value = &_value;
-
-    size_t keySize = _key.size();
-    if(keySize < 1024)
-    {
-        keySize = 1024;
-    }
-    _key.resize(keySize);
-
-    Dbt dbKey;
-    initializeOutDbt(_key, dbKey);
-
-    size_t valueSize = _value.size();
-    if(valueSize < 1024)
-    {
-        valueSize = 1024;
-    }
-    _value.resize(valueSize);
-    Dbt dbValue;
-    initializeOutDbt(_value, dbValue);
-
-    for(;;)
-    {
-        try
-        {
-            int err;
-
-            if(_indexed)
-            {
-                //
-                // Not interested in getting the index's key
-                //
-                Dbt iKey;
-                iKey.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-                err = _dbc->pget(&iKey, &dbKey, &dbValue, DB_CURRENT);
-            }
-            else
-            {
-                err = _dbc->get(&dbKey, &dbValue, DB_CURRENT);
-            }
-
-            if(err == 0)
-            {
-                _key.resize(dbKey.get_size());
-                _value.resize(dbValue.get_size());
-                break; // for(;;)
-            }
-            else if(err == DB_KEYEMPTY)
-            {
-                throw InvalidPositionException(__FILE__, __LINE__);
-            }
-            else
-            {
-                //
-                // Bug in Freeze
-                //
-                assert(0);
-                throw DatabaseException(__FILE__, __LINE__);
-            }
-        }
-        catch(const ::DbDeadlockException& dx)
-        {
-            if(_tx != 0)
-            {
-                _tx->dead();
-            }
-
-            DeadlockException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-        catch(const ::DbException& dx)
-        {
-            handleDbException(dx, _key, dbKey, _value, dbValue, __FILE__, __LINE__);
-        }
-    }
-}
-
-const Freeze::Key*
-Freeze::IteratorHelperI::get() const
-{
-    size_t keySize = _key.size();
-    if(keySize < 1024)
-    {
-        keySize = 1024;
-    }
-    _key.resize(keySize);
-
-    Dbt dbKey;
-    initializeOutDbt(_key, dbKey);
-
-    //
-    // Keep 0 length since we're not interested in the data
-    //
-    Dbt dbValue;
-    dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-    for(;;)
-    {
-        try
-        {
-            int err;
-            if(_indexed)
-            {
-                //
-                // Not interested in getting the index's key
-                //
-                Dbt iKey;
-                iKey.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-                err = _dbc->pget(&iKey, &dbKey, &dbValue, DB_CURRENT);
-            }
-            else
-            {
-                err = _dbc->get(&dbKey, &dbValue, DB_CURRENT);
-            }
-
-            if(err == 0)
-            {
-                _key.resize(dbKey.get_size());
-                return &_key;
-            }
-            else if(err == DB_KEYEMPTY)
-            {
-                throw InvalidPositionException(__FILE__, __LINE__);
-            }
-            else
-            {
-                //
-                // Bug in Freeze
-                //
-                assert(0);
-                throw DatabaseException(__FILE__, __LINE__);
-            }
-        }
-        catch(const ::DbDeadlockException& dx)
-        {
-            if(_tx != 0)
-            {
-                _tx->dead();
-            }
-
-            DeadlockException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-        catch(const ::DbException& dx)
-        {
-            handleDbException(dx, _key, dbKey, __FILE__, __LINE__);
-        }
-    }
-}
-
-void
-Freeze::IteratorHelperI::set(const Value& value)
-{
-    Dbt dbValue;
-    initializeInDbt(value, dbValue);
-    set(dbValue);
-}
-
-void
-Freeze::IteratorHelperI::set(const Dbt& value)
-{
-    if(_indexed)
-    {
-        DatabaseException ex(__FILE__, __LINE__);
-        ex.message = "Cannot set an iterator retrieved through an index";
-        throw ex;
-    }
-
-    //
-    // key ignored
-    //
-    Dbt dbKey;
-    dbKey.set_flags(DB_DBT_USERMEM);
-
-    Dbt dbValue(value);
-
-    if(_tx != 0)
-    {
-        _map.closeAllIteratorsExcept(_tx);
-    }
-
-    try
-    {
-#ifndef NDEBUG
-        int err = _dbc->put(&dbKey, &dbValue, DB_CURRENT);
-        assert(err == 0);
-#else
-        _dbc->put(&dbKey, &dbValue, DB_CURRENT);
-#endif
-    }
-    catch(const ::DbDeadlockException& dx)
-    {
-        if(_tx != 0)
-        {
-            _tx->dead();
-        }
-
-        DeadlockException ex(__FILE__, __LINE__);
-        ex.message = dx.what();
-        throw ex;
-    }
-    catch(const ::DbException& dx)
-    {
-        DatabaseException ex(__FILE__, __LINE__);
-        ex.message = dx.what();
-        throw ex;
-    }
-}
-
-void
-Freeze::IteratorHelperI::erase()
-{
-    if(_tx != 0)
-    {
-        _map.closeAllIteratorsExcept(_tx);
-    }
-
-    try
-    {
-        int err = _dbc->del(0);
-        if(err == DB_KEYEMPTY)
-        {
-            throw InvalidPositionException(__FILE__, __LINE__);
-        }
-        assert(err == 0);
-    }
-    catch(const ::DbDeadlockException& dx)
-    {
-        if(_tx != 0)
-        {
-            _tx->dead();
-        }
-
-        DeadlockException ex(__FILE__, __LINE__);
-        ex.message = dx.what();
-        throw ex;
-    }
-    catch(const ::DbException& dx)
-    {
-        DatabaseException ex(__FILE__, __LINE__);
-        ex.message = dx.what();
-        throw ex;
-    }
-}
-
-bool
-Freeze::IteratorHelperI::next() const
-{
-    return next(false);
-}
-
-bool
-Freeze::IteratorHelperI::next(bool skipDups) const
-{
-    //
-    // Keep 0 length since we're not interested in the data
-    //
-    Dbt dbKey;
-    dbKey.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-    Dbt dbValue;
-    dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-    int flags = DB_NEXT;
-    if(skipDups)
-    {
-        flags = DB_NEXT_NODUP;
-    }
-    else if(_indexed && _onlyDups)
-    {
-        flags = DB_NEXT_DUP;
-    }
-
-    try
-    {
-        if(_dbc->get(&dbKey, &dbValue, flags) == 0)
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    catch(const ::DbDeadlockException& dx)
-    {
-        if(_tx != 0)
-        {
-            _tx->dead();
-        }
-
-        DeadlockException ex(__FILE__, __LINE__);
-        ex.message = dx.what();
-        throw ex;
-    }
-    catch(const ::DbException& dx)
-    {
-        DatabaseException ex(__FILE__, __LINE__);
-        ex.message = dx.what();
-        throw ex;
-    }
-}
-
-void
-Freeze::IteratorHelperI::close()
-{
-    if(_dbc != 0)
-    {
-        if(_map._trace >= 2)
-        {
-            Trace out(_map._connection->communicator()->getLogger(), "Freeze.Map");
-            out << "closing iterator on Db \"" << _map._dbName << "\"";
-        }
-
-        try
-        {
-            _dbc->close();
-        }
-        catch(const ::DbDeadlockException&)
-        {
-            // Ignored - it's unclear if this can ever occur
-        }
-        catch(const ::DbException& dx)
-        {
-            cleanup();
-            DatabaseException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-        cleanup();
-    }
-}
-
-void
-Freeze::IteratorHelperI::cleanup()
-{
-    _dbc = 0;
-    _map._iteratorList.remove(this);
-
-    // this can raise an exception when committing the transaction
-    // (only for read/write iterators)
-#ifdef ICE_CPP11
-    _tx.reset();
-#else
-    _tx = 0;
-#endif
-}
-
-//
-// IteratorHelperI::Tx
-//
-
-Freeze::IteratorHelperI::Tx::Tx(const MapHelperI& m) :
-    _map(m),
-    _txn(0),
-    _dead(false)
-{
-    if(_map._trace >= 2)
-    {
-        Trace out(_map._connection->communicator()->getLogger(), "Freeze.Map");
-        out << "starting transaction for Db \"" << _map._dbName << "\"";
-    }
-
-    try
-    {
-        _map._connection->dbEnv()->getEnv()->txn_begin(0, &_txn, 0);
-    }
-    catch(const ::DbException& dx)
-    {
-        DatabaseException ex(__FILE__, __LINE__);
-        ex.message = dx.what();
-        throw ex;
-    }
-}
-
-Freeze::IteratorHelperI::Tx::~Tx() ICE_NOEXCEPT_FALSE
-{
-    if(_dead)
-    {
-        if(_map._trace >= 2)
-        {
-            Trace out(_map._connection->communicator()->getLogger(), "");
-            out << "aborting transaction for Db \"" << _map._dbName << "\"";
-        }
-
-        try
-        {
-            _txn->abort();
-        }
-        catch(...)
-        {
-            //
-            // Ignore exceptions to avoid crash during stack unwinding
-            //
-        }
-    }
-    else
-    {
-        if(_map._trace >= 2)
-        {
-            Trace out(_map._connection->communicator()->getLogger(), "Freeze.Map");
-            out << "committing transaction for Db \"" << _map._dbName.c_str() << "\"";
-        }
-
-        try
-        {
-            _txn->commit(0);
-        }
-        catch(const ::DbDeadlockException& dx)
-        {
-            DeadlockException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-        catch(const ::DbException& dx)
-        {
-            DatabaseException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-    }
-}
-
-void
-Freeze::IteratorHelperI::Tx::dead()
-{
-    _dead = true;
-}
-
-//
-// MapHelperI
-//
-
-Freeze::MapHelperI::MapHelperI(const ConnectionIPtr& connection,
-                               const string& dbName,
-                               const string& key,
-                               const string& value,
-                               const KeyCompareBasePtr& keyCompare,
-                               const vector<MapIndexBasePtr>& indices,
-                               bool createDb) :
-    _connection(connection),
-    _db(connection->dbEnv()->getSharedMapDb(dbName, key, value, keyCompare, indices, createDb)),
-    _dbName(dbName),
-    _trace(connection->trace())
-{
-    for(vector<MapIndexBasePtr>::const_iterator p = indices.begin();
-        p != indices.end(); ++p)
-    {
-        const MapIndexBasePtr& indexBase = *p;
-        assert(indexBase->_impl != 0);
-        assert(indexBase->_communicator == _connection->communicator());
-        assert(indexBase->_map == 0);
-
-#ifdef NDEBUG
-        _indices.insert(IndexMap::value_type(indexBase->name(), indexBase));
-#else
-        bool inserted = _indices.insert(IndexMap::value_type(indexBase->name(), indexBase)).second;
-        assert(inserted);
-#endif
-
-        indexBase->_map = this;
-    }
-
-    _connection->registerMap(this);
-}
-
-Freeze::MapHelperI::~MapHelperI()
-{
-    try
-    {
-        close();
-    }
-    catch(const DatabaseException& ex)
-    {
-        Ice::Error error(_connection->getCommunicator()->getLogger());
-        error << "Freeze: closing map " << _dbName << " raised: " << ex;
-    }
-}
-
-Freeze::IteratorHelper*
-Freeze::MapHelperI::find(const Key& k, bool readOnly) const
-{
-    for(;;)
-    {
-        try
-        {
-            IceUtil::UniquePtr<IteratorHelperI> r(new IteratorHelperI(*this, readOnly, 0, false));
-            if(r->find(k))
-            {
-                return r.release();
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        catch(const DeadlockException&)
-        {
-            if(_connection->dbTxn() != 0)
-            {
-                throw;
-            }
-            else
-            {
-                if(_connection->deadlockWarning())
-                {
-                    Warning out(_connection->communicator()->getLogger());
-                    out << "Deadlock in Freeze::MapHelperI::find on Map \""
-                        << _dbName << "\"; retrying ...";
-                }
-
-                //
-                // Ignored, try again
-                //
-            }
-        }
-    }
-}
-
-Freeze::IteratorHelper*
-Freeze::MapHelperI::find(const Dbt& k, bool readOnly) const
-{
-    for(;;)
-    {
-        try
-        {
-            IceUtil::UniquePtr<IteratorHelperI> r(new IteratorHelperI(*this, readOnly, 0, false));
-            if(r->find(k))
-            {
-                return r.release();
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        catch(const DeadlockException&)
-        {
-            if(_connection->dbTxn() != 0)
-            {
-                throw;
-            }
-            else
-            {
-                if(_connection->deadlockWarning())
-                {
-                    Warning out(_connection->communicator()->getLogger());
-                    out << "Deadlock in Freeze::MapHelperI::find on Map \""
-                        << _dbName << "\"; retrying ...";
-                }
-
-                //
-                // Ignored, try again
-                //
-            }
-        }
-    }
-}
-
-Freeze::IteratorHelper*
-Freeze::MapHelperI::lowerBound(const Key& k, bool readOnly) const
-{
-    for(;;)
-    {
-        try
-        {
-            IceUtil::UniquePtr<IteratorHelperI> r(new IteratorHelperI(*this, readOnly, 0, false));
-            if(r->lowerBound(k))
-            {
-                return r.release();
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        catch(const DeadlockException&)
-        {
-            if(_connection->dbTxn() != 0)
-            {
-                throw;
-            }
-            else
-            {
-                if(_connection->deadlockWarning())
-                {
-                    Warning out(_connection->communicator()->getLogger());
-                    out << "Deadlock in Freeze::MapHelperI::lowerBound on Map \""
-                        << _dbName << "\"; retrying ...";
-                }
-
-                //
-                // Ignored, try again
-                //
-            }
-        }
-    }
-}
-
-Freeze::IteratorHelper*
-Freeze::MapHelperI::upperBound(const Key& k, bool readOnly) const
-{
-    for(;;)
-    {
-        try
-        {
-            IceUtil::UniquePtr<IteratorHelperI> r(new IteratorHelperI(*this, readOnly, 0, false));
-            if(r->upperBound(k))
-            {
-                return r.release();
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        catch(const DeadlockException&)
-        {
-            if(_connection->dbTxn() != 0)
-            {
-                throw;
-            }
-            else
-            {
-                if(_connection->deadlockWarning())
-                {
-                    Warning out(_connection->communicator()->getLogger());
-                    out << "Deadlock in Freeze::MapHelperI::upperBound on Map \""
-                        << _dbName << "\"; retrying ...";
-                }
-
-                //
-                // Ignored, try again
-                //
-            }
-        }
-    }
-}
-
-void
-Freeze::MapHelperI::put(const Key& key, const Value& value)
-{
-    Dbt dbKey;
-    Dbt dbValue;
-    initializeInDbt(key, dbKey);
-    initializeInDbt(value, dbValue);
-    put(dbKey, dbValue);
-}
-
-void
-Freeze::MapHelperI::put(const Dbt& key, const Dbt& value)
-{
-    DbTxn* txn = _connection->dbTxn();
-    if(txn == 0)
-    {
-        closeAllIterators();
-    }
-
-    Dbt dbKey(key);
-    Dbt dbValue(value);
-
-    for(;;)
-    {
-        try
-        {
-            int err = _db->put(txn, &dbKey, &dbValue, txn != 0 ? 0 : DB_AUTO_COMMIT);
-
-            if(err == 0)
-            {
-                break;
-            }
-            else
-            {
-                //
-                // Bug in Freeze
-                //
-                throw DatabaseException(__FILE__, __LINE__);
-            }
-        }
-        catch(const ::DbDeadlockException& dx)
-        {
-            if(txn != 0)
-            {
-                DeadlockException ex(__FILE__, __LINE__);
-                ex.message = dx.what();
-                throw ex;
-            }
-            else
-            {
-                if(_connection->deadlockWarning())
-                {
-                    Warning out(_connection->communicator()->getLogger());
-                    out << "Deadlock in Freeze::MapHelperI::put on Map \""
-                        << _dbName << "\"; retrying ...";
-                }
-
-                //
-                // Ignored, try again
-                //
-            }
-        }
-        catch(const ::DbException& dx)
-        {
-            DatabaseException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-    }
-}
-
-size_t
-Freeze::MapHelperI::erase(const Key& key)
-{
-    Dbt dbKey;
-    initializeInDbt(key, dbKey);
-    return erase(dbKey);
-}
-
-size_t
-Freeze::MapHelperI::erase(const Dbt& key)
-{
-    DbTxn* txn = _connection->dbTxn();
-    if(txn == 0)
-    {
-        closeAllIterators();
-    }
-
-    Dbt dbKey(key);
-
-    for(;;)
-    {
-        try
-        {
-            int err = _db->del(txn, &dbKey, txn != 0 ? 0 : DB_AUTO_COMMIT);
-
-            if(err == 0)
-            {
-                return 1;
-            }
-            else if(err == DB_NOTFOUND)
-            {
-                return 0;
-            }
-            else
-            {
-                assert(0);
-                throw DatabaseException(__FILE__, __LINE__);
-            }
-        }
-        catch(const ::DbDeadlockException& dx)
-        {
-            if(txn != 0)
-            {
-                DeadlockException ex(__FILE__, __LINE__);
-                ex.message = dx.what();
-                throw ex;
-            }
-            else
-            {
-                if(_connection->deadlockWarning())
-                {
-                    Warning out(_connection->communicator()->getLogger());
-                    out << "Deadlock in Freeze::MapHelperI::erase on Map \""
-                        << _dbName << "\"; retrying ...";
-                }
-
-                //
-                // Ignored, try again
-                //
-            }
-        }
-        catch(const ::DbException& dx)
-        {
-            DatabaseException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-    }
-}
-
-size_t
-Freeze::MapHelperI::count(const Key& key) const
-{
-    Dbt dbKey;
-    initializeInDbt(key, dbKey);
-    return count(dbKey);
-}
-
-size_t
-Freeze::MapHelperI::count(const Dbt& key) const
-{
-    Dbt dbKey(key);
-
-    //
-    // Keep 0 length since we're not interested in the data
-    //
-    Dbt dbValue;
-    dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-    for(;;)
-    {
-        try
-        {
-            int err = _db->get(_connection->dbTxn(), &dbKey, &dbValue, 0);
-
-            if(err == 0)
-            {
-                return 1;
-            }
-            else if(err == DB_NOTFOUND)
-            {
-                return 0;
-            }
-            else
-            {
-                assert(0);
-                throw DatabaseException(__FILE__, __LINE__);
-            }
-        }
-        catch(const ::DbDeadlockException& dx)
-        {
-            if(_connection->dbTxn() != 0)
-            {
-                DeadlockException ex(__FILE__, __LINE__);
-                ex.message = dx.what();
-                throw ex;
-            }
-            else
-            {
-                if(_connection->deadlockWarning())
-                {
-                    Warning out(_connection->communicator()->getLogger());
-                    out << "Deadlock in Freeze::MapHelperI::count on Map \""
-                        << _dbName << "\"; retrying ...";
-                }
-
-                //
-                // Ignored, try again
-                //
-            }
-        }
-        catch(const ::DbException& dx)
-        {
-            DatabaseException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-    }
-}
-
-void
-Freeze::MapHelperI::clear()
-{
-    DbTxn* txn = _connection->dbTxn();
-    if(txn == 0)
-    {
-        closeAllIterators();
-    }
-
-    Dbt dbKey;
-    dbKey.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-    Dbt dbValue;
-    dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-    try
-    {
-        for(;;)
-        {
-            Dbc* dbc = 0;
-
-            try
-            {
-                IteratorHelperI::TxPtr tx;
-                if(txn == 0)
-                {
-#ifdef ICE_CPP11
-                    tx.reset(new IteratorHelperI::Tx(*this));
-#else
-                    tx = new IteratorHelperI::Tx(*this);
-#endif
-                    txn = tx->getTxn();
-                }
-
-                _db->cursor(txn, &dbc, 0);
-                while(dbc->get(&dbKey, &dbValue, DB_NEXT | DB_RMW) == 0)
-                {
-                    dbc->del(0);
-                }
-
-                Dbc* toClose = dbc;
-                dbc = 0;
-                toClose->close();
-                break; // for (;;)
-            }
-            catch(const DbDeadlockException&)
-            {
-                if(dbc != 0)
-                {
-                    try
-                    {
-                        dbc->close();
-                    }
-                    catch(const DbDeadlockException&)
-                    {
-                        if(txn != 0)
-                        {
-                            throw;
-                        }
-                        else
-                        {
-                            //
-                            // Ignored
-                            //
-                        }
-                    }
-                }
-
-                if(_connection->deadlockWarning())
-                {
-                    Warning out(_connection->communicator()->getLogger());
-                    out << "Deadlock in Freeze::MapHelperI::clear on Map \""
-                        << _dbName << "\"; retrying ...";
-                }
-
-                if(txn != 0)
-                {
-                    throw;
-                }
-                //
-                // Otherwise retry
-                //
-            }
-            catch(...)
-            {
-                if(dbc != 0)
-                {
-                    try
-                    {
-                        dbc->close();
-                    }
-                    catch(const DbDeadlockException&)
-                    {
-                        if(txn != 0)
-                        {
-                            throw;
-                        }
-                        else
-                        {
-                            //
-                            // Ignored
-                            //
-                        }
-                    }
-                }
-                throw;
-            }
-        }
-    }
-    catch(const DbDeadlockException& dx)
-    {
-        throw DeadlockException(__FILE__, __LINE__, dx.what(), _connection->currentTransaction());
-    }
-    catch(const DbException& dx)
-    {
-        throw DatabaseException(__FILE__, __LINE__, dx.what());
-    }
-}
-
-void
-Freeze::MapHelperI::destroy()
-{
-    if(_dbName == catalogName() || _dbName == catalogIndexListName())
-    {
-        throw DatabaseException(__FILE__, __LINE__, "You cannot destroy the \"" + _dbName + "\" database");
-    }
-
-    if(_db == 0)
-    {
-        //
-        // We need an opened map to gather the index names
-        //
-        throw DatabaseException(__FILE__, __LINE__, "This map is closed");
-    }
-
-    if(_connection->currentTransaction())
-    {
-        throw DatabaseException(__FILE__, __LINE__, "Cannot destroy map within transaction");
-    }
-
-    if(_trace >= 1)
-    {
-        Trace out(_connection->communicator()->getLogger(), "Freeze.Map");
-        out << "Destroying \"" << _dbName << "\"";
-    }
-
-    vector<string> indexNames;
-    for(IndexMap::iterator p = _indices.begin(); p != _indices.end(); ++p)
-    {
-        indexNames.push_back(p->second->name());
-    }
-
-    closeDb();
-
-    for(;;)
-    {
-        try
-        {
-            TransactionHolder tx(_connection);
-            DbTxn* txn = _connection->dbTxn();
-
-            Catalog catalog(_connection, catalogName());
-            catalog.erase(_dbName);
-
-            CatalogIndexList catalogIndexList(_connection, catalogIndexListName());
-            catalogIndexList.erase(_dbName);
-
-            _connection->dbEnv()->getEnv()->dbremove(txn, _dbName.c_str(), 0, 0);
-
-            //
-            // Remove all indices
-            //
-            for(vector<string>::iterator q = indexNames.begin(); q != indexNames.end(); ++q)
-            {
-                _connection->removeMapIndex(_dbName, *q);
-            }
-
-            tx.commit();
-
-            break; // for(;;)
-        }
-        catch(const DbDeadlockException&)
-        {
-            if(_connection->deadlockWarning())
-            {
-                Warning out(_connection->communicator()->getLogger());
-                out << "Deadlock in Freeze::MapHelperI::destroy on Map \""
-                    << _dbName << "\"; retrying ...";
-            }
-
-            //
-            // Ignored, try again
-            //
-        }
-        catch(const DbException& dx)
-        {
-            throw DatabaseException(__FILE__, __LINE__, dx.what());
-        }
-    }
-}
-
-size_t
-Freeze::MapHelperI::size() const
-{
-    DB_BTREE_STAT* s;
-
-    try
-    {
-#if DB_VERSION_MAJOR < 4
-#error Freeze requires DB 4.x or greater
-#endif
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR < 3)
-        _db->stat(&s, 0);
-#else
-        _db->stat(_connection->dbTxn(), &s, 0);
-#endif
-    }
-    catch(const ::DbException& dx)
-    {
-        DatabaseException ex(__FILE__, __LINE__);
-        ex.message = dx.what();
-        throw ex;
-    }
-
-    size_t num = s->bt_ndata;
-    free(s);
-    return num;
-}
-
-void
-Freeze::MapHelperI::closeAllIterators()
-{
-    while(!_iteratorList.empty())
-    {
-        (*_iteratorList.begin())->close();
-    }
-}
-
-const MapIndexBasePtr&
-Freeze::MapHelperI::index(const string& name) const
-{
-    IndexMap::const_iterator p = _indices.find(name);
-    if(p == _indices.end())
-    {
-        DatabaseException ex(__FILE__, __LINE__);
-        ex.message = "Cannot find index \"" + name + "\"";
-        throw ex;
-    }
-    return p->second;
-}
-
-void
-Freeze::MapHelperI::closeDb()
-{
-    close();
-    _connection->dbEnv()->removeSharedMapDb(_dbName);
-}
-
-Freeze::ConnectionPtr
-Freeze::MapHelperI::getConnection() const
-{
-    return _connection;
-}
-
-void
-Freeze::MapHelperI::close()
-{
-    if(_db != 0)
-    {
-        closeAllIterators();
-        _connection->unregisterMap(this);
-    }
-    _db = 0;
-
-    //
-    // We can't clear the indexBase as MapIndexI is using
-    // the first map's indexBase objects
-    //
-    _indices.clear();
-}
-
-void
-Freeze::MapHelperI::closeAllIteratorsExcept(const IteratorHelperI::TxPtr& tx) const
-{
-    assert(tx != 0);
-
-    list<IteratorHelperI*>::iterator q = _iteratorList.begin();
-
-    while(q != _iteratorList.end())
-    {
-        if((*q)->tx().get() == tx.get())
-        {
-            ++q;
-        }
-        else
-        {
-            (*q)->close();
-            q = _iteratorList.begin();
-        }
-    }
-}
-
-//
-// MapIndexI
-//
-
-extern "C"
-{
-#if (DB_VERSION_MAJOR <= 5)
-    static int customIndexCompare(DB* db, const DBT* dbt1, const DBT* dbt2)
-#else
-    static int customIndexCompare(DB* db, const DBT* dbt1, const DBT* dbt2, size_t*)
-#endif
-    {
-        MapIndexI* me = static_cast<MapIndexI*>(db->app_private);
-        Byte* first = static_cast<Byte*>(dbt1->data);
-        Key k1(first, first + dbt1->size);
-        first = static_cast<Byte*>(dbt2->data);
-        Key k2(first, first + dbt2->size);
-
-        return me->getKeyCompare()->compare(k1, k2);
-    }
-}
-
-static int
-callback(Db* secondary, const Dbt* key, const Dbt* value, Dbt* result)
-{
-    void* indexObj = secondary->get_app_private();
-    MapIndexI* index = static_cast<MapIndexI*>(indexObj);
-    assert(index != 0);
-    return index->secondaryKeyCreate(secondary, key, value, result);
-}
-
-Freeze::MapIndexI::MapIndexI(const ConnectionIPtr& connection, MapDb& db,
-                             DbTxn* txn, bool createDb, const MapIndexBasePtr& index) :
-    _index(index)
-{
-    assert(txn != 0);
-
-    _db.reset(new Db(connection->dbEnv()->getEnv(), 0));
-    _db->set_flags(DB_DUP | DB_DUPSORT);
-
-    u_int32_t flags = 0;
-    if(createDb)
-    {
-        flags = DB_CREATE;
-    }
-
-    _dbName = db.dbName() + "." + _index->name();
-
-    _db->set_app_private(this);
-
-    if(index->compareEnabled())
-    {
-        _db->set_bt_compare(&customIndexCompare);
-    }
-
-    Ice::PropertiesPtr properties = connection->communicator()->getProperties();
-    string propPrefix = "Freeze.Map." + _dbName + ".";
-    int btreeMinKey = properties->getPropertyAsInt(propPrefix + "BtreeMinKey");
-    if(btreeMinKey > 2)
-    {
-        if(connection->trace() >= 1)
-        {
-            Trace out(connection->communicator()->getLogger(), "Freeze.Map");
-            out << "Setting \"" << _dbName << "\"'s btree minkey to " << btreeMinKey;
-        }
-
-        _db->set_bt_minkey(btreeMinKey);
-    }
-
-    bool checksum = properties->getPropertyAsInt(propPrefix + "Checksum") > 0;
-    if(checksum)
-    {
-        if(connection->trace() >= 1)
-        {
-            Trace out(connection->communicator()->getLogger(), "Freeze.Map");
-            out << "Turning checksum on for \"" << _dbName << "\"";
-        }
-
-        _db->set_flags(DB_CHKSUM);
-    }
-
-    int pageSize = properties->getPropertyAsInt(propPrefix + "PageSize");
-    if(pageSize > 0)
-    {
-        if(connection->trace() >= 1)
-        {
-            Trace out(connection->communicator()->getLogger(), "Freeze.Map");
-            out << "Setting \"" << _dbName << "\"'s pagesize to " << pageSize;
-        }
-
-        _db->set_pagesize(pageSize);
-    }
-
-    if(connection->trace() >= 1)
-    {
-        Trace out(connection->communicator()->getLogger(), "Freeze.Map");
-        out << "Opening index \"" << _dbName << "\"";
-    }
-
-    //
-    // Berkeley DB expects file paths to be UTF8 encoded.
-    //
-    _db->open(txn, IceUtil::nativeToUTF8(_dbName, IceUtil::getProcessStringConverter()).c_str(), 0, DB_BTREE, flags,
-              FREEZE_DB_MODE);
-
-    //
-    // To populate empty indices
-    //
-    flags = DB_CREATE;
-    db.associate(txn, _db.get(), callback, flags);
-
-    //
-    // Note: caller catch and translates exceptions
-    //
-}
-
-Freeze::MapIndexI::~MapIndexI()
-{
-    try
-    {
-        _db->close(0);
-    }
-    catch(const DbException&)
-    {
-        // Ignored
-    }
-}
-
-IteratorHelper*
-Freeze::MapIndexI::begin(bool ro, const MapHelperI& m) const
-{
-    IceUtil::UniquePtr<IteratorHelperI> r(new IteratorHelperI(m, ro, _index, false));
-
-    if(r->next())
-    {
-        return r.release();
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-IteratorHelper*
-Freeze::MapIndexI::untypedFind(const Key& k, bool ro, const MapHelperI& m, bool onlyDups) const
-{
-    IceUtil::UniquePtr<IteratorHelperI> r(new IteratorHelperI(m, ro, _index, onlyDups));
-
-    if(r->find(k))
-    {
-        return r.release();
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-IteratorHelper*
-Freeze::MapIndexI::untypedLowerBound(const Key& k, bool ro, const MapHelperI& m) const
-{
-    IceUtil::UniquePtr<IteratorHelperI> r(new IteratorHelperI(m, ro, _index, false));
-
-    if(r->lowerBound(k))
-    {
-        return r.release();
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-IteratorHelper*
-Freeze::MapIndexI::untypedUpperBound(const Key& k, bool ro, const MapHelperI& m) const
-{
-    IceUtil::UniquePtr<IteratorHelperI> r(new IteratorHelperI(m, ro, _index, false));
-
-    if(r->upperBound(k))
-    {
-        return r.release();
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-int
-Freeze::MapIndexI::untypedCount(const Key& k, const ConnectionIPtr& connection) const
-{
-    Dbt dbKey;
-    initializeInDbt(k, dbKey);
-#if (DB_VERSION_MAJOR <= 4)
-    //
-    // When we have a custom-comparison function, Berkeley DB returns
-    // the key on-disk (when it finds one). We disable this behavior:
-    // (ref Oracle SR 5925672.992)
-    //
-    dbKey.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-#else
-    //
-    // In DB 5.x we can not set DB_DBT_PARTIAL in the key Dbt,
-    // when using DB_SET, we must resize the Dbt key param to hold enought
-    // space or Dbc::get fails with DB_BUFFER_SMALL.
-    //
-    dbKey.set_flags(DB_DBT_USERMEM);
-    dbKey.set_ulen(static_cast<u_int32_t>(k.size()));
-#endif
-
-    Dbt dbValue;
-    dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-    int result = 0;
-
-    DbTxn* txn = connection->dbTxn();
-
-    try
-    {
-        for(;;)
-        {
-            Dbc* dbc = 0;
-
-            try
-            {
-                //
-                // Move to the first record
-                //
-                _db->cursor(txn, &dbc, 0);
-                bool found = (dbc->get(&dbKey, &dbValue, DB_SET) == 0);
-
-                if(found)
-                {
-                    db_recno_t count = 0;
-                    dbc->count(&count, 0);
-                    result = static_cast<int>(count);
-                }
-
-                Dbc* toClose = dbc;
-                dbc = 0;
-                toClose->close();
-                break; // for (;;)
-            }
-            catch(const DbDeadlockException&)
-            {
-                if(dbc != 0)
-                {
-                    try
-                    {
-                        dbc->close();
-                    }
-                    catch(const DbDeadlockException&)
-                    {
-                        if(txn != 0)
-                        {
-                            throw;
-                        }
-                        else
-                        {
-                            //
-                            // Ignored
-                            //
-                        }
-                    }
-                }
-
-                if(connection->deadlockWarning())
-                {
-                    Warning out(connection->communicator()->getLogger());
-                    out << "Deadlock in Freeze::MapIndexI::untypedCount while searching \""
-                        << _dbName << "\"";
-                }
-
-                if(txn != 0)
-                {
-                    throw;
-                }
-                //
-                // Otherwise retry
-                //
-            }
-            catch(...)
-            {
-                if(dbc != 0)
-                {
-                    try
-                    {
-                        dbc->close();
-                    }
-                    catch(const DbDeadlockException&)
-                    {
-                        if(txn != 0)
-                        {
-                            throw;
-                        }
-                        else
-                        {
-                            //
-                            // Ignored
-                            //
-                        }
-                    }
-                }
-                throw;
-            }
-        }
-    }
-    catch(const DbDeadlockException& dx)
-    {
-        throw DeadlockException(__FILE__, __LINE__, dx.what(), connection->currentTransaction());
-    }
-    catch(const DbException& dx)
-    {
-        throw DatabaseException(__FILE__, __LINE__, dx.what());
-    }
-
-    return result;
-}
-
-int
-Freeze::MapIndexI::secondaryKeyCreate(Db* /*secondary*/, const Dbt* /*dbKey*/, const Dbt* dbValue, Dbt* result)
-{
-    Byte* first = static_cast<Byte*>(dbValue->get_data());
-    Value value(first, first + dbValue->get_size());
-
-    Key bytes;
-    _index->marshalKey(value, bytes);
-
-    result->set_flags(DB_DBT_APPMALLOC);
-    void* data = malloc(bytes.size());
-    memcpy(data, &bytes[0], bytes.size());
-    result->set_data(data);
-    result->set_size(static_cast<u_int32_t>(bytes.size()));
-    return 0;
-}
-
-//
-// Print for the various exception types.
-//
-void
-Freeze::DeadlockException::ice_print(std::ostream& out) const
-{
-    Exception::ice_print(out);
-    out << ":\ndatabase deadlock:\n" << message;
-}
-
-void
-Freeze::NotFoundException::ice_print(std::ostream& out) const
-{
-    Exception::ice_print(out);
-    out << ":\ndatabase record not found:\n" << message;
-}
-
-void
-Freeze::DatabaseException::ice_print(std::ostream& out) const
-{
-    Exception::ice_print(out);
-    out << ":\n" << message;
-}
-
-void
-Freeze::IndexNotFoundException::ice_print(std::ostream& out) const
-{
-    Exception::ice_print(out);
-    out << ":\ncould not find index \"" << indexName << "\" on map \"" << mapName << "\"";
-}
diff --git a/cpp/src/Freeze/MapI.h b/cpp/src/Freeze/MapI.h
deleted file mode 100644
index f9ca696e9de..00000000000
--- a/cpp/src/Freeze/MapI.h
+++ /dev/null
@@ -1,215 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_MAP_I_H
-#define FREEZE_MAP_I_H
-
-#include <Freeze/Map.h>
-#include <Freeze/ConnectionI.h>
-#ifdef ICE_CPP11
-#  include <memory>
-#endif
-
-namespace Freeze
-{
-
-class MapDb;
-class MapHelperI;
-
-class IteratorHelperI : public IteratorHelper
-{
-public:
-
-    IteratorHelperI(const MapHelperI& m, bool readOnly, const MapIndexBasePtr& index, bool onlyDups);
-    IteratorHelperI(const IteratorHelperI&);
-
-    virtual
-    ~IteratorHelperI() ICE_NOEXCEPT_FALSE;
-
-    bool
-    find(const Key& k) const;
-
-    bool
-    find(const Dbt& k) const;
-
-    bool
-    lowerBound(const Key& k) const;
-
-    bool
-    upperBound(const Key& k) const;
-
-    virtual IteratorHelper*
-    clone() const;
-
-    virtual const Key*
-    get() const;
-
-    virtual void
-    get(const Key*&, const Value*&) const;
-
-    virtual  void
-    set(const Value&);
-
-    virtual  void
-    set(const Dbt&);
-
-    virtual void
-    erase();
-
-    virtual bool
-    next() const;
-
-    bool next(bool) const;
-
-    void
-    close();
-
-    class Tx
-#ifndef ICE_CPP11
-        : public IceUtil::SimpleShared
-#endif
-    {
-    public:
-
-        Tx(const MapHelperI&);
-        ~Tx() ICE_NOEXCEPT_FALSE;
-
-        void dead();
-
-        DbTxn* getTxn()
-        {
-            return _txn;
-        }
-
-    private:
-        const MapHelperI& _map;
-        DbTxn* _txn;
-        bool _dead;
-    };
-
-#ifdef ICE_CPP11
-    typedef std::shared_ptr<Tx> TxPtr;
-#else
-    typedef IceUtil::Handle<Tx> TxPtr;
-#endif
-
-    const TxPtr&
-    tx() const;
-
-private:
-
-    void
-    cleanup();
-
-    const MapHelperI& _map;
-    Dbc* _dbc;
-    const bool _indexed;
-    const bool _onlyDups;
-    TxPtr _tx;
-
-    mutable Key _key;
-    mutable Value _value;
-};
-
-class MapHelperI : public MapHelper
-{
-public:
-
-    MapHelperI(const ConnectionIPtr&, const std::string&, const std::string&, const std::string&,
-               const KeyCompareBasePtr&, const std::vector<MapIndexBasePtr>&, bool);
-
-    virtual ~MapHelperI();
-
-    virtual IteratorHelper*
-    find(const Key&, bool) const;
-
-    virtual IteratorHelper*
-    find(const Dbt&, bool) const;
-
-    virtual IteratorHelper*
-    lowerBound(const Key&, bool) const;
-
-    virtual IteratorHelper*
-    upperBound(const Key&, bool) const;
-
-    virtual void
-    put(const Key&, const Value&);
-
-    virtual void
-    put(const Dbt&, const Dbt&);
-
-    virtual size_t
-    erase(const Key&);
-
-    virtual size_t
-    erase(const Dbt&);
-
-    virtual size_t
-    count(const Key&) const;
-
-    virtual size_t
-    count(const Dbt&) const;
-
-    virtual void
-    clear();
-
-    virtual void
-    destroy();
-
-    virtual size_t
-    size() const;
-
-    virtual void
-    closeAllIterators();
-
-    virtual const MapIndexBasePtr&
-    index(const std::string&) const;
-
-    virtual void
-    closeDb();
-
-    virtual ConnectionPtr
-    getConnection() const;
-
-    void
-    close();
-
-    const ConnectionIPtr& connection() const
-    {
-        return _connection;
-    }
-
-    typedef std::map<std::string, MapIndexBasePtr> IndexMap;
-
-private:
-
-    virtual void
-    closeAllIteratorsExcept(const IteratorHelperI::TxPtr&) const;
-
-    friend class IteratorHelperI;
-    friend class IteratorHelperI::Tx;
-
-    const ConnectionIPtr _connection;
-    mutable std::list<IteratorHelperI*> _iteratorList;
-    MapDb* _db;
-    const std::string _dbName;
-    IndexMap _indices;
-
-    Ice::Int _trace;
-};
-
-inline const IteratorHelperI::TxPtr&
-IteratorHelperI::tx() const
-{
-    return _tx;
-}
-
-}
-
-#endif
diff --git a/cpp/src/Freeze/ObjectStore.cpp b/cpp/src/Freeze/ObjectStore.cpp
deleted file mode 100644
index 874821ac06a..00000000000
--- a/cpp/src/Freeze/ObjectStore.cpp
+++ /dev/null
@@ -1,678 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/ObjectStore.h>
-#include <Freeze/EvictorI.h>
-#include <Freeze/BackgroundSaveEvictorI.h>
-#include <Freeze/Util.h>
-#include <Freeze/Catalog.h>
-#include <Freeze/TransactionI.h>
-#include <Freeze/IndexI.h>
-
-#include <IceUtil/StringConverter.h>
-
-using namespace std;
-using namespace Ice;
-using namespace Freeze;
-
-Freeze::ObjectStoreBase::ObjectStoreBase(const string& facet, const string& facetType,
-                                         bool createDb,  EvictorIBase* evictor,
-                                         const vector<IndexPtr>& indices,
-                                         bool populateEmptyIndices) :
-    _facet(facet),
-    _evictor(evictor),
-    _indices(indices),
-    _communicator(evictor->communicator()),
-    _encoding(evictor->encoding()),
-    _keepStats(false)
-{
-    if(facet == "")
-    {
-        _dbName = EvictorIBase::defaultDb;
-    }
-    else
-    {
-        _dbName = facet;
-    }
-
-    if(!facetType.empty())
-    {
-        //
-        // Create a sample servant with this type
-        //
-        ObjectFactoryPtr factory = _communicator->findObjectFactory(facetType);
-        if(factory == 0)
-        {
-            throw DatabaseException(__FILE__, __LINE__, "No object factory registered for type-id '" + facetType + "'");
-        }
-
-        _sampleServant = factory->create(facetType);
-    }
-
-    ConnectionPtr catalogConnection = createConnection(_communicator, evictor->dbEnv()->getEnvName());
-    Catalog catalog(catalogConnection, catalogName());
-
-    Catalog::iterator p = catalog.find(evictor->filename());
-    if(p != catalog.end())
-    {
-        if(p->second.evictor)
-        {
-            //
-            // empty means the value is ::Freeze::ObjectRecord
-            //
-            _keepStats = p->second.value.empty();
-        }
-        else
-        {
-            DatabaseException ex(__FILE__, __LINE__);
-            ex.message = evictor->filename() + " is not an evictor database";
-            throw ex;
-        }
-    }
-
-    DbEnv* dbEnv = evictor->dbEnv()->getEnv();
-
-    try
-    {
-        _db.reset(new Db(dbEnv, 0));
-
-        Ice::PropertiesPtr properties = evictor->communicator()->getProperties();
-        string propPrefix = "Freeze.Evictor." + evictor->filename() + ".";
-
-        int btreeMinKey = properties->getPropertyAsInt(propPrefix + _dbName + ".BtreeMinKey");
-        if(btreeMinKey > 2)
-        {
-            if(evictor->trace() >= 1)
-            {
-                Trace out(evictor->communicator()->getLogger(), "Freeze.Evictor");
-                out << "Setting \"" << evictor->filename() + "." + _dbName << "\"'s btree minkey to " << btreeMinKey;
-            }
-
-            _db->set_bt_minkey(btreeMinKey);
-        }
-
-        bool checksum = properties->getPropertyAsInt(propPrefix + "Checksum") > 0;
-        if(checksum)
-        {
-            if(evictor->trace() >= 1)
-            {
-                Trace out(evictor->communicator()->getLogger(), "Freeze.Evictor");
-                out << "Turning checksum on for \"" << evictor->filename() << "\"";
-            }
-
-            _db->set_flags(DB_CHKSUM);
-        }
-
-        int pageSize = properties->getPropertyAsInt(propPrefix + "PageSize");
-        if(pageSize > 0)
-        {
-            if(evictor->trace() >= 1)
-            {
-                Trace out(evictor->communicator()->getLogger(), "Freeze.Evictor");
-                out << "Setting \"" << evictor->filename() << "\"'s pagesize to " << pageSize;
-            }
-
-            _db->set_pagesize(pageSize);
-        }
-
-
-        TransactionPtr tx = catalogConnection->beginTransaction();
-        DbTxn* txn = getTxn(tx);
-
-        u_int32_t flags = DB_THREAD;
-        if(createDb)
-        {
-            flags |= DB_CREATE;
-        }
-
-        //
-        // Berkeley DB expects file paths to be UTF8 encoded. We keep 
-        // _dbName as a native string here, while it might have
-        // been better to convert it to UTF-8, changing this isn't
-        // possible without potentially breaking backward compatibility
-        // with deployed databases.
-        //
-        _db->open(txn, 
-                  IceUtil::nativeToUTF8(evictor->filename(), IceUtil::getProcessStringConverter()).c_str(),
-                  _dbName.c_str(), DB_BTREE, flags, FREEZE_DB_MODE);
-
-        for(size_t i = 0; i < _indices.size(); ++i)
-        {
-            _indices[i]->_impl->associate(this, txn, createDb, populateEmptyIndices);
-        }
-
-        if(p == catalog.end())
-        {
-            CatalogData catalogData;
-            catalogData.evictor = true;
-            catalogData.key = "Ice::Identity";
-            catalogData.value = "Object";
-            catalog.put(Catalog::value_type(evictor->filename(), catalogData));
-        }
-
-        tx->commit();
-    }
-    catch(const DbException& dx)
-    {
-        TransactionPtr tx = catalogConnection->currentTransaction();
-        if(tx != 0)
-        {
-            try
-            {
-                tx->rollback();
-            }
-            catch(...)
-            {
-            }
-        }
-
-        if(dx.get_errno() == ENOENT)
-        {
-            NotFoundException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-        else
-        {
-            DatabaseException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-    }
-    catch(...)
-    {
-        TransactionPtr tx = catalogConnection->currentTransaction();
-        if(tx != 0)
-        {
-            try
-            {
-                tx->rollback();
-            }
-            catch(...)
-            {
-            }
-        }
-        throw;
-    }
-}
-
-Freeze::ObjectStoreBase::~ObjectStoreBase()
-{
-    try
-    {
-        _db->close(0);
-
-        for(size_t i = 0; i < _indices.size(); ++i)
-        {
-            try
-            {
-                _indices[i]->_impl->close();
-            }
-            catch(const DatabaseException& ex)
-            {
-                Ice::Error error(_communicator->getLogger());
-                error << "Freeze: closing ObjectStore " << _dbName << " raised DatabaseException: " << ex.what();
-            }
-        }
-        _indices.clear();
-    }
-    catch(const DbException& dx)
-    {
-        Ice::Error error(_communicator->getLogger());
-        error << "Freeze: closing ObjectStore " << _dbName << " raised DbException: " << dx.what();
-    }
-}
-
-bool
-Freeze::ObjectStoreBase::dbHasObject(const Identity& ident, const TransactionIPtr& transaction) const
-{
-    DbTxn* tx = 0;
-    if(transaction != 0)
-    {
-        tx = transaction->dbTxn();
-        if(tx == 0)
-        {
-            throw DatabaseException(__FILE__, __LINE__, "inactive transaction");
-        }
-    }
-
-    Dbt dbKey;
-    KeyMarshaler km(ident, _communicator, _encoding);
-    km.getDbt(dbKey);
-
-    //
-    // Keep 0 length since we're not interested in the data
-    //
-    Dbt dbValue;
-    dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-    for(;;)
-    {
-        try
-        {
-            int err = _db->get(tx, &dbKey, &dbValue, 0);
-
-            if(err == 0)
-            {
-                return true;
-            }
-            else if(err == DB_NOTFOUND)
-            {
-                return false;
-            }
-            else
-            {
-                assert(0);
-                throw DatabaseException(__FILE__, __LINE__);
-            }
-        }
-        catch(const DbDeadlockException& dx)
-        {
-            if(_evictor->deadlockWarning())
-            {
-                Warning out(_communicator->getLogger());
-                out << "Deadlock in Freeze::ObjectStoreBase::dbHasObject while searching \""
-                    << _evictor->filename() + "/" + _dbName << "\"; retrying ...";
-            }
-
-            if(tx != 0)
-            {
-                throw DeadlockException(__FILE__, __LINE__, dx.what(), transaction);
-            }
-            // Else, try again
-        }
-        catch(const DbException& dx)
-        {
-            DatabaseException ex(__FILE__, __LINE__);
-            ex.message = dx.what();
-            throw ex;
-        }
-    }
-
-}
-
-void
-Freeze::ObjectStoreBase::save(Dbt& key, Dbt& value, Byte status, DbTxn* tx)
-{
-    switch(status)
-    {
-        case created:
-        case modified:
-        {
-            u_int32_t flags = (status == created) ? DB_NOOVERWRITE : 0;
-            int err = _db->put(tx, &key, &value, flags);
-            if(err != 0)
-            {
-                throw DatabaseException(__FILE__, __LINE__);
-            }
-            break;
-        }
-
-        case destroyed:
-        {
-            int err = _db->del(tx, &key, 0);
-            if(err != 0)
-            {
-                throw DatabaseException(__FILE__, __LINE__);
-            }
-            break;
-        }
-        default:
-        {
-            assert(0);
-        }
-    }
-}
-
-Freeze::ObjectStoreBase::Marshaler::Marshaler(const CommunicatorPtr& communicator,
-                                              const EncodingVersion& encoding) :
-    _os(IceInternal::getInstance(communicator).get(), encoding)
-{
-}
-
-void
-Freeze::ObjectStoreBase::Marshaler::getDbt(Dbt& dbt) const
-{
-    initializeInDbt(const_cast<IceInternal::BasicStream&>(_os), dbt);
-}
-
-Freeze::ObjectStoreBase::KeyMarshaler::KeyMarshaler(const Identity& ident,
-                                                    const CommunicatorPtr& communicator,
-                                                    const EncodingVersion& encoding) :
-    Marshaler(communicator, encoding)
-{
-    _os.write(ident);
-}
-
-Freeze::ObjectStoreBase::ValueMarshaler::ValueMarshaler(const ObjectRecord& rec,
-                                                        const CommunicatorPtr& communicator,
-                                                        const EncodingVersion& encoding,
-                                                        bool keepStats) :
-    Marshaler(communicator, encoding)
-{
-    _os.startWriteEncaps();
-    if(keepStats)
-    {
-        _os.write(rec);
-    }
-    else
-    {
-        _os.write(rec.servant);
-    }
-
-    _os.writePendingObjects();
-    _os.endWriteEncaps();
-}
-
-void
-Freeze::ObjectStoreBase::unmarshal(Identity& ident,
-                                   const Key& bytes,
-                                   const CommunicatorPtr& communicator,
-                                   const EncodingVersion& encoding)
-{
-    IceInternal::InstancePtr instance = IceInternal::getInstance(communicator);
-    IceInternal::BasicStream stream(instance.get(), encoding, &bytes[0], &bytes[0] + bytes.size());
-    stream.read(ident);
-}
-
-void
-Freeze::ObjectStoreBase::unmarshal(ObjectRecord& v,
-                                   const Value& bytes,
-                                   const CommunicatorPtr& communicator,
-                                   const EncodingVersion& encoding,
-                                   bool keepStats)
-{
-    IceInternal::InstancePtr instance = IceInternal::getInstance(communicator);
-    IceInternal::BasicStream stream(instance.get(), encoding, &bytes[0], &bytes[0] + bytes.size());
-    stream.sliceObjects(false);
-    stream.startReadEncaps();
-
-    if(keepStats)
-    {
-        stream.read(v);
-    }
-    else
-    {
-        stream.read(v.servant);
-    }
-
-    stream.readPendingObjects();
-    stream.endReadEncaps();
-}
-
-bool
-Freeze::ObjectStoreBase::load(const Identity& ident, const TransactionIPtr& transaction, ObjectRecord& rec)
-{
-    if(transaction == 0)
-    {
-        throw DatabaseException(__FILE__, __LINE__, "no active transaction");
-    }
-
-    DbTxn* txn = transaction->dbTxn();
-
-    if(txn == 0)
-    {
-        throw DatabaseException(__FILE__, __LINE__, "inactive transaction");
-    }
-
-    Dbt dbKey;
-    KeyMarshaler km(ident, _communicator, _encoding);
-    km.getDbt(dbKey);
-
-    const size_t defaultValueSize = 4096;
-    Value value(defaultValueSize);
-
-    Dbt dbValue;
-    initializeOutDbt(value, dbValue);
-
-    for(;;)
-    {
-        try
-        {
-            int rs =_db->get(txn, &dbKey, &dbValue, 0);
-            if(rs == DB_NOTFOUND)
-            {
-                return false;
-            }
-            else if(rs != 0)
-            {
-                assert(0);
-                throw DatabaseException(__FILE__, __LINE__);
-            }
-            break; // for(;;)
-        }
-        catch(const DbDeadlockException& dx)
-        {
-            if(_evictor->deadlockWarning())
-            {
-                Warning out(_communicator->getLogger());
-                out << "Deadlock in Freeze::ObjectStoreBase::load while searching \""
-                    << _evictor->filename() + "/" + _dbName << "\"";
-            }
-            throw DeadlockException(__FILE__, __LINE__, dx.what(), transaction);
-        }
-        catch(const DbException& dx)
-        {
-            handleDbException(dx, value, dbValue, __FILE__, __LINE__);
-        }
-    }
-
-    unmarshal(rec, value, _communicator, _encoding, _keepStats);
-    _evictor->initialize(ident, _facet, rec.servant);
-    return true;
-}
-
-void
-Freeze::ObjectStoreBase::update(const Identity& ident, const ObjectRecord& rec, const TransactionIPtr& transaction)
-{
-    if(transaction == 0)
-    {
-        throw DatabaseException(__FILE__, __LINE__, "no active transaction");
-    }
-
-    DbTxn* txn = transaction->dbTxn();
-
-    if(txn == 0)
-    {
-        throw DatabaseException(__FILE__, __LINE__, "inactive transaction");
-    }
-
-    Dbt dbKey;
-    KeyMarshaler km(ident, _communicator, _encoding);
-    km.getDbt(dbKey);
-
-    Dbt dbValue;
-    ValueMarshaler vm(rec, _communicator, _encoding, _keepStats);
-    vm.getDbt(dbValue);
-
-    u_int32_t flags = 0;
-
-    try
-    {
-        _db->put(txn, &dbKey, &dbValue, flags);
-    }
-    catch(const DbDeadlockException& dx)
-    {
-        if(_evictor->deadlockWarning())
-        {
-            Warning out(_communicator->getLogger());
-            out << "Deadlock in Freeze::ObjectStoreBase::update while updating \""
-                << _evictor->filename() + "/" + _dbName << "\"";
-        }
-        throw DeadlockException(__FILE__, __LINE__, dx.what(), transaction);
-    }
-    catch(const DbException& dx)
-    {
-        handleDbException(dx, __FILE__, __LINE__);
-    }
-}
-
-bool
-Freeze::ObjectStoreBase::insert(const Identity& ident, const ObjectRecord& rec, const TransactionIPtr& transaction)
-{
-    DbTxn* tx = 0;
-    if(transaction != 0)
-    {
-        tx = transaction->dbTxn();
-        if(tx == 0)
-        {
-            throw DatabaseException(__FILE__, __LINE__, "inactive transaction");
-        }
-    }
-
-    Dbt dbKey;
-    KeyMarshaler km(ident, _communicator, _encoding);
-    km.getDbt(dbKey);
-
-    Dbt dbValue;
-    ValueMarshaler vm(rec, _communicator, _encoding, _keepStats);
-    vm.getDbt(dbValue);
-
-    u_int32_t flags = DB_NOOVERWRITE;
-    if(tx == 0)
-    {
-        flags |= DB_AUTO_COMMIT;
-    }
-
-    for(;;)
-    {
-        try
-        {
-            return  _db->put(tx, &dbKey, &dbValue, flags) == 0;
-        }
-        catch(const DbDeadlockException& dx)
-        {
-            if(_evictor->deadlockWarning())
-            {
-                Warning out(_communicator->getLogger());
-                out << "Deadlock in Freeze::ObjectStoreBase::insert while updating \""
-                    << _evictor->filename() + "/" + _dbName << "\"";
-            }
-            if(tx != 0)
-            {
-                throw DeadlockException(__FILE__, __LINE__, dx.what(), transaction);
-            }
-            //
-            // Otherwise, try again
-            //
-        }
-        catch(const DbException& dx)
-        {
-            handleDbException(dx, __FILE__, __LINE__);
-        }
-    }
-}
-
-bool
-Freeze::ObjectStoreBase::remove(const Identity& ident, const TransactionIPtr& transaction)
-{
-    DbTxn* tx = 0;
-    if(transaction != 0)
-    {
-        tx = transaction->dbTxn();
-        if(tx == 0)
-        {
-            throw DatabaseException(__FILE__, __LINE__, "inactive transaction");
-        }
-    }
-
-    Dbt dbKey;
-    KeyMarshaler km(ident, _communicator, _encoding);
-    km.getDbt(dbKey);
-
-    for(;;)
-    {
-        try
-        {
-            return _db->del(tx, &dbKey, tx != 0 ? 0 : DB_AUTO_COMMIT) == 0;
-        }
-        catch(const DbDeadlockException& dx)
-        {
-            if(_evictor->deadlockWarning())
-            {
-                Warning out(_communicator->getLogger());
-                out << "Deadlock in Freeze::ObjectStoreBase::remove while updating \""
-                    << _evictor->filename() + "/" + _dbName << "\"";
-            }
-            if(tx != 0)
-            {
-                throw DeadlockException(__FILE__, __LINE__, dx.what(), transaction);
-            }
-            //
-            // Otherwise, try again
-            //
-        }
-        catch(const DbException& dx)
-        {
-            handleDbException(dx, __FILE__, __LINE__);
-        }
-    }
-}
-
-
-const string&
-Freeze::ObjectStoreBase::dbName() const
-{
-    return _dbName;
-}
-
-//
-// Non transactional load
-//
-bool
-Freeze::ObjectStoreBase::loadImpl(const Identity& ident, ObjectRecord& rec)
-{
-    Dbt dbKey;
-    KeyMarshaler km(ident, _communicator, _encoding);
-    km.getDbt(dbKey);
-
-    const size_t defaultValueSize = 4096;
-    Value value(defaultValueSize);
-
-    Dbt dbValue;
-    initializeOutDbt(value, dbValue);
-
-    for(;;)
-    {
-        try
-        {
-            int rs = _db->get(0, &dbKey, &dbValue, 0);
-            if(rs == DB_NOTFOUND)
-            {
-                return false;
-            }
-            else if(rs != 0)
-            {
-                assert(0);
-                throw DatabaseException(__FILE__, __LINE__);
-            }
-            break; // for(;;)
-        }
-        catch(const DbDeadlockException&)
-        {
-            if(_evictor->deadlockWarning())
-            {
-                Warning out(_communicator->getLogger());
-                out << "Deadlock in Freeze::ObjectStoreBase::load while searching \""
-                    << _evictor->filename() + "/" + _dbName << "\"; retrying ...";
-            }
-            //
-            // Ignored, try again
-            //
-        }
-        catch(const DbException& dx)
-        {
-            handleDbException(dx, value, dbValue, __FILE__, __LINE__);
-        }
-    }
-
-    unmarshal(rec, value, _communicator, _encoding, _keepStats);
-    _evictor->initialize(ident, _facet, rec.servant);
-    return true;
-}
diff --git a/cpp/src/Freeze/ObjectStore.h b/cpp/src/Freeze/ObjectStore.h
deleted file mode 100644
index 5d76d650af3..00000000000
--- a/cpp/src/Freeze/ObjectStore.h
+++ /dev/null
@@ -1,206 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_OBJECT_STORE_H
-#define FREEZE_OBJECT_STORE_H
-
-#include <Ice/Ice.h>
-#include <Ice/Identity.h>
-#include <Freeze/DB.h>
-#include <Freeze/EvictorStorage.h>
-#include <Freeze/Index.h>
-#include <Freeze/TransactionI.h>
-#include <IceUtil/Cache.h>
-
-#include <vector>
-#include <list>
-#include <db_cxx.h>
-
-namespace Freeze
-{
-
-template<class T> class EvictorI;
-
-class EvictorIBase;
-
-class ObjectStoreBase
-{
-public:
-
-    ObjectStoreBase(const std::string&, const std::string&, bool, EvictorIBase*, 
-                    const std::vector<IndexPtr>&, bool);
-
-    virtual ~ObjectStoreBase();
-
-    const Ice::ObjectPtr& sampleServant() const;
-
-    bool dbHasObject(const Ice::Identity&, const TransactionIPtr&) const;
-    void save(Dbt&, Dbt&, Ice::Byte, DbTxn*);
-
-    //
-    // This base class encapsulates a BasicStream, which allows us to avoid
-    // making any extra copies of marshaled data when updating the database.
-    //
-    class Marshaler
-    {
-    public:
-
-        Marshaler(const Ice::CommunicatorPtr&, const Ice::EncodingVersion&);
-
-        void getDbt(Dbt&) const;
-
-    protected:
-
-        IceInternal::BasicStream _os;
-    };
-
-    class KeyMarshaler : public Marshaler
-    {
-    public:
-
-        KeyMarshaler(const Ice::Identity&, const Ice::CommunicatorPtr&, const Ice::EncodingVersion&);
-    };
-
-    class ValueMarshaler : public Marshaler
-    {
-    public:
-
-        ValueMarshaler(const ObjectRecord&, const Ice::CommunicatorPtr&, const Ice::EncodingVersion&, bool);
-    };
-
-    static void unmarshal(Ice::Identity&, const Key&, const Ice::CommunicatorPtr&, const Ice::EncodingVersion&);
-    static void unmarshal(ObjectRecord&, const Value&, const Ice::CommunicatorPtr&, const Ice::EncodingVersion&, bool);
-
-    bool load(const Ice::Identity&, const TransactionIPtr&, ObjectRecord&);
-    void update(const Ice::Identity&, const ObjectRecord&, const TransactionIPtr&);
-
-    bool insert(const Ice::Identity&, const ObjectRecord&, const TransactionIPtr&);
-    bool remove(const Ice::Identity&, const TransactionIPtr&);
-    
-    EvictorIBase* evictor() const;
-
-    //
-    // For IndexI and Iterator
-    //
-    Db* db() const;
-    const std::string& dbName() const;
-
-    const Ice::CommunicatorPtr& communicator() const;
-    const Ice::EncodingVersion& encoding() const;
-    const std::string& facet() const;
-    bool keepStats() const;
-    
-protected:
-
-    bool loadImpl(const Ice::Identity&, ObjectRecord&);
-
-private:
-    
-    IceUtil::UniquePtr<Db> _db;
-    std::string _facet;
-    std::string _dbName;
-    EvictorIBase* _evictor;
-    std::vector<IndexPtr> _indices;
-    Ice::CommunicatorPtr _communicator;
-    Ice::EncodingVersion _encoding;
-    Ice::ObjectPtr _sampleServant;
-    bool _keepStats;
-};
-
-
-template<class T>
-class ObjectStore : public ObjectStoreBase, public IceUtil::Cache<Ice::Identity, T>
-{
- public:
-
-    ObjectStore(const std::string& facet, const std::string facetType,
-                bool createDb, EvictorIBase* evictor, 
-                const std::vector<IndexPtr>& indices = std::vector<IndexPtr>(),
-                bool populateEmptyIndices = false) :
-        ObjectStoreBase(facet, facetType, createDb, evictor, indices, populateEmptyIndices)
-    {
-    }
-
-    using ObjectStoreBase::load;
-
-    typedef IceUtil::Cache<Ice::Identity, T> Cache;
-
-protected:
-
-    virtual IceUtil::Handle<T> 
-    load(const Ice::Identity& ident)
-    {
-        ObjectRecord rec;
-        if(loadImpl(ident, rec))
-        {
-            return new T(rec, *this);
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    virtual void 
-    pinned(const IceUtil::Handle<T>& element, typename Cache::Position p)
-    {
-        element->init(p);
-    }
-};
-
-//
-// Inline member function definitions
-//
-
-inline Db* 
-ObjectStoreBase::db() const
-{
-    return _db.get();
-}
-
-inline const Ice::CommunicatorPtr& 
-ObjectStoreBase::communicator() const
-{
-    return _communicator;
-}
-
-inline const Ice::EncodingVersion& 
-ObjectStoreBase::encoding() const
-{
-    return _encoding;
-}
-
-inline EvictorIBase*
-ObjectStoreBase::evictor() const
-{
-    return _evictor;
-}
-
-inline const std::string&
-ObjectStoreBase::facet() const
-{
-    return _facet;
-}
-
-inline bool
-ObjectStoreBase::keepStats() const
-{
-    return _keepStats;
-}
-
-inline const Ice::ObjectPtr&
-ObjectStoreBase::sampleServant() const
-{
-    return _sampleServant;
-}
-
-}
-
-#endif
-
diff --git a/cpp/src/Freeze/SharedDbEnv.cpp b/cpp/src/Freeze/SharedDbEnv.cpp
deleted file mode 100644
index e0688da9f30..00000000000
--- a/cpp/src/Freeze/SharedDbEnv.cpp
+++ /dev/null
@@ -1,755 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/SharedDbEnv.h>
-#include <Freeze/Exception.h>
-#include <Freeze/Util.h>
-#include <Freeze/MapDb.h>
-#include <Freeze/TransactionalEvictorContext.h>
-#include <Freeze/Catalog.h>
-#include <Freeze/CatalogIndexList.h>
-
-#include <IceUtil/MutexPtrLock.h>
-#include <IceUtil/MutexPtrTryLock.h>
-#include <IceUtil/StringUtil.h>
-#include <IceUtil/IceUtil.h>
-
-#include <IceUtil/StringConverter.h>
-
-#include <cstdlib>
-
-
-using namespace std;
-using namespace IceUtil;
-using namespace Ice;
-using namespace Freeze;
-
-namespace Freeze
-{
-
-class CheckpointThread : public Thread, public Monitor<Mutex>
-{
-public:
-
-    CheckpointThread(SharedDbEnv&, const Time&, Int, Int);
-
-    virtual void run();
-
-    void terminate();
-
-private:
-    SharedDbEnv& _dbEnv;
-    bool _done;
-    Time _checkpointPeriod;
-    Int _kbyte;
-    Int _trace;
-};
-
-}
-
-namespace
-{
-
-struct MapKey
-{
-    string envName;
-    Ice::CommunicatorPtr communicator;
-};
-
-inline bool
-operator<(const MapKey& lhs, const MapKey& rhs)
-{
-    return (lhs.communicator < rhs.communicator) ||
-        ((lhs.communicator == rhs.communicator) && (lhs.envName < rhs.envName));
-}
-
-#if DB_VERSION_MAJOR < 4
-#error Freeze requires DB 4.x or greater
-#endif
-
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3
-void
-dbErrCallback(const char* prefix, char* msg)
-#else
-void
-dbErrCallback(const ::DbEnv* /*ignored*/, const char* prefix, const char* msg)
-#endif
-{
-    const Freeze::SharedDbEnv* env = reinterpret_cast<const Freeze::SharedDbEnv*>(prefix);
-    assert(env != 0);
-
-    Ice::Trace out(env->getCommunicator()->getLogger(), "Berkeley DB");
-    out << "DbEnv \"" << env->getEnvName() << "\": " << msg;
-}
-
-namespace
-{
-
-Mutex* mapMutex = 0;
-Mutex* refCountMutex = 0;
-
-class Init
-{
-public:
-
-    Init()
-    {
-        mapMutex = new IceUtil::Mutex;
-        refCountMutex = new IceUtil::Mutex;
-    }
-
-    ~Init()
-    {
-        delete mapMutex;
-        mapMutex = 0;
-
-        delete refCountMutex;
-        refCountMutex = 0;
-    }
-};
-
-Init init;
-
-}
-
-typedef map<MapKey, Freeze::SharedDbEnv*> SharedDbEnvMap;
-SharedDbEnvMap* sharedDbEnvMap;
-
-}
-
-Freeze::SharedDbEnvPtr
-Freeze::SharedDbEnv::get(const CommunicatorPtr& communicator, const string& envName, DbEnv* env)
-{
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(mapMutex);
-
-    if(sharedDbEnvMap == 0)
-    {
-        sharedDbEnvMap = new SharedDbEnvMap;
-    }
-
-    MapKey key;
-    key.envName = envName;
-    key.communicator = communicator;
-
-    {
-        SharedDbEnvMap::iterator p = sharedDbEnvMap->find(key);
-        if(p != sharedDbEnvMap->end())
-        {
-            return p->second;
-        }
-    }
-
-    //
-    // MapKey not found, let's create and open a new DbEnv
-    //
-    IceUtil::UniquePtr<SharedDbEnv> result(new SharedDbEnv(envName, communicator, env));
-
-    //
-    // Insert it into the map
-    //
-    pair<SharedDbEnvMap::iterator, bool> insertResult;
-    insertResult = sharedDbEnvMap->insert(SharedDbEnvMap::value_type(key, result.get()));
-    assert(insertResult.second);
-
-    return result.release();
-}
-
-Freeze::SharedDbEnv::~SharedDbEnv()
-{
-    try
-    {
-        cleanup();
-    }
-    catch(const Ice::Exception& ex)
-    {
-        Error out(_communicator->getLogger());
-        out << "Freeze DbEnv close error:" << ex;
-    }
-    catch(const std::exception& ex)
-    {
-        Error out(_communicator->getLogger());
-        out << "Freeze DbEnv close error:" << ex.what();
-    }
-    catch(...)
-    {
-        Error out(_communicator->getLogger());
-        out << "Freeze DbEnv close error: unknown exception";
-    }
-
-#ifdef _WIN32
-    if(!TlsFree(_tsdKey))
-    {
-        Error out(_communicator->getLogger());
-        out << "Freeze DbEnv close error:" << IceUtilInternal::lastErrorToString();
-    }
-#else
-    int err = pthread_key_delete(_tsdKey);
-    if(err != 0)
-    {
-        Error out(_communicator->getLogger());
-        out << "Freeze DbEnv close error:" << IceUtilInternal::errorToString(err);
-    }
-#endif
-}
-
-
-Freeze::MapDb*
-Freeze::SharedDbEnv::getSharedMapDb(const string& dbName,
-                                    const string& key,
-                                    const string& value,
-                                    const KeyCompareBasePtr& keyCompare,
-                                    const vector<MapIndexBasePtr>& indices,
-                                    bool createDb)
-{
-    //
-    // We don't want to lock to retrieve the catalog or catalog index
-    //
-
-    if(dbName == _catalog->dbName())
-    {
-        _catalog->checkTypes(key, value);
-        return _catalog;
-    }
-    else if(dbName == _catalogIndexList->dbName())
-    {
-        _catalogIndexList->checkTypes(key, value);
-        return _catalogIndexList;
-    }
-
-    IceUtil::Mutex::Lock lock(_mutex);
-
-    SharedDbMap::iterator p = _sharedDbMap.find(dbName);
-    if(p != _sharedDbMap.end())
-    {
-        MapDb* db = p->second;
-        db->checkTypes(key, value);
-        db->connectIndices(indices);
-        return db;
-    }
-
-
-    //
-    // key not found, let's create and open a new Db
-    //
-
-    //
-    // Since we're going to put this SharedDb in the map no matter
-    // what, we use our own transaction and connection to do so
-    //
-
-    ConnectionIPtr insertConnection = new ConnectionI(this);
-
-    IceUtil::UniquePtr<MapDb> result(new MapDb(insertConnection, dbName, key, value,
-                                     keyCompare, indices, createDb));
-
-    //
-    // Insert it into the map
-    //
-    pair<SharedDbMap::iterator, bool> insertResult;
-    insertResult = _sharedDbMap.insert(SharedDbMap::value_type(dbName, result.get()));
-    assert(insertResult.second);
-
-    return result.release();
-}
-
-
-
-void
-Freeze::SharedDbEnv::removeSharedMapDb(const string& dbName)
-{
-    IceUtil::Mutex::Lock lock(_mutex);
-
-    SharedDbMap::iterator p = _sharedDbMap.find(dbName);
-    if(p != _sharedDbMap.end())
-    {
-        MapDb* db = p->second;
-        _sharedDbMap.erase(p);
-        delete db;
-    }
-}
-
-
-void 
-Freeze::SharedDbEnv::__incRef()
-{
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(refCountMutex);
-    _refCount++;
-}
-
-void
-Freeze::SharedDbEnv::__decRef()
-{
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(refCountMutex);
-    if(--_refCount == 0)
-    {
-        MapKey key;
-        key.envName = _envName;
-        key.communicator = _communicator;
-
-
-        IceUtilInternal::MutexPtrTryLock<IceUtil::Mutex> mapLock(mapMutex);
-        if(!mapLock.acquired())
-        {
-            //
-            // Reacquire mutex in proper order and check again
-            //
-            lock.release();
-            mapLock.acquire();
-            lock.acquire();
-
-            //
-            // Now, maybe another thread has deleted 'this'; let's check
-            // we're still in the map
-            //
-
-            if(sharedDbEnvMap == 0)
-            {
-                return;
-            }
-
-            SharedDbEnvMap::iterator p = sharedDbEnvMap->find(key);
-
-            if(p == sharedDbEnvMap->end() || p->second != this)
-            {
-                //
-                // 'this' has been deleted by another thread
-                //
-                return;
-            }
-
-            if(_refCount > 0)
-            {
-                return;
-            }
-        }
-
-        //
-        // Remove from map
-        //
-#ifndef NDEBUG
-        size_t one = sharedDbEnvMap->erase(key);
-        assert(one == 1);
-#else
-        sharedDbEnvMap->erase(key);
-#endif
-        if(sharedDbEnvMap->size() == 0)
-        {
-            delete sharedDbEnvMap;
-            sharedDbEnvMap = 0;
-        }
-
-        //
-        // Keep lock to prevent somebody else from reopening this DbEnv
-        // before it's closed.
-        //
-        delete this;
-    }
-}
-
-
-Freeze::TransactionalEvictorContextPtr
-Freeze::SharedDbEnv::createCurrent()
-{
-    assert(getCurrent() == 0);
-
-    Freeze::TransactionalEvictorContextPtr ctx = new TransactionalEvictorContext(this);
-#ifdef _WIN32
-    if(TlsSetValue(_tsdKey, ctx.get()) == 0)
-    {
-        IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
-    }
-#else
-    if(int err = pthread_setspecific(_tsdKey, ctx.get()))
-    {
-        throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, err);
-    }
-#endif
-
-    //
-    // Give one refcount to this thread!
-    //
-    ctx->__incRef();
-    return ctx;
-}
-
-Freeze::TransactionalEvictorContextPtr
-Freeze::SharedDbEnv::getCurrent()
-{
-#ifdef _WIN32
-    void* val = TlsGetValue(_tsdKey);
-#else
-    void* val = pthread_getspecific(_tsdKey);
-#endif
-
-    if(val != 0)
-    {
-        return static_cast<TransactionalEvictorContext*>(val);
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-void
-Freeze::SharedDbEnv::setCurrentTransaction(const Freeze::TransactionPtr& tx)
-{
-    TransactionIPtr txi;
-
-    if(tx != 0)
-    {
-        txi = Freeze::TransactionIPtr::dynamicCast(tx);
-
-        //
-        // Verify it points to the good DbEnv
-        //
-        ConnectionIPtr conn = ConnectionIPtr::dynamicCast(tx->getConnection());
-        if(!conn || conn->dbEnv() == 0)
-        {
-            throw DatabaseException(__FILE__, __LINE__, "invalid transaction");
-        }
-
-        if(conn->dbEnv().get() != this)
-        {
-            throw DatabaseException(__FILE__, __LINE__, "the given transaction is bound to environment '" +
-                                    conn->dbEnv()->_envName + "'");
-        }
-    }
-
-    Freeze::TransactionalEvictorContextPtr ctx = getCurrent();
-
-    if(ctx != 0)
-    {
-        //
-        // Release thread's refcount
-        //
-        ctx->__decRef();
-    }
-
-    if(tx != 0)
-    {
-        if(ctx == 0 || ctx->transaction().get() != txi.get())
-        {
-            ctx = new TransactionalEvictorContext(txi);
-
-#ifdef _WIN32
-            if(TlsSetValue(_tsdKey, ctx.get()) == 0)
-            {
-                IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
-            }
-#else
-            if(int err = pthread_setspecific(_tsdKey, ctx.get()))
-            {
-                throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, err);
-            }
-#endif
-            //
-            // Give one refcount to this thread
-            //
-            ctx->__incRef();
-        }
-    }
-    else if(ctx != 0)
-    {
-#ifdef _WIN32
-        if(TlsSetValue(_tsdKey, 0) == 0)
-        {
-            IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
-        }
-#else
-        if(int err = pthread_setspecific(_tsdKey, 0))
-        {
-            throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, err);
-        }
-#endif
-    }
-}
-
-Freeze::SharedDbEnv::SharedDbEnv(const std::string& envName,
-                                 const Ice::CommunicatorPtr& communicator, DbEnv* env) :
-    _env(env),
-    _envName(envName),
-    _communicator(communicator),
-    _catalog(0),
-    _catalogIndexList(0),
-    _refCount(0)
-{
-    Ice::PropertiesPtr properties = _communicator->getProperties();
-
-#ifdef _WIN32
-    _tsdKey = TlsAlloc();
-    if(_tsdKey == TLS_OUT_OF_INDEXES)
-    {
-        throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
-    }
-#else
-    int err = pthread_key_create(&_tsdKey, 0);
-    if(err != 0)
-    {
-        throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, err);
-    }
-#endif
-
-    string propertyPrefix = string("Freeze.DbEnv.") + envName;
-    string dbHome = properties->getPropertyWithDefault(propertyPrefix + ".DbHome", envName);
-
-    string encoding = properties->getPropertyWithDefault(propertyPrefix + ".EncodingVersion",
-                                                         encodingVersionToString(Ice::currentEncoding));
-    _encoding = stringToEncodingVersion(encoding);
-    IceInternal::checkSupportedEncoding(_encoding);
-
-    //
-    // Normally the file lock is necessary, but for read-only situations (such as when
-    // using the FreezeScript utilities) this property allows the file lock to be
-    // disabled.
-    //
-    if(properties->getPropertyAsIntWithDefault(propertyPrefix + ".LockFile", 1) > 0)
-    {
-        //
-        // Use a file lock to prevent multiple processes from opening the same db env. We
-        // create the lock file in a sub-directory to ensure db_hotbackup won't try to copy
-        // the file when backing up the environment (this would fail on Windows where copying
-        // a locked file isn't possible).
-        //
-        if(!::IceUtilInternal::directoryExists(dbHome + "/__Freeze"))
-        {
-            ::IceUtilInternal::mkdir(dbHome + "/__Freeze", 0777);
-        }
-        _fileLock = new ::IceUtilInternal::FileLock(dbHome + "/__Freeze/lock");
-    }
-
-    _trace = properties->getPropertyAsInt("Freeze.Trace.DbEnv");
-
-    try
-    {
-        if(_env == 0)
-        {
-            _envHolder.reset(new DbEnv(0));
-            _env = _envHolder.get();
-
-            if(_trace >= 1)
-            {
-                Trace out(_communicator->getLogger(), "Freeze.DbEnv");
-                out << "opening database environment \"" << envName << "\"";
-            }
-
-            _env->set_errpfx(reinterpret_cast<char*>(this));
-
-            _env->set_errcall(dbErrCallback);
-
-#ifdef _WIN32
-            //
-            // Berkeley DB may use a different C++ runtime
-            //
-            _env->set_alloc(::malloc, ::realloc, ::free);
-#endif
-
-            //
-            // Deadlock detection
-            //
-            _env->set_lk_detect(DB_LOCK_YOUNGEST);
-
-            u_int32_t flags = DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN;
-
-            if(properties->getPropertyAsInt(propertyPrefix + ".DbRecoverFatal") > 0)
-            {
-                flags |= DB_RECOVER_FATAL | DB_CREATE;
-            }
-            else
-            {
-                flags |= DB_RECOVER | DB_CREATE;
-            }
-
-            if(properties->getPropertyAsIntWithDefault(propertyPrefix + ".DbPrivate", 1) > 0)
-            {
-                flags |= DB_PRIVATE;
-            }
-
-            //
-            // Auto delete
-            //
-            bool autoDelete = (properties->getPropertyAsIntWithDefault(propertyPrefix + ".OldLogsAutoDelete", 1) > 0);
-
-            if(autoDelete)
-            {
-#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 7)
-                //
-                // Old API
-                //
-                _env->set_flags(DB_LOG_AUTOREMOVE, 1);
-#else
-                _env->log_set_config(DB_LOG_AUTO_REMOVE, 1);
-#endif
-            }
-
-            //
-            // Threading
-            //
-            flags |= DB_THREAD;
-
-            //
-            // Berkeley DB expects file paths to be UTF8 encoded.
-            //
-            _env->open(nativeToUTF8(dbHome, getProcessStringConverter()).c_str(), flags, FREEZE_DB_MODE);
-
-            //
-            // Default checkpoint period is every 120 seconds
-            //
-            Int checkpointPeriod = properties->getPropertyAsIntWithDefault(propertyPrefix + ".CheckpointPeriod", 120);
-            Int kbyte = properties->getPropertyAsIntWithDefault(propertyPrefix + ".PeriodicCheckpointMinSize", 0);
-
-            if(checkpointPeriod > 0)
-            {
-                _thread = new CheckpointThread(*this, Time::seconds(checkpointPeriod), kbyte, _trace);
-            }
-        }
-
-        //
-        // Get catalogs
-        //
-        _catalog = new MapDb(_communicator, _encoding, catalogName(), Catalog::keyTypeId(),
-                             Catalog::valueTypeId(), _env);
-        _catalogIndexList = new MapDb(_communicator, _encoding, catalogIndexListName(),
-                                      CatalogIndexList::keyTypeId(), CatalogIndexList::valueTypeId(), _env);
-    }
-    catch(const ::DbException& dx)
-    {
-        cleanup();
-        throw DatabaseException(__FILE__, __LINE__, dx.what());
-    }
-}
-
-void
-Freeze::SharedDbEnv::cleanup()
-{
-    if(_trace >= 1)
-    {
-        Trace out(_communicator->getLogger(), "Freeze.DbEnv");
-        out << "closing database environment \"" << _envName << "\"";
-    }
-
-    //
-    // Close & destroy all MapDbs
-    //
-    for(SharedDbMap::iterator p = _sharedDbMap.begin(); p != _sharedDbMap.end(); ++p)
-    {
-        try
-        {
-            delete p->second;
-        }
-        catch(const DatabaseException& ex)
-        {
-            Error out(_communicator->getLogger());
-            out << "Freeze map: \"" << p->first << "\" close error: " << ex;
-        }
-        catch(const std::exception& ex)
-        {
-            Error out(_communicator->getLogger());
-            out << "Freeze map: \"" << p->first << "\" close error: " << ex.what();
-        }
-        catch(...)
-        {
-            Error out(_communicator->getLogger());
-            out << "Freeze map: \"" << p->first << "\" close error: unknown exception.";
-        }
-    }
-
-    //
-    // Same for catalogs
-    //
-    delete _catalog;
-    delete _catalogIndexList;
-
-    //
-    // Then terminate checkpointing thread
-    //
-    if(_thread != 0)
-    {
-        _thread->terminate();
-        _thread = 0;
-    }
-
-    //
-    // And finally close env
-    //
-
-    if(_envHolder.get() != 0)
-    {
-        try
-        {
-            _envHolder->close(0);
-        }
-        catch(const ::DbException& dx)
-        {
-            throw DatabaseException(__FILE__, __LINE__, dx.what());
-        }
-    }
-}
-
-
-Freeze::CheckpointThread::CheckpointThread(SharedDbEnv& dbEnv, const Time& checkpointPeriod, Int kbyte, Int trace) :
-    Thread("Freeze checkpoint thread"),
-    _dbEnv(dbEnv),
-    _done(false),
-    _checkpointPeriod(checkpointPeriod),
-    _kbyte(kbyte),
-    _trace(trace)
-{
-    __setNoDelete(true);
-    start();
-    __setNoDelete(false);
-}
-
-void
-Freeze::CheckpointThread::terminate()
-{
-    {
-        Lock sync(*this);
-        _done = true;
-        notify();
-    }
-
-    getThreadControl().join();
-}
-
-void
-Freeze::CheckpointThread::run()
-{
-    for(;;)
-    {
-        {
-            Lock sync(*this);
-            while(!_done && timedWait(_checkpointPeriod))
-            {
-                //
-                // Loop
-                //
-            }
-            if(_done)
-            {
-                return;
-            }
-        }
-
-        try
-        {
-            if(_trace >= 2)
-            {
-                Trace out(_dbEnv.getCommunicator()->getLogger(), "Freeze.DbEnv");
-                out << "checkpointing environment \"" << _dbEnv.getEnvName() << "\"";
-            }
-            _dbEnv.getEnv()->txn_checkpoint(_kbyte, 0, 0);
-        }
-        catch(const DbException& dx)
-        {
-            Warning out(_dbEnv.getCommunicator()->getLogger());
-            out << "checkpoint on DbEnv \"" << _dbEnv.getEnvName() << "\" raised DbException: " << dx.what();
-        }
-    }
-}
diff --git a/cpp/src/Freeze/SharedDbEnv.h b/cpp/src/Freeze/SharedDbEnv.h
deleted file mode 100644
index 50ad1adccbd..00000000000
--- a/cpp/src/Freeze/SharedDbEnv.h
+++ /dev/null
@@ -1,130 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_SHARED_DB_ENV_H
-#define FREEZE_SHARED_DB_ENV_H
-
-#include <Freeze/Map.h>
-#include <IceUtil/FileUtil.h>
-#include <Ice/Ice.h>
-#include <db_cxx.h>
-#include <map>
-#include <list>
-
-namespace Freeze
-{
-
-class CheckpointThread;
-typedef IceUtil::Handle<CheckpointThread> CheckpointThreadPtr;
-
-class SharedDbEnv;
-typedef IceUtil::Handle<SharedDbEnv> SharedDbEnvPtr;
-
-class MapDb;
-
-class Transaction;
-typedef IceInternal::Handle<Transaction> TransactionPtr;
-
-class ConnectionI;
-typedef IceUtil::Handle<ConnectionI> ConnectionIPtr;
-
-class TransactionalEvictorContext;
-typedef IceUtil::Handle<TransactionalEvictorContext> TransactionalEvictorContextPtr;
-
-class SharedDbEnv
-{
-public:
-    
-    static SharedDbEnvPtr get(const Ice::CommunicatorPtr&, const std::string&, DbEnv* = 0);
-
-    ~SharedDbEnv();
-
-    //
-    // Returns a shared map Db; the caller should NOT close/delete this Db.
-    //
-    MapDb* getSharedMapDb(const std::string&,const std::string&, const std::string&,
-                          const KeyCompareBasePtr&, const std::vector<MapIndexBasePtr>&, bool);
-
-    //
-    // Tell SharedDbEnv to close and remove this Shared Db from the map
-    //
-    void removeSharedMapDb(const std::string&);
-
-    
-    void __incRef();
-    void __decRef();
-   
-    //
-    // EvictorContext factory/manager
-    //
-    TransactionalEvictorContextPtr createCurrent();
-    TransactionalEvictorContextPtr getCurrent();
-    void setCurrentTransaction(const TransactionPtr& tx);
-
-    DbEnv* getEnv() const;
-    const std::string& getEnvName() const;
-    const Ice::CommunicatorPtr& getCommunicator() const;
-    const Ice::EncodingVersion& getEncoding() const;
-
-    typedef std::map<std::string, MapDb*> SharedDbMap;
-
-private:
-    SharedDbEnv(const std::string&, const Ice::CommunicatorPtr&, DbEnv* env);
-    
-    void cleanup();
-
-    DbEnv* _env;
-    IceUtil::UniquePtr<DbEnv> _envHolder;
-    const std::string _envName;
-    const Ice::CommunicatorPtr _communicator;
-    Ice::EncodingVersion _encoding;
-    MapDb* _catalog;
-    MapDb* _catalogIndexList;
-
-    int _refCount;
-    int _trace;
-    CheckpointThreadPtr _thread;
-
-#ifdef _WIN32
-    DWORD _tsdKey;
-#else
-    pthread_key_t _tsdKey;
-#endif
-
-    SharedDbMap _sharedDbMap;
-    IceUtil::Mutex _mutex;
-    IceUtilInternal::FileLockPtr _fileLock;
-};
-
-inline DbEnv*
-SharedDbEnv::getEnv() const
-{
-    return _env;  
-}
-
-inline const std::string& 
-SharedDbEnv::getEnvName() const
-{
-    return _envName;
-}
-
-inline const Ice::CommunicatorPtr& 
-SharedDbEnv::getCommunicator() const
-{
-    return _communicator;
-}
-
-inline const Ice::EncodingVersion& 
-SharedDbEnv::getEncoding() const
-{
-    return _encoding;
-}
-
-}
-#endif
diff --git a/cpp/src/Freeze/TransactionHolder.cpp b/cpp/src/Freeze/TransactionHolder.cpp
deleted file mode 100644
index f19a40c6a72..00000000000
--- a/cpp/src/Freeze/TransactionHolder.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/TransactionHolder.h>
-
-using namespace Freeze;
-
-Freeze::TransactionHolder::TransactionHolder(const ConnectionPtr& connection) 
-    : _transaction(0)
-{
-    if(connection->currentTransaction() == 0)
-    {
-        _transaction = connection->beginTransaction();
-    }
-}
-
-Freeze::TransactionHolder::~TransactionHolder()
-{
-    try
-    {
-        rollback();
-    }
-    catch(...)
-    {
-        //
-        // Ignored to avoid crash during stack unwinding
-        //
-    }
-}
-
-void
-Freeze::TransactionHolder::commit()
-{
-    if(_transaction != 0)
-    {
-        try
-        {
-            _transaction->commit();
-            _transaction = 0;
-        }
-        catch(...)
-        {
-            _transaction = 0;
-            throw;
-        }
-    }
-}
-
-void
-Freeze::TransactionHolder::rollback()
-{
-    if(_transaction != 0)
-    {
-        try
-        {
-            _transaction->rollback();
-            _transaction = 0;
-        }
-        catch(...)
-        {
-            _transaction = 0;
-            throw;
-        }
-    }
-}
diff --git a/cpp/src/Freeze/TransactionI.cpp b/cpp/src/Freeze/TransactionI.cpp
deleted file mode 100644
index 93d6da4bf86..00000000000
--- a/cpp/src/Freeze/TransactionI.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/TransactionI.h>
-#include <Freeze/ConnectionI.h>
-#include <Freeze/Exception.h>
-#include <Freeze/Initialize.h>
-#include <Ice/LoggerUtil.h>
-
-using namespace std;
-using namespace Ice;
-
-DbTxn*
-Freeze::getTxn(const Freeze::TransactionPtr& tx)
-{
-    return dynamic_cast<Freeze::TransactionI*>(tx.get())->dbTxn();
-}
-
-void
-Freeze::TransactionI::commit()
-{
-    if(_txn == 0)
-    {
-        throw DatabaseException(__FILE__, __LINE__, "inactive transaction");
-    }
-    
-    long txnId = 0;
-  
-    try
-    {
-        _connection->closeAllIterators();
-
-        if(_txTrace >= 1)
-        {
-            txnId = (_txn->id() & 0x7FFFFFFF) + 0x80000000L;
-        }
-
-        _txn->commit(0);
-
-        if(_txTrace >= 1)
-        {
-            Trace out(_communicator->getLogger(), "Freeze.Transaction");
-            out << "committed transaction " << hex << txnId << dec;
-        }
-    }
-    catch(const ::DbDeadlockException& dx)
-    {
-        if(_txTrace >= 1)
-        {
-            Trace out(_communicator->getLogger(), "Freeze.Transaction");
-            out << "failed to commit transaction " << hex << txnId << dec << ": " << dx.what();
-        }
-
-        postCompletion(false, true);
-        // After postCompletion is called the transaction may be
-        // dead. Beware!
-        DeadlockException ex(__FILE__, __LINE__);
-        ex.message = dx.what();
-        throw ex;
-    }
-    catch(const ::DbException& dx)
-    {
-        if(_txTrace >= 1)
-        {
-            Trace out(_communicator->getLogger(), "Freeze.Transaction");
-            out << "failed to commit transaction " << hex << txnId << dec << ": " << dx.what();
-        }
-
-        postCompletion(false, false);
-        // After postCompletion is called the transaction may be
-        // dead. Beware!
-        DatabaseException ex(__FILE__, __LINE__);
-        ex.message = dx.what();
-        throw ex;
-    }
-    postCompletion(true, false);
-    // After postCompletion is called the transaction may be
-    // dead. Beware!
-}
-
-void
-Freeze::TransactionI::rollback()
-{
-    rollbackInternal(false);
-}
-
-Freeze::ConnectionPtr
-Freeze::TransactionI::getConnection() const
-{
-    if(_txn)
-    {
-        return _connection;
-    }
-    return 0;
-}
-
-void
-Freeze::TransactionI::rollbackInternal(bool warning)
-{
-    if(_txn != 0)
-    {
-        long txnId = 0;
-        try
-        {
-            _connection->closeAllIterators();
-            
-            if(_txTrace >= 1 || (warning && _warnRollback))
-            {
-                txnId = (_txn->id() & 0x7FFFFFFF) + 0x80000000L;
-                if(warning && _warnRollback)
-                {
-                    Warning warn(_communicator->getLogger());
-                    warn << "Freeze.Transaction: rolled back transaction " << hex << txnId << dec
-                         << " due to destruction.\nApplication code should explicitly call rollback or commit.";
-                }
-            }
-            
-            _txn->abort();
-            
-            if(_txTrace >= 1)
-            {
-                Trace out(_communicator->getLogger(), "Freeze.Transaction");
-                out << "rolled back transaction " << hex << txnId << dec;
-            }
-        }
-        catch(const ::DbDeadlockException& dx)
-        {
-            if(_txTrace >= 1)
-            {
-                Trace out(_communicator->getLogger(), "Freeze.Transaction");
-                out << "failed to rollback transaction " << hex << txnId << dec << ": " << dx.what();
-            }
-            
-            DeadlockException deadlockException(__FILE__, __LINE__, dx.what(), this);
-
-            postCompletion(false, true);
-            // After postCompletion is called the transaction may be
-            // dead. Beware!
-            throw deadlockException;
-        }
-        catch(const ::DbException& dx)
-        {
-            if(_txTrace >= 1)
-            {
-                Trace out(_communicator->getLogger(), "Freeze.Transaction");
-                out << "failed to rollback transaction " << hex << txnId << dec << ": " << dx.what();
-            }
-            
-            postCompletion(false, false);
-            // After postCompletion is called the transaction may be
-            // dead. Beware!
-            throw DatabaseException(__FILE__, __LINE__, dx.what());
-        }
-        postCompletion(true, false);
-        // After postCompletion is called the transaction may be
-        // dead. Beware!
-    }
-}
-
-void
-Freeze::TransactionI::__incRef()
-{
-    IceUtil::Mutex::Lock sync(_refCountMutex->mutex);
-    _refCount++;
-}
-
-
-void
-Freeze::TransactionI::__decRef()
-{
-    IceUtil::Mutex::Lock sync(_refCountMutex->mutex);
-    if(--_refCount == 0)
-    {
-        sync.release();
-        delete this;
-    }
-    else if(_txn != 0 && _refCount == 1 && _connection->__getRefNoSync() == 1)
-    {
-        sync.release();
-        rollbackInternal(true);
-    }
-}
-
-int
-Freeze::TransactionI::__getRef() const
-{
-    IceUtil::Mutex::Lock sync(_refCountMutex->mutex);
-    return _refCount;
-}
-
-int
-Freeze::TransactionI::__getRefNoSync() const
-{
-    return _refCount;
-}
-
-void
-Freeze::TransactionI::setPostCompletionCallback(const Freeze::PostCompletionCallbackPtr& cb)
-{
-    _postCompletionCallback = cb;
-}
-    
-//
-// The constructor takes a ConnectionI* instead of a ConnectionIPtr
-// because we have to ensure there is no call to __decRef while the
-// transaction or the connection are not assigned to a Ptr in
-// user-code.
-//
-Freeze::TransactionI::TransactionI(ConnectionI* connection) :
-    _communicator(connection->communicator()),
-    _connection(connection),
-    _txTrace(connection->txTrace()),
-    _warnRollback(_communicator->getProperties()->getPropertyAsIntWithDefault("Freeze.Warn.Rollback", 1)),
-    _txn(0),
-    _refCountMutex(connection->_refCountMutex),
-    _refCount(0)
-{
-    try
-    {
-        _connection->dbEnv()->getEnv()->txn_begin(0, &_txn, 0);
-
-        if(_txTrace >= 1)
-        {
-            long txnId = (_txn->id() & 0x7FFFFFFF) + 0x80000000L;
-            Trace out(_communicator->getLogger(), "Freeze.Transaction");
-            out << "started transaction " << hex << txnId << dec;
-        }
-    }
-    catch(const ::DbException& dx)
-    {
-        if(_txTrace >= 1)
-        {
-            Trace out(_communicator->getLogger(), "Freeze.Transaction");
-            out << "failed to start transaction: " << dx.what();
-        }
-
-        DatabaseException ex(__FILE__, __LINE__);
-        ex.message = dx.what();
-        throw ex;
-    }
-}
-
-    
-Freeze::TransactionI::~TransactionI()
-{
-    assert(_txn == 0);
-}
-
-void
-Freeze::TransactionI::postCompletion(bool committed, bool deadlock)
-{
-    // The order of assignment in this method is very important as
-    // calling both the post completion callback and
-    // Connection::clearTransaction may alter the transaction
-    // reference count which checks _txn.
-
-    {
-        //
-        // We synchronize here as _txn is checked (read) in the refcounting code
-        //
-        IceUtil::Mutex::Lock sync(_refCountMutex->mutex);
-        _txn = 0;
-    }
-
-    if(_postCompletionCallback != 0)
-    {
-        PostCompletionCallbackPtr cb = _postCompletionCallback;
-        _postCompletionCallback = 0;
-        
-        cb->postCompletion(committed, deadlock, _connection->dbEnv());
-    }
-
-    ConnectionIPtr connection = _connection;
-    _connection = 0;
-
-    connection->clearTransaction(); // may release the last _refCount
-}
diff --git a/cpp/src/Freeze/TransactionI.h b/cpp/src/Freeze/TransactionI.h
deleted file mode 100644
index 5e66b5d301c..00000000000
--- a/cpp/src/Freeze/TransactionI.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_TRANSACTIONI_H
-#define FREEZE_TRANSACTIONI_H
-
-#include <Ice/CommunicatorF.h>
-#include <Freeze/Transaction.h>
-#include <db_cxx.h>
-
-namespace Freeze
-{
-
-class ConnectionI;
-typedef IceUtil::Handle<ConnectionI> ConnectionIPtr;
-
-struct SharedMutex;
-typedef IceUtil::Handle<SharedMutex> SharedMutexPtr;
-
-class SharedDbEnv;
-typedef IceUtil::Handle<SharedDbEnv> SharedDbEnvPtr;
-
-class PostCompletionCallback : public virtual IceUtil::Shared
-{
-public:
-
-    virtual void postCompletion(bool, bool, const SharedDbEnvPtr&) = 0;
-};
-typedef IceUtil::Handle<PostCompletionCallback> PostCompletionCallbackPtr;
-
-class TransactionI : public Transaction
-{
-public:
-
-    virtual void commit();
-
-    virtual void rollback();
-
-
-    virtual ConnectionPtr getConnection() const;
-    
-    //
-    // Custom refcounting implementation
-    //
-    virtual void __incRef();
-    virtual void __decRef();
-    virtual int __getRef() const;
-
-    void rollbackInternal(bool);
-    void setPostCompletionCallback(const PostCompletionCallbackPtr&);
-
-    TransactionI(ConnectionI*);
-    ~TransactionI();
-    
-    DbTxn*
-    dbTxn() const
-    {
-        return _txn;
-    }
-
-private:
-
-    friend class ConnectionI;
-    
-    int __getRefNoSync() const;
-  
-    void postCompletion(bool, bool);
-
-    const Ice::CommunicatorPtr _communicator;
-    ConnectionIPtr _connection;
-    const Ice::Int _txTrace;
-    const Ice::Int _warnRollback;
-    DbTxn* _txn;
-    PostCompletionCallbackPtr _postCompletionCallback;
-    SharedMutexPtr _refCountMutex;
-    int _refCount;
-};
-
-typedef IceUtil::Handle<TransactionI> TransactionIPtr;
-
-}
-#endif
diff --git a/cpp/src/Freeze/TransactionalEvictorContext.cpp b/cpp/src/Freeze/TransactionalEvictorContext.cpp
deleted file mode 100644
index 3aab88f1be7..00000000000
--- a/cpp/src/Freeze/TransactionalEvictorContext.cpp
+++ /dev/null
@@ -1,395 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/TransactionalEvictorContext.h>
-#include <Freeze/TransactionalEvictorI.h>
-#include <Freeze/Initialize.h>
-#include <Freeze/Util.h>
-#include <Freeze/ConnectionI.h>
-#include <IceUtil/IceUtil.h>
-#include <typeinfo>
-
-using namespace std;
-using namespace Freeze;
-using namespace Ice;
-
-//
-// TransactionalEvictorDeadlockException
-//
-
-Freeze::TransactionalEvictorDeadlockException::TransactionalEvictorDeadlockException(const char* file, int line, const TransactionPtr& transaction) :
-    Ice::SystemException(file, line),
-    tx(transaction)
-{
-}
-
-Freeze::TransactionalEvictorDeadlockException::~TransactionalEvictorDeadlockException() throw()
-{
-}
-
-string
-Freeze::TransactionalEvictorDeadlockException::ice_name() const
-{
-    return "Freeze::TransactionalEvictorDeadlockException";
-}
-
-Freeze::TransactionalEvictorDeadlockException*
-Freeze::TransactionalEvictorDeadlockException::ice_clone() const
-{
-    return new TransactionalEvictorDeadlockException(*this);
-}
-
-void
-Freeze::TransactionalEvictorDeadlockException::ice_throw() const
-{
-    throw *this;
-}
-
-//
-// TransactionalEvictorContext
-//
-
-Freeze::TransactionalEvictorContext::TransactionalEvictorContext(const SharedDbEnvPtr& dbEnv) :
-    _tx((new ConnectionI(dbEnv))->beginTransactionI()),
-    _deadlockExceptionDetected(false),
-    _userExceptionDetected(false)
-{ 
-    _tx->setPostCompletionCallback(this);
-}
-
-Freeze::TransactionalEvictorContext::TransactionalEvictorContext(const TransactionIPtr& tx) :
-    _tx(tx),
-    _deadlockExceptionDetected(false)
-{ 
-    _tx->setPostCompletionCallback(this);
-}
-
-Freeze::TransactionalEvictorContext::~TransactionalEvictorContext()
-{
-    for_each(_invalidateList.begin(), _invalidateList.end(), ToInvalidate::destroy);
-}
-
-void
-Freeze::TransactionalEvictorContext::commit()
-{
-    if(_tx != 0)
-    {
-        _tx->commit();
-    }
-}
-
-void
-Freeze::TransactionalEvictorContext::rollback()
-{
-    if(_tx != 0)
-    {
-        _tx->rollback();
-    }
-}
-
-void 
-Freeze::TransactionalEvictorContext::postCompletion(bool committed, bool deadlock, const SharedDbEnvPtr& dbEnv)
-{
-    dbEnv->setCurrentTransaction(0);
-
-    try
-    {
-        if(committed)
-        {
-            //
-            // remove updated & removed objects from cache
-            //
-            for_each(_invalidateList.begin(), _invalidateList.end(), ToInvalidate::invalidate);
-            _invalidateList.clear();
-        }
-        finalize(deadlock);
-    }
-    catch(...)
-    {
-        finalize(deadlock);
-        throw;
-    }
-}
-
-Freeze::TransactionalEvictorContext::ServantHolder::Body*
-Freeze::TransactionalEvictorContext::findServantHolderBody(const Identity& ident, ObjectStore<TransactionalEvictorElement>* store) const
-{
-    for(Stack::const_iterator p = _stack.begin(); p != _stack.end(); ++p)
-    {
-        ServantHolder::Body* b = *p;
-        if(b->matches(ident, store))
-        {
-            return b;
-        }
-    }
-    return 0;
-}
-
-void
-Freeze::TransactionalEvictorContext::finalize(bool deadlock)
-{
-    Lock sync(*this);
-    if(_tx != 0)
-    {
-        if(deadlock)
-        {
-            _deadlockExceptionDetected = true;
-        }
-        _tx = 0;
-        notifyAll();
-    }
-}
-
-void
-Freeze::TransactionalEvictorContext::checkDeadlockException()
-{
-    if(_deadlockException.get() != 0)
-    {
-        _deadlockException->ice_throw();
-    }
-
-    if(_nestedCallDeadlockException.get() != 0)
-    {
-        _nestedCallDeadlockException->ice_throw();
-    }
-}
-
-bool
-Freeze::TransactionalEvictorContext::clearUserException()
-{
-    bool result = _userExceptionDetected;
-    _userExceptionDetected = false;
-    return result;
-}
-
-bool 
-Freeze::TransactionalEvictorContext::response(bool ok)
-{
-    if(_owner == IceUtil::ThreadControl())
-    {
-        if(!ok)
-        {
-            _userExceptionDetected = true;
-        }
-        return true;
-    }
-    else
-    {
-        Lock sync(*this);
-        while(_deadlockExceptionDetected == false && _tx != 0)
-        {
-            wait();
-        }
-        return !_deadlockExceptionDetected;
-    }
-}
-
-bool 
-Freeze::TransactionalEvictorContext::exception(const std::exception& ex)
-{
-    const DeadlockException* dx = dynamic_cast<const DeadlockException*>(&ex);
-
-    if(dx != 0 && _owner == IceUtil::ThreadControl())
-    {
-        _deadlockException.reset(dx->ice_clone());
-        return false;
-    }
-
-    const TransactionalEvictorDeadlockException* edx = 
-        dynamic_cast<const TransactionalEvictorDeadlockException*>(&ex);
-    if(edx != 0 && _owner == IceUtil::ThreadControl())
-    {
-        _nestedCallDeadlockException.reset(edx->ice_clone());
-        return false;
-    }
-
-    return true;
-}
-
-bool 
-Freeze::TransactionalEvictorContext::exception()
-{
-    return true;
-}
-
-Ice::ObjectPtr
-Freeze::TransactionalEvictorContext::servantRemoved(const Identity& ident, 
-                                                     ObjectStore<TransactionalEvictorElement>* store)
-{
-    if(_tx != 0)
-    {
-        //
-        // Lookup servant holder on stack
-        //
-        ServantHolder::Body* body = findServantHolderBody(ident, store);
-        if(body != 0)
-        {
-            body->removed = true;
-            return body->rec.servant;
-        }
-        else
-        {
-            _invalidateList.push_back(new ToInvalidate(ident, store));
-            return 0;
-        }
-    }
-    return 0;
-
-}
-
-void 
-Freeze::TransactionalEvictorContext::deadlockException()
-{
-    {
-        Lock sync(*this);
-        _deadlockExceptionDetected = true;
-        notifyAll();
-    }
-    rollback();
-}
-
-
-//
-// ServantHolder
-//
-
-Freeze::TransactionalEvictorContext::ServantHolder::ServantHolder() :
-    _ownBody(true)
-{
-}
-
-
-Freeze::TransactionalEvictorContext::ServantHolder::~ServantHolder() ICE_NOEXCEPT_FALSE
-{
-    if(_ownBody && _body.ownServant)
-    {
-        const TransactionalEvictorContextPtr& ctx = *(_body.ctx);
-
-        if(ctx->_tx != 0)
-        {
-            if(!_body.readOnly && !_body.removed)
-            {
-                if(_body.store->keepStats())
-                {
-                    EvictorIBase::updateStats(_body.rec.stats, 
-                                              IceUtil::Time::now(IceUtil::Time::Monotonic).toMilliSeconds());
-                }
-                _body.store->update(_body.current->id, _body.rec, ctx->_tx);
-            }
-        
-            if(!_body.readOnly || _body.removed)
-            {
-                ctx->_invalidateList.push_back(new ToInvalidate(_body.current->id, _body.store));
-            }
-        }
-        ctx->_stack.pop_front();
-    }
-}
-
-
-void
-Freeze::TransactionalEvictorContext::ServantHolder::init(const TransactionalEvictorContextPtr& ctx, 
-                                                         const Current& current, 
-                                                         ObjectStore<TransactionalEvictorElement>* store)
-{
-    assert(_ownBody && _body.ctx == 0);
-  
-    _body.ctx = &ctx;
-    _body.current = &current;
-    _body.store = store;
-    
-    ServantHolder::Body* body = ctx->findServantHolderBody(current.id, store);
-
-    if(body != 0)
-    {
-        if(!body->removed)
-        {
-            _body.rec = body->rec;
-            _body.readOnly = body->readOnly;
-        }
-    }
-    else
-    {
-        //
-        // Let's load this servant
-        //
-        if(store->load(current.id, ctx->_tx, _body.rec))
-        {
-            ctx->_stack.push_front(&_body);
-            _body.ownServant = true;
-        }
-    }
-}
-
-void
-Freeze::TransactionalEvictorContext::ServantHolder::adopt(ServantHolder& other)
-{
-    assert(_ownBody && _body.ctx == 0);
-
-    _body = other._body;
-    other._ownBody = false;
-}
-
-void
-Freeze::TransactionalEvictorContext::ServantHolder::markReadWrite()
-{
-    assert(_ownBody);
-
-    if(_body.ownServant)
-    {
-        _body.readOnly = false;
-    }
-    else
-    {
-        if(_body.readOnly)
-        {
-            throw DatabaseException(__FILE__, __LINE__, "freeze:write operation called from freeze:read operation");
-        }
-    }
-}
-
-Freeze::TransactionalEvictorContext::ServantHolder::Body::Body() :
-    readOnly(true),
-    removed(false),
-    ownServant(false),
-    ctx(0),
-    current(0),
-    store(0)
-{
-}
-
-//
-// ToInvalidate
-//
-
-//
-// When constructed in the servant holder destructor, it's protected by the dispatch() 
-// deactivate controller guard
-//
-Freeze::TransactionalEvictorContext::ToInvalidate::ToInvalidate(const Identity& ident, 
-                                                                ObjectStore<TransactionalEvictorElement>* store) :
-    _ident(ident),
-    _store(store),
-    _evictor(store->evictor()),
-    _guard(_evictor->deactivateController())
-{
-}
-
-void
-Freeze::TransactionalEvictorContext::ToInvalidate::invalidate(ToInvalidate* obj)
-{
-    dynamic_cast<TransactionalEvictorI*>(obj->_store->evictor())->evict(obj->_ident, obj->_store);
-    delete obj;
-}
-
-void
-Freeze::TransactionalEvictorContext::ToInvalidate::destroy(ToInvalidate* obj)
-{
-    delete obj;
-}
diff --git a/cpp/src/Freeze/TransactionalEvictorContext.h b/cpp/src/Freeze/TransactionalEvictorContext.h
deleted file mode 100644
index cfc0dbdb804..00000000000
--- a/cpp/src/Freeze/TransactionalEvictorContext.h
+++ /dev/null
@@ -1,167 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_TRANSACTIONAL_EVICTOR_CONTEXT_H
-#define FREEZE_TRANSACTIONAL_EVICTOR_CONTEXT_H
-
-#include <Ice/Ice.h>
-#include <Freeze/TransactionalEvictor.h>
-#include <Freeze/EvictorStorage.h>
-#include <Freeze/EvictorI.h>
-#include <Freeze/Initialize.h>
-#include <IceUtil/IceUtil.h>
-
-namespace Freeze
-{
-
-template<class T> class ObjectStore;
-
-class TransactionalEvictorElement;
-
-class TransactionalEvictorContext : public Ice::DispatchInterceptorAsyncCallback, public PostCompletionCallback,
-                                    public IceUtil::Monitor<IceUtil::Mutex>
-{
-public:
-
-    class ServantHolder
-    {
-    public:
-        
-        ServantHolder();
-        ~ServantHolder() ICE_NOEXCEPT_FALSE;
-
-        void init(const TransactionalEvictorContextPtr&, const Ice::Current&, ObjectStore<TransactionalEvictorElement>*);
-
-        void adopt(ServantHolder&);
-
-        void markReadWrite();
-
-        bool initialized() const
-        {
-            return _ownBody && _body.ctx != 0;
-        }
-
-        const Ice::ObjectPtr& servant() const
-        {
-            return _body.rec.servant;
-        }
-
-        struct Body
-        {
-            Body();
-
-            bool matches(const Ice::Identity& ident, ObjectStore<TransactionalEvictorElement>* s) const
-            {
-                return current->id == ident && store == s;
-            }
-
-            bool readOnly;
-            bool removed;
-            bool ownServant;
-
-            const TransactionalEvictorContextPtr* ctx;
-            const Ice::Current* current;
-            ObjectStore<TransactionalEvictorElement>* store;
-            ObjectRecord rec;
-        };
-
-    private:
-
-        Body _body;
-        bool _ownBody;
-    };
-
-
-    class ToInvalidate
-    {
-    public:
-
-        ToInvalidate(const Ice::Identity&, ObjectStore<TransactionalEvictorElement>*);
-        
-        static void invalidate(ToInvalidate*);
-        static void destroy(ToInvalidate*);
-
-    private:
-
-        const Ice::Identity _ident;
-        ObjectStore<TransactionalEvictorElement>* _store;
-        EvictorIBasePtr _evictor; // for _guard
-        DeactivateController::Guard _guard; // ensures store is not dangling
-    };
-
-
-    TransactionalEvictorContext(const SharedDbEnvPtr&);
-    TransactionalEvictorContext(const TransactionIPtr&);
-
-    virtual ~TransactionalEvictorContext();
-
-    virtual void postCompletion(bool, bool, const SharedDbEnvPtr&);
-
-    virtual bool response(bool);
-    virtual bool exception(const std::exception&);
-    virtual bool exception();
-
-    Ice::ObjectPtr servantRemoved(const Ice::Identity&, ObjectStore<TransactionalEvictorElement>*);
-
-    void deadlockException();
-
-    void checkDeadlockException();
-
-    bool clearUserException();
-
-    void commit();
-    void rollback();
-
-    const TransactionIPtr& transaction() const
-    {
-        return _tx;
-    }
-    
-private:
-    
-    friend class ServantHolder;
-
-    ServantHolder::Body* findServantHolderBody(const Ice::Identity&, ObjectStore<TransactionalEvictorElement>*) const;
-
-    void finalize(bool);
-
-    //
-    // Stack of ServantHolder::Body*
-    //
-    typedef std::deque<ServantHolder::Body*> Stack;
-    Stack _stack;
-    
-    //
-    // List of objects to invalidate from the caches upon commit
-    //
-    std::list<ToInvalidate*> _invalidateList;
-
-    TransactionIPtr _tx;
-    IceUtil::ThreadControl _owner;
-
-    IceUtil::UniquePtr<DeadlockException> _deadlockException;
-    IceUtil::UniquePtr<TransactionalEvictorDeadlockException> _nestedCallDeadlockException;
-  
-    //
-    // Protected by this
-    //
-    bool _deadlockExceptionDetected;
-
-    //
-    // Not protected (used only by dispatch thread)
-    //
-    bool _userExceptionDetected;
-};
-
-typedef IceUtil::Handle<TransactionalEvictorContext> TransactionalEvictorContextPtr;
-
-}
-
-
-#endif
diff --git a/cpp/src/Freeze/TransactionalEvictorI.cpp b/cpp/src/Freeze/TransactionalEvictorI.cpp
deleted file mode 100644
index 81cd81d9e79..00000000000
--- a/cpp/src/Freeze/TransactionalEvictorI.cpp
+++ /dev/null
@@ -1,864 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/TransactionalEvictorI.h>
-#include <Freeze/Initialize.h>
-#include <Freeze/Util.h>
-#include <Freeze/TransactionalEvictorContext.h>
-
-#include <IceUtil/IceUtil.h>
-#include <IceUtil/StringUtil.h>
-
-#include <typeinfo>
-
-using namespace std;
-using namespace Freeze;
-using namespace Ice;
-
-namespace
-{
-
-//
-// Must be in sync with Parser.cpp
-//
-
-const int supports = 0;
-const int mandatory = 1;
-const int required = 2;
-const int never = 3;
-}
-
-
-//
-// createEvictor functions
-//
-
-Freeze::TransactionalEvictorPtr
-Freeze::createTransactionalEvictor(const ObjectAdapterPtr& adapter,
-                                   const string& envName,
-                                   const string& filename,
-                                   const FacetTypeMap& facetTypes,
-                                   const ServantInitializerPtr& initializer,
-                                   const vector<IndexPtr>& indices,
-                                   bool createDb)
-{
-    return new TransactionalEvictorI(adapter, envName, 0, filename, facetTypes, initializer, indices, createDb);
-}
-
-TransactionalEvictorPtr
-Freeze::createTransactionalEvictor(const ObjectAdapterPtr& adapter,
-                                   const string& envName,
-                                   DbEnv& dbEnv,
-                                   const string& filename,
-                                   const FacetTypeMap& facetTypes,
-                                   const ServantInitializerPtr& initializer,
-                                   const vector<IndexPtr>& indices,
-                                   bool createDb)
-{
-    return new TransactionalEvictorI(adapter, envName, &dbEnv, filename, facetTypes, initializer, indices, createDb);
-}
-
-
-//
-// TransactionalEvictorI
-//
-
-Freeze::TransactionalEvictorI::TransactionalEvictorI(const ObjectAdapterPtr& adapter,
-                                                     const string& envName,
-                                                     DbEnv* dbEnv,
-                                                     const string& filename,
-                                                     const FacetTypeMap& facetTypes,
-                                                     const ServantInitializerPtr& initializer,
-                                                     const vector<IndexPtr>& indices,
-                                                     bool createDb) :
-    EvictorI<TransactionalEvictorElement>(adapter, envName, dbEnv, filename, facetTypes, initializer, indices, createDb),
-    _currentEvictorSize(0)
-{
-
-    class DispatchInterceptorAdapter : public Ice::DispatchInterceptor
-    {
-    public:
-
-        DispatchInterceptorAdapter(const TransactionalEvictorIPtr& evictor) :
-            _evictor(evictor)
-        {
-        }
-
-        virtual DispatchStatus dispatch(Request& request)
-        {
-            return _evictor->dispatch(request);
-        }
-
-    private:
-
-        TransactionalEvictorIPtr _evictor;
-    };
-
-    _interceptor = new DispatchInterceptorAdapter(this);
-
-    string propertyPrefix = string("Freeze.Evictor.") + envName + '.' + _filename;
-
-    _rollbackOnUserException = _communicator->getProperties()->
-        getPropertyAsIntWithDefault(propertyPrefix + ".RollbackOnUserException", 0) > 0;
-}
-
-
-TransactionPtr
-Freeze::TransactionalEvictorI::getCurrentTransaction() const
-{
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-
-    TransactionalEvictorContextPtr ctx = _dbEnv->getCurrent();
-    if(ctx == 0)
-    {
-        return 0;
-    }
-    else
-    {
-        return ctx->transaction();
-    }
-}
-
-void
-Freeze::TransactionalEvictorI::setCurrentTransaction(const TransactionPtr& tx)
-{
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-    _dbEnv->setCurrentTransaction(tx);
-}
-
-
-ObjectPrx
-Freeze::TransactionalEvictorI::addFacet(const ObjectPtr& servant, const Identity& ident, const string& facet)
-{
-    checkIdentity(ident);
-    checkServant(servant);
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-
-    ObjectStore<TransactionalEvictorElement>* store = findStore(facet, _createDb);
-    if(store == 0)
-    {
-        throw NotFoundException(__FILE__, __LINE__, "addFacet: could not open database for facet '"
-                                + facet + "'");
-    }
-
-    Ice::Long currentTime = 0;
-
-    if(store->keepStats())
-    {
-        currentTime = IceUtil::Time::now(IceUtil::Time::Monotonic).toMilliSeconds();
-    }
-
-    Statistics stats = { currentTime };
-    ObjectRecord rec = { servant, stats };
-
-    TransactionIPtr tx = beforeQuery();
-
-    if(store->keepStats())
-    {
-        updateStats(rec.stats, currentTime);
-    }
-
-    if(!store->insert(ident, rec, tx))
-    {
-        AlreadyRegisteredException ex(__FILE__, __LINE__);
-        ex.kindOfObject = "servant";
-        ex.id = _communicator->identityToString(ident);
-        if(!facet.empty())
-        {
-            ex.id += " -f " + IceUtilInternal::escapeString(facet, "");
-        }
-        throw ex;
-    }
-
-    ObjectPrx obj = _adapter->createProxy(ident);
-    if(!facet.empty())
-    {
-        obj = obj->ice_facet(facet);
-    }
-    return obj;
-}
-
-ObjectPtr
-Freeze::TransactionalEvictorI::removeFacet(const Identity& ident, const string& facet)
-{
-    checkIdentity(ident);
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-
-    ObjectPtr servant = 0;
-    bool removed = false;
-    ObjectStore<TransactionalEvictorElement>* store = findStore(facet, false);
-
-    if(store != 0)
-    {
-        TransactionalEvictorContextPtr ctx = _dbEnv->getCurrent();
-        TransactionIPtr tx = 0;
-        if(ctx != 0)
-        {
-            tx = ctx->transaction();
-            if(tx == 0)
-            {
-                throw DatabaseException(__FILE__, __LINE__, "inactive transaction");
-            }
-        }
-
-        removed = store->remove(ident, tx);
-
-        if(removed)
-        {
-            if(ctx != 0)
-            {
-                //
-                // Remove from cache when transaction commits
-                //
-                servant = ctx->servantRemoved(ident, store);
-            }
-            else
-            {
-                //
-                // Remove from cache immediately
-                //
-                servant = evict(ident, store);
-            }
-        }
-    }
-
-    if(!removed)
-    {
-        NotRegisteredException ex(__FILE__, __LINE__);
-        ex.kindOfObject = "servant";
-        ex.id = _communicator->identityToString(ident);
-        if(!facet.empty())
-        {
-            ex.id += " -f " + IceUtilInternal::escapeString(facet, "");
-        }
-        throw ex;
-    }
-
-    if(_trace >= 1)
-    {
-        Trace out(_communicator->getLogger(), "Freeze.Evictor");
-        out << "removed object \"" << _communicator->identityToString(ident) << "\"";
-        if(!facet.empty())
-        {
-            out << " with facet \"" << facet << "\"";
-        }
-        out << " from Db \"" << _filename << "\"";
-    }
-    return servant;
-}
-
-bool
-Freeze::TransactionalEvictorI::hasFacet(const Identity& ident, const string& facet)
-{
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-    checkIdentity(ident);
-    ObjectStore<TransactionalEvictorElement>* store = findStore(facet, false);
-
-    if(store == 0)
-    {
-        return false;
-    }
-
-    TransactionIPtr tx = beforeQuery();
-
-    if(tx == 0)
-    {
-        TransactionalEvictorElementPtr element = store->getIfPinned(ident);
-        if(element != 0)
-        {
-            return true;
-        }
-        return store->dbHasObject(ident, 0);
-    }
-    else
-    {
-        return store->dbHasObject(ident, tx);
-    }
-}
-
-bool
-Freeze::TransactionalEvictorI::hasAnotherFacet(const Identity& ident, const string& facet)
-{
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-
-    //
-    // If the object exists in another store, throw FacetNotExistException
-    // instead of returning 0 (== ObjectNotExistException)
-    //
-    StoreMap storeMapCopy;
-    {
-        Lock sync(*this);
-        storeMapCopy = _storeMap;
-    }
-
-    TransactionIPtr tx = beforeQuery();
-
-    for(StoreMap::iterator p = storeMapCopy.begin(); p != storeMapCopy.end(); ++p)
-    {
-        //
-        // Do not check again the given facet
-        //
-        if((*p).first != facet)
-        {
-            ObjectStore<TransactionalEvictorElement>* store = (*p).second;
-
-            if(tx == 0 && store->getIfPinned(ident) != 0)
-            {
-                return true;
-            }
-
-            if(store->dbHasObject(ident, tx))
-            {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-
-ObjectPtr
-Freeze::TransactionalEvictorI::locateImpl(const Current&, LocalObjectPtr&)
-{
-    return _interceptor;
-}
-
-void
-Freeze::TransactionalEvictorI::finished(const Current&, const ObjectPtr&, const LocalObjectPtr&)
-{
-    //
-    // Nothing to do
-    //
-}
-
-DispatchStatus
-Freeze::TransactionalEvictorI::dispatch(Request& request)
-{
-    class CtxHolder
-    {
-    public:
-
-#ifndef NDEBUG
-        CtxHolder(bool ownCtx, const TransactionalEvictorContextPtr& ctx, const SharedDbEnvPtr& dbEnv) :
-            _ownCtx(ownCtx),
-            _ctx(ctx),
-            _dbEnv(dbEnv)
-#else
-        CtxHolder(bool ownCtx, const TransactionalEvictorContextPtr& ctx) :
-            _ownCtx(ownCtx),
-            _ctx(ctx)
-#endif
-        {
-        }
-
-        ~CtxHolder() ICE_NOEXCEPT_FALSE
-        {
-            if(_ownCtx)
-            {
-                try
-                {
-                    _ctx->commit();
-                }
-                catch(...)
-                {
-                    assert(_dbEnv->getCurrent() == 0);
-                    throw;
-                }
-                assert(_dbEnv->getCurrent() == 0);
-            }
-        }
-
-    private:
-        const bool _ownCtx;
-        const TransactionalEvictorContextPtr _ctx;
-#ifndef NDEBUG
-        const SharedDbEnvPtr& _dbEnv;
-#endif
-    };
-
-
-    DeactivateController::Guard deactivateGuard(_deactivateController);
-
-    const Current& current = request.getCurrent();
-
-    ObjectStore<TransactionalEvictorElement>* store = findStore(current.facet, false);
-    if(store == 0)
-    {
-        servantNotFound(__FILE__, __LINE__, current);
-    }
-
-    TransactionalEvictorContextPtr ctx = _dbEnv->getCurrent();
-
-    ObjectPtr sample = store->sampleServant();
-    ObjectPtr cachedServant = 0;
-
-    TransactionalEvictorContext::ServantHolder servantHolder;
-
-    if(sample == 0)
-    {
-        if(ctx != 0)
-        {
-            try
-            {
-                servantHolder.init(ctx, current, store);
-            }
-            catch(const DeadlockException& dx)
-            {
-                assert(dx.tx == ctx->transaction());
-                ctx->deadlockException();
-                throw TransactionalEvictorDeadlockException(__FILE__, __LINE__, dx.tx);
-            }
-            sample = servantHolder.servant();
-        }
-        else
-        {
-            //
-            // find / load read-only servant
-            //
-
-            cachedServant = loadCachedServant(current.id, store);
-
-            if(cachedServant == 0)
-            {
-                servantNotFound(__FILE__, __LINE__, current);
-            }
-            sample = cachedServant;
-        }
-    }
-
-    assert(sample != 0);
-
-    int operationAttributes = sample->ice_operationAttributes(current.operation);
-
-    if(operationAttributes < 0)
-    {
-        throw OperationNotExistException(__FILE__, __LINE__);
-    }
-
-    bool readOnly = (operationAttributes & 0x1) == 0;
-
-    int txMode = (operationAttributes & 0x6) >> 1;
-
-    bool ownCtx = false;
-
-    //
-    // Establish the proper context
-    //
-    switch(txMode)
-    {
-        case never:
-        {
-            assert(readOnly);
-            if(ctx != 0)
-            {
-                throw DatabaseException(__FILE__, __LINE__, "transaction rejected by 'never' metadata");
-            }
-            break;
-        }
-        case supports:
-        {
-            assert(readOnly);
-            break;
-        }
-        case mandatory:
-        {
-            if(ctx == 0)
-            {
-                throw DatabaseException(__FILE__, __LINE__, "operation with a mandatory transaction");
-            }
-            break;
-        }
-        case required:
-        {
-            if(ctx == 0)
-            {
-                ownCtx = true;
-            }
-            break;
-        }
-        default:
-        {
-            assert(0);
-            throw OperationNotExistException(__FILE__, __LINE__);
-        }
-    }
-
-    if(ctx == 0 && !ownCtx)
-    {
-        //
-        // Read-only dispatch
-        //
-        assert(readOnly);
-        if(cachedServant == 0)
-        {
-            cachedServant = loadCachedServant(current.id, store);
-
-            if(cachedServant == 0)
-            {
-                servantNotFound(__FILE__, __LINE__, current);
-            }
-        }
-        return cachedServant->ice_dispatch(request);
-    }
-    else
-    {
-        //
-        // Create a new transaction; retry on DeadlockException
-        //
-
-        bool tryAgain = false;
-
-        do
-        {
-            TransactionPtr tx;
-
-            try
-            {
-                if(ownCtx)
-                {
-                    ctx = _dbEnv->createCurrent();
-                }
-
-#ifndef NDEBUG
-                CtxHolder ctxHolder(ownCtx, ctx, _dbEnv);
-#else
-                CtxHolder ctxHolder(ownCtx, ctx);
-#endif
-                tx = ctx->transaction();
-
-                try
-                {
-                    TransactionalEvictorContext::ServantHolder sh;
-                    if(servantHolder.initialized())
-                    {
-                        //
-                        // Adopt it
-                        //
-                        sh.adopt(servantHolder);
-                    }
-                    else
-                    {
-                        sh.init(ctx, current, store);
-                    }
-
-                    if(sh.servant() == 0)
-                    {
-                        servantNotFound(__FILE__, __LINE__, current);
-                    }
-
-                    if(!readOnly)
-                    {
-                        sh.markReadWrite();
-                    }
-
-                    try
-                    {
-                        DispatchStatus dispatchStatus = sh.servant()->ice_dispatch(request, ctx);
-                        if(dispatchStatus == DispatchUserException && _rollbackOnUserException)
-                        {
-                            ctx->rollback();
-                        }
-                        if(dispatchStatus == DispatchAsync)
-                        {
-                            //
-                            // May throw DeadlockException or TransactionalEvictorDeadlockException
-                            //
-                            ctx->checkDeadlockException();
-
-                            if(ctx->clearUserException() && _rollbackOnUserException)
-                            {
-                                ctx->rollback();
-                            }
-                        }
-
-                        return dispatchStatus;
-                    }
-                    catch(...)
-                    {
-                        //
-                        // Important: this rollback() ensures that servant holder destructor won't perform
-                        // any database operation, and hence will not throw.
-                        //
-                        ctx->rollback();
-                        throw;
-                    }
-                    //
-                    // servant holder destructor runs here and may throw (if !rolled back)
-                    //
-                }
-                catch(const DeadlockException& dx)
-                {
-                    if(dx.tx == tx)
-                    {
-                        ctx->deadlockException();
-                    }
-                    throw;
-                }
-                catch(...)
-                {
-                    if(ownCtx)
-                    {
-                        ctx->rollback();
-                    }
-                    throw;
-                }
-
-                //
-                // commit occurs here (when ownCtx)
-                //
-            }
-            catch(const DeadlockException& dx)
-            {
-                if(ownCtx && dx.tx == tx)
-                {
-                    tryAgain = true;
-                }
-                else
-                {
-                    throw TransactionalEvictorDeadlockException(__FILE__, __LINE__, dx.tx);
-                }
-            }
-            catch(const TransactionalEvictorDeadlockException& dx)
-            {
-                if(ownCtx && dx.tx == tx)
-                {
-                    tryAgain = true;
-                }
-                else
-                {
-                    throw;
-                }
-            }
-        } while(tryAgain);
-    }
-
-    //
-    // Can't be reached
-    //
-    assert(0);
-    throw OperationNotExistException(__FILE__, __LINE__);
-}
-
-
-void
-Freeze::TransactionalEvictorI::deactivate(const string&)
-{
-    if(_deactivateController.deactivate())
-    {
-        {
-            Lock sync(*this);
-
-            //
-            // Set the evictor size to zero, meaning that we will evict
-            // everything possible.
-            //
-            _evictorSize = 0;
-            evict();
-        }
-
-        //
-        // Break cycle
-        //
-        _interceptor = 0;
-
-        try
-        {
-            closeDbEnv();
-        }
-        catch(...)
-        {
-            _deactivateController.deactivationComplete();
-            throw;
-        }
-        _deactivateController.deactivationComplete();
-    }
-}
-
-Freeze::TransactionalEvictorI::~TransactionalEvictorI()
-{
-    //
-    // Because of the cycle with _interceptor, this can only run if deactivated()
-    //
-}
-
-Freeze::TransactionIPtr
-Freeze::TransactionalEvictorI::beforeQuery()
-{
-    TransactionalEvictorContextPtr ctx = _dbEnv->getCurrent();
-    TransactionIPtr tx = 0;
-    if(ctx != 0)
-    {
-        tx = ctx->transaction();
-        if(tx == 0)
-        {
-            throw DatabaseException(__FILE__, __LINE__,"inactive transaction");
-        }
-    }
-
-    return tx;
-}
-
-void
-Freeze::TransactionalEvictorI::evict()
-{
-    //
-    // Must be called with this locked
-    //
-
-    while(_currentEvictorSize > _evictorSize)
-    {
-        //
-        // Evict, no matter what!
-        //
-        evict(*_evictorList.rbegin());
-    }
-}
-
-
-ObjectPtr
-Freeze::TransactionalEvictorI::loadCachedServant(const Identity& ident, ObjectStore<TransactionalEvictorElement>* store)
-{
-    for(;;)
-    {
-        TransactionalEvictorElementPtr element = store->pin(ident);
-
-        if(element == 0)
-        {
-            return 0;
-        }
-
-        Lock sync(*this);
-        if(element->stale())
-        {
-            //
-            // try again
-            //
-            continue;
-        }
-
-        fixEvictPosition(element);
-
-        //
-        // if _evictorSize is 0, I may evict myself ... no big deal
-        //
-        evict();
-        return element->servant();
-    }
-}
-
-ObjectPtr
-Freeze::TransactionalEvictorI::evict(const Identity& ident, ObjectStore<TransactionalEvictorElement>* store)
-{
-    //
-    // Important: we can't wait for the DB (even indirectly) with 'this' locked
-    //
-    TransactionalEvictorElementPtr element = store->getIfPinned(ident, true);
-
-    if(element != 0)
-    {
-        Lock sync(*this);
-        if(!element->_stale)
-        {
-            evict(element);
-            return element->servant();
-        }
-    }
-    return 0;
-}
-
-void
-Freeze::TransactionalEvictorI::evict(const TransactionalEvictorElementPtr& element)
-{
-    //
-    // Must be called with this locked!
-    //
-    assert(!element->_stale);
-    element->_stale = true;
-    element->_store.unpin(element->_cachePosition);
-
-    if(element->_inEvictor)
-    {
-        element->_inEvictor = false;
-        _evictorList.erase(element->_evictPosition);
-        _currentEvictorSize--;
-    }
-}
-
-void
-Freeze::TransactionalEvictorI::fixEvictPosition(const TransactionalEvictorElementPtr& element)
-{
-    //
-    // Must be called with this locked!
-    //
-
-    assert(!element->_stale);
-
-    if(element->_inEvictor)
-    {
-        _evictorList.erase(element->_evictPosition);
-    }
-    else
-    {
-        //
-        // New object
-        //
-        _currentEvictorSize++;
-        element->_inEvictor = true;
-    }
-    _evictorList.push_front(element);
-    element->_evictPosition = _evictorList.begin();
-}
-
-
-void
-Freeze::TransactionalEvictorI::servantNotFound(const char* file, int line, const Current& current)
-{
-    if(_trace >= 2)
-    {
-        Trace out(_communicator->getLogger(), "Freeze.Evictor");
-        out << "could not find \"" << _communicator->identityToString(current.id)
-            << "\" with facet \"" <<  current.facet + "\"";
-    }
-
-    if(hasAnotherFacet(current.id, current.facet))
-    {
-        throw FacetNotExistException(file, line, current.id, current.facet, current.operation);
-    }
-    else
-    {
-        throw ObjectNotExistException(file, line, current.id, current.facet, current.operation);
-    }
-}
-
-
-
-Freeze::TransactionalEvictorElement::TransactionalEvictorElement(ObjectRecord& r,
-                                                                 ObjectStore<TransactionalEvictorElement>& s) :
-    _servant(r.servant),
-    _store(s),
-    _stale(true),
-    _inEvictor(false)
-{
-}
-
-
-Freeze::TransactionalEvictorElement::~TransactionalEvictorElement()
-{
-}
-
-void
-Freeze::TransactionalEvictorElement::init(ObjectStore<TransactionalEvictorElement>::Position p)
-{
-    _stale = false;
-    _cachePosition = p;
-}
-
-
-
diff --git a/cpp/src/Freeze/TransactionalEvictorI.h b/cpp/src/Freeze/TransactionalEvictorI.h
deleted file mode 100644
index d28b5cf1d11..00000000000
--- a/cpp/src/Freeze/TransactionalEvictorI.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_TRANSACTIONAL_EVICTOR_I_H
-#define FREEZE_TRANSACTIONAL_EVICTOR_I_H
-
-#include <Freeze/EvictorI.h>
-#include <Freeze/TransactionalEvictor.h>
-#include <Ice/DispatchInterceptor.h>
-
-namespace Freeze
-{
-
-class TransactionalEvictorI;
-
-class TransactionalEvictorElement;
-typedef IceUtil::Handle<TransactionalEvictorElement> TransactionalEvictorElementPtr;
-
-class TransactionalEvictorElement : public Ice::LocalObject
-{
-public:
-
-    TransactionalEvictorElement(ObjectRecord&, ObjectStore<TransactionalEvictorElement>&);
-    ~TransactionalEvictorElement();
-
-    void init(ObjectStore<TransactionalEvictorElement>::Position);
-
-    const Ice::ObjectPtr& servant() const
-    {
-        return _servant;
-    }
-
-    bool stale() const
-    {
-        return _stale;
-    }
-
-private:   
-    
-    friend class TransactionalEvictorI;
-
-    const Ice::ObjectPtr _servant;
-
-    //
-    // Immutable
-    //
-    ObjectStore<TransactionalEvictorElement>& _store;
-
-    //
-    // Immutable once set
-    //
-    ObjectStore<TransactionalEvictorElement>::Position _cachePosition;
-
-    //
-    // Protected by TransactionalEvictorI
-    //
-    std::list<TransactionalEvictorElementPtr>::iterator _evictPosition;
-    bool _stale;
-    bool _inEvictor;
-};
-
-
-class TransactionalEvictorI : public TransactionalEvictor, public EvictorI<TransactionalEvictorElement>
-{
-public:
-
-    TransactionalEvictorI(const Ice::ObjectAdapterPtr&, const std::string&, DbEnv*, const std::string&, 
-                          const FacetTypeMap&, const ServantInitializerPtr&, const std::vector<IndexPtr>&, bool);
- 
-    virtual ~TransactionalEvictorI();
-
-    virtual TransactionPtr getCurrentTransaction() const;
-    virtual void setCurrentTransaction(const TransactionPtr&);
-
-    virtual Ice::ObjectPrx addFacet(const Ice::ObjectPtr&, const Ice::Identity&, const std::string&);
-    virtual Ice::ObjectPtr removeFacet(const Ice::Identity&, const std::string&);
-
-    virtual bool hasFacet(const Ice::Identity&, const std::string&);
-
-    virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&);
-    virtual void deactivate(const std::string&);  
-
-    virtual TransactionIPtr beforeQuery();
-
-    Ice::DispatchStatus dispatch(Ice::Request&);
-
-    Ice::ObjectPtr evict(const Ice::Identity&, ObjectStore<TransactionalEvictorElement>*);
-
-protected:
-   
-    virtual bool hasAnotherFacet(const Ice::Identity&, const std::string&);
-    
-    virtual Ice::ObjectPtr locateImpl(const Ice::Current&, Ice::LocalObjectPtr&);
-   
-    virtual void evict();
-
-private:
-
-    Ice::ObjectPtr loadCachedServant(const Ice::Identity&, ObjectStore<TransactionalEvictorElement>*);
-
-    void evict(const TransactionalEvictorElementPtr&);
-    void fixEvictPosition(const TransactionalEvictorElementPtr&);
-
-    void servantNotFound(const char*, int, const Ice::Current&);
-
-    //
-    // The _evictorList contains a list of all objects we keep,
-    // with the most recently used first.
-    //
-    std::list<TransactionalEvictorElementPtr> _evictorList;
-    std::list<TransactionalEvictorElementPtr>::size_type _currentEvictorSize;
-
-    bool _rollbackOnUserException;
-
-    Ice::DispatchInterceptorPtr _interceptor;
-};
-
-typedef IceUtil::Handle<TransactionalEvictorI> TransactionalEvictorIPtr;
-
-}
-
-#endif
diff --git a/cpp/src/Freeze/Util.cpp b/cpp/src/Freeze/Util.cpp
deleted file mode 100644
index 6e21ed0c4fc..00000000000
--- a/cpp/src/Freeze/Util.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/Util.h>
-#include <Freeze/Exception.h>
-
-using namespace Freeze;
-using namespace Ice;
-using namespace std;
-
-void
-Freeze::handleDbException(const DbException& dx, 
-                          const char* file, int line)
-{
-    throw DatabaseException(file, line, dx.what());
-}
-
-void
-Freeze::handleDbException(const DbException& dx, 
-                          Key& key, Dbt& dbKey, 
-                          const char* file, int line)
-{
-    bool bufferSmallException =
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 2)
-        (dx.get_errno() == ENOMEM);
-#else
-        (dx.get_errno() == DB_BUFFER_SMALL || dx.get_errno() == ENOMEM);
-#endif  
-        
-    if(bufferSmallException && (dbKey.get_size() > dbKey.get_ulen()))
-    {
-        //
-        // Keep the old key size in case it's used as input
-        //
-        size_t oldKeySize = key.size();
-
-        key.resize(dbKey.get_size());
-        initializeOutDbt(key, dbKey);
-        dbKey.set_size(static_cast<u_int32_t>(oldKeySize));
-    }
-    else
-    {
-        handleDbException(dx, file, line);
-    }
-}
-
-void
-Freeze::handleDbException(const DbException& dx, 
-                          Key& key, Dbt& dbKey, 
-                          Value& value, Dbt& dbValue,
-                          const char* file, int line)
-{
-    bool bufferSmallException =
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 2)
-        (dx.get_errno() == ENOMEM);
-#else
-        (dx.get_errno() == DB_BUFFER_SMALL || dx.get_errno() == ENOMEM);
-#endif  
-
-    bool resized = false;       
-    if(bufferSmallException)
-    {
-        if(dbKey.get_size() > dbKey.get_ulen())
-        {
-            size_t oldKeySize = key.size();
-            key.resize(dbKey.get_size());
-            initializeOutDbt(key, dbKey);
-            dbKey.set_size(static_cast<u_int32_t>(oldKeySize));
-            resized = true;
-        }
-        
-        if(dbValue.get_size() > dbValue.get_ulen())
-        {
-            value.resize(dbValue.get_size());
-            initializeOutDbt(value, dbValue);
-            resized = true;
-        }
-    }
-    
-    if(!resized)
-    {
-        handleDbException(dx, file, line);
-    }
-}
diff --git a/cpp/src/Freeze/Util.h b/cpp/src/Freeze/Util.h
deleted file mode 100644
index d6d52bf9488..00000000000
--- a/cpp/src/Freeze/Util.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_UTIL_H
-#define FREEZE_UTIL_H
-
-#include <Ice/Ice.h>
-#include <Freeze/DB.h>
-#include <db_cxx.h>
-#include <sys/stat.h>
-
-#ifdef _WIN32
-#   define FREEZE_DB_MODE 0
-#else
-#   define FREEZE_DB_MODE (S_IRUSR | S_IWUSR)
-#endif
-
-
-namespace Freeze
-{
-
-inline void
-initializeInDbt(const std::vector<Ice::Byte>& v, Dbt& dbt)
-{
-    dbt.set_data(const_cast<Ice::Byte*>(&v[0]));
-    dbt.set_size(static_cast<u_int32_t>(v.size()));
-    dbt.set_ulen(0);
-    dbt.set_dlen(0);
-    dbt.set_doff(0);
-    dbt.set_flags(DB_DBT_USERMEM);
-}
-
-inline void
-initializeInDbt(IceInternal::BasicStream& s, Dbt& dbt)
-{
-    dbt.set_data(const_cast<Ice::Byte*>(s.b.begin()));
-    dbt.set_size(static_cast<u_int32_t>(s.b.size()));
-    dbt.set_ulen(0);
-    dbt.set_dlen(0);
-    dbt.set_doff(0);
-    dbt.set_flags(DB_DBT_USERMEM);
-}
-
-inline void
-initializeOutDbt(std::vector<Ice::Byte>& v, Dbt& dbt)
-{
-    v.resize(v.capacity());
-    dbt.set_data(&v[0]);
-    dbt.set_size(0);
-    dbt.set_ulen(static_cast<u_int32_t>(v.size()));
-    dbt.set_dlen(0);
-    dbt.set_doff(0);
-    dbt.set_flags(DB_DBT_USERMEM);
-}
-
-inline void
-initializeOutDbt(IceInternal::BasicStream& s, Dbt& dbt)
-{
-    dbt.set_data(const_cast<Ice::Byte*>(s.b.begin()));
-    dbt.set_size(0);
-    dbt.set_ulen(static_cast<u_int32_t>(s.b.size()));
-    dbt.set_dlen(0);
-    dbt.set_doff(0);
-    dbt.set_flags(DB_DBT_USERMEM);
-}
-
-
-//
-// Handles a Berkeley DB DbException by resizing the
-// given key/value/dbt (when the exception's errno is
-// DB_SMALL_BUFFER) or by throwing a
-// Freeze::DatabaseException
-//
-
-void
-handleDbException(const DbException&, const char*, int);
-
-void
-handleDbException(const DbException&, Key&, Dbt&,
-                  const char*, int);
-
-void
-handleDbException(const DbException&, Key&, Dbt&, Value&, Dbt&,
-                  const char*, int);
-
-}
-
-
-#endif
-
diff --git a/cpp/src/FreezeScript/.depend.mak b/cpp/src/FreezeScript/.depend.mak
deleted file mode 100755
index 2a99698be24..00000000000
--- a/cpp/src/FreezeScript/.depend.mak
+++ /dev/null
@@ -1,1896 +0,0 @@
-
-AssignVisitor.obj: \
-	AssignVisitor.cpp \
-    "AssignVisitor.h" \
-    "Data.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "Error.h" \
-    "Util.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-
-Data.obj: \
-	Data.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "Data.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "Error.h" \
-    "Util.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "Exception.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
-
-Error.obj: \
-	Error.cpp \
-    "Error.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "Exception.h" \
-    "Util.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-
-Functions.obj: \
-	Functions.cpp \
-    "Functions.h" \
-    "Data.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "Error.h" \
-    "Util.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-Exception.obj: \
-	Exception.cpp \
-    "Exception.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-Parser.obj: \
-	Parser.cpp \
-    "Parser.h" \
-    "Data.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "Error.h" \
-    "GrammarUtil.h" \
-
-Print.obj: \
-	Print.cpp \
-    "Print.h" \
-    "Data.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "Error.h" \
-    "Util.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-
-Util.obj: \
-	Util.cpp \
-    "Util.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "Exception.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Slice\Preprocessor.h" \
-
-Grammar.obj: \
-	Grammar.cpp \
-    "GrammarUtil.h" \
-    "Parser.h" \
-    "Data.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "Error.h" \
-
-Scanner.obj: \
-	Scanner.cpp \
-    "$(includedir)\IceUtil\ScannerConfig.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "GrammarUtil.h" \
-    "Parser.h" \
-    "Data.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "Error.h" \
-    "Grammar.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
-
-TransformAnalyzer.obj: \
-	TransformAnalyzer.cpp \
-    "TransformAnalyzer.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "Util.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-
-TransformVisitor.obj: \
-	TransformVisitor.cpp \
-    "TransformVisitor.h" \
-    "Data.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "Error.h" \
-    "Util.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
-
-Transformer.obj: \
-	Transformer.cpp \
-    "Transformer.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "Data.h" \
-    "Error.h" \
-    "Parser.h" \
-    "TransformVisitor.h" \
-    "AssignVisitor.h" \
-    "Print.h" \
-    "Functions.h" \
-    "Exception.h" \
-    "Util.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "..\..\src\IceXML\Parser.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
-
-transformdb.obj: \
-	transformdb.cpp \
-    "Transformer.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "Data.h" \
-    "Error.h" \
-    "TransformAnalyzer.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "Exception.h" \
-    "Util.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-
-DumpDescriptors.obj: \
-	DumpDescriptors.cpp \
-    "DumpDescriptors.h" \
-    "Parser.h" \
-    "Data.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "Error.h" \
-    "..\..\src\IceXML\Parser.h" \
-    "AssignVisitor.h" \
-    "Print.h" \
-    "Functions.h" \
-    "Exception.h" \
-    "Util.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
-
-DumpDB.obj: \
-	DumpDB.cpp \
-    "DumpDescriptors.h" \
-    "Parser.h" \
-    "Data.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "Error.h" \
-    "..\..\src\IceXML\Parser.h" \
-    "Util.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "Exception.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
diff --git a/cpp/src/FreezeScript/.gitignore b/cpp/src/FreezeScript/.gitignore
deleted file mode 100644
index 720f44c7047..00000000000
--- a/cpp/src/FreezeScript/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
diff --git a/cpp/src/FreezeScript/AssignVisitor.cpp b/cpp/src/FreezeScript/AssignVisitor.cpp
deleted file mode 100644
index e940e1f16d0..00000000000
--- a/cpp/src/FreezeScript/AssignVisitor.cpp
+++ /dev/null
@@ -1,595 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/AssignVisitor.h>
-#include <FreezeScript/Util.h>
-#include <climits>
-
-using namespace std;
-
-FreezeScript::AssignVisitor::AssignVisitor(const DataPtr& src, const DataFactoryPtr& factory,
-                                           const ErrorReporterPtr& errorReporter, bool convert,
-                                           const string& context) :
-    _src(src), _factory(factory), _errorReporter(errorReporter), _convert(convert),
-    _context(context)
-{
-}
-
-void
-FreezeScript::AssignVisitor::visitBoolean(const BooleanDataPtr& dest)
-{
-    StringDataPtr s = StringDataPtr::dynamicCast(_src);
-    if(s)
-    {
-        string v = s->getValue();
-        if(v == "true")
-        {
-            dest->setValue(true);
-        }
-        else if(v == "false")
-        {
-            dest->setValue(false);
-        }
-        else
-        {
-            conversionError(dest->getType(), _src->getType(), v);
-        }
-    }
-    else
-    {
-        dest->setValue(_src->booleanValue(_convert));
-    }
-}
-
-void
-FreezeScript::AssignVisitor::visitInteger(const IntegerDataPtr& dest)
-{
-    dest->setValue(_src->integerValue(_convert), true);
-}
-
-void
-FreezeScript::AssignVisitor::visitDouble(const DoubleDataPtr& dest)
-{
-    dest->setValue(_src->doubleValue(_convert));
-}
-
-void
-FreezeScript::AssignVisitor::visitString(const StringDataPtr& dest)
-{
-    dest->setValue(_src->stringValue(_convert));
-}
-
-void
-FreezeScript::AssignVisitor::visitProxy(const ProxyDataPtr& dest)
-{
-    ProxyDataPtr p = ProxyDataPtr::dynamicCast(_src);
-    if(p)
-    {
-        dest->setValue(p->getValue());
-    }
-    else
-    {
-        StringDataPtr s = StringDataPtr::dynamicCast(_src);
-        if(s)
-        {
-            dest->setValue(s->getValue(), false);
-        }
-        else
-        {
-            typeMismatchError(dest->getType(), _src->getType());
-        }
-    }
-}
-
-void
-FreezeScript::AssignVisitor::visitStruct(const StructDataPtr& dest)
-{
-    Slice::StructPtr type = Slice::StructPtr::dynamicCast(dest->getType());
-    assert(type);
-    StructDataPtr src = StructDataPtr::dynamicCast(_src);
-    if(src && isCompatible(type, src->getType()))
-    {
-        //
-        // Assign members with the same name.
-        //
-        DataMemberMap srcMap = src->getMembers();
-        DataMemberMap destMap = dest->getMembers();
-        string typeName = typeToString(type);
-        for(DataMemberMap::iterator p = destMap.begin(); p != destMap.end(); ++p)
-        {
-            DataMemberMap::iterator q = srcMap.find(p->first);
-            if(q != srcMap.end())
-            {
-                string context = typeName + " member " + p->first + " value";
-                AssignVisitor v(q->second, _factory, _errorReporter, _convert, context);
-                p->second->visit(v);
-            }
-        }
-    }
-    else
-    {
-        typeMismatchError(type, _src->getType());
-    }
-}
-
-void
-FreezeScript::AssignVisitor::visitSequence(const SequenceDataPtr& dest)
-{
-    Slice::TypePtr type = dest->getType();
-    SequenceDataPtr src = SequenceDataPtr::dynamicCast(_src);
-    if(src && isCompatible(type, src->getType()))
-    {
-        DataList& srcElements = src->getElements();
-        DataList destElements;
-        Slice::SequencePtr seqType = Slice::SequencePtr::dynamicCast(type);
-        assert(seqType);
-        Slice::TypePtr elemType = seqType->type();
-        string typeName = typeToString(type);
-        for(DataList::const_iterator p = srcElements.begin(); p != srcElements.end(); ++p)
-        {
-            DataPtr element = _factory->create(elemType, false);
-            Destroyer<DataPtr> elementDestroyer(element);
-            AssignVisitor v(*p, _factory, _errorReporter, _convert, typeName + " element");
-            element->visit(v);
-            destElements.push_back(element);
-            elementDestroyer.release();
-        }
-        DataList& l = dest->getElements();
-        l.swap(destElements);
-    }
-    else
-    {
-        typeMismatchError(type, _src->getType());
-    }
-}
-
-void
-FreezeScript::AssignVisitor::visitEnum(const EnumDataPtr& dest)
-{
-    Slice::TypePtr type = dest->getType();
-    IntegerDataPtr i = IntegerDataPtr::dynamicCast(_src);
-    if(i)
-    {
-        if(_convert)
-        {
-            Ice::Long l = i->integerValue();
-            if(l < 0 || l > INT_MAX || !dest->setValue(static_cast<Ice::Int>(l)))
-            {
-                rangeError(i->toString(), type);
-            }
-        }
-        else
-        {
-            conversionError(type, i->getType(), i->toString());
-        }
-    }
-    else
-    {
-        string name;
-        EnumDataPtr e = EnumDataPtr::dynamicCast(_src);
-        if(e && isCompatible(type, _src->getType()))
-        {
-            name = e->toString();
-        }
-        else
-        {
-            StringDataPtr s = StringDataPtr::dynamicCast(_src);
-            if(s)
-            {
-                name = s->getValue();
-            }
-            else
-            {
-                typeMismatchError(type, _src->getType());
-            }
-        }
-
-        if(!dest->setValueAsString(name))
-        {
-            conversionError(type, _src->getType(), name);
-        }
-    }
-}
-
-void
-FreezeScript::AssignVisitor::visitDictionary(const DictionaryDataPtr& dest)
-{
-    Slice::TypePtr type = dest->getType();
-    DictionaryDataPtr d = DictionaryDataPtr::dynamicCast(_src);
-    if(d && isCompatible(type, _src->getType()))
-    {
-        DataMap& srcMap = d->getElements();
-        DataMap destMap;
-        Slice::DictionaryPtr dictType = Slice::DictionaryPtr::dynamicCast(type);
-        assert(dictType);
-        Slice::TypePtr keyType = dictType->keyType();
-        Slice::TypePtr valueType = dictType->valueType();
-        string typeName = typeToString(type);
-        for(DataMap::const_iterator p = srcMap.begin(); p != srcMap.end(); ++p)
-        {
-            DataPtr key = _factory->create(keyType, false);
-            Destroyer<DataPtr> keyDestroyer(key);
-            DataPtr value = _factory->create(valueType, false);
-            Destroyer<DataPtr> valueDestroyer(value);
-
-            AssignVisitor keyVisitor(p->first, _factory, _errorReporter, _convert, typeName + " key");
-            key->visit(keyVisitor);
-
-            AssignVisitor valueVisitor(p->second, _factory, _errorReporter, _convert, typeName + " value");
-            value->visit(valueVisitor);
-
-            DataMap::const_iterator q = destMap.find(key);
-            if(q != destMap.end())
-            {
-                error("duplicate dictionary key in " + typeToString(dictType));
-            }
-            else
-            {
-                destMap.insert(DataMap::value_type(key, value));
-                keyDestroyer.release();
-                valueDestroyer.release();
-            }
-        }
-        DataMap& m = dest->getElements();
-        m.swap(destMap);
-    }
-    else
-    {
-        typeMismatchError(type, _src->getType());
-    }
-}
-
-void
-FreezeScript::AssignVisitor::visitObject(const ObjectRefPtr& dest)
-{
-    Slice::TypePtr type = dest->getType();
-    ObjectRefPtr src = ObjectRefPtr::dynamicCast(_src);
-    if(!src)
-    {
-        typeMismatchError(type, _src->getType());
-    }
-
-    ObjectDataPtr srcValue = src->getValue();
-    Slice::TypePtr srcType = src->getType();
-    if(!srcValue)
-    {
-        //
-        // Allow a nil value from type Object.
-        //
-        if(Slice::BuiltinPtr::dynamicCast(srcType) || isCompatible(type, srcType))
-        {
-            dest->setValue(0);
-        }
-        else
-        {
-            typeMismatchError(type, srcType);
-        }
-    }
-    else
-    {
-        Slice::TypePtr srcValueType = srcValue->getType();
-        if(isCompatible(type, srcValueType))
-        {
-            dest->setValue(srcValue);
-        }
-        else
-        {
-            typeMismatchError(type, srcValueType);
-        }
-    }
-}
-
-bool
-FreezeScript::AssignVisitor::isCompatible(const Slice::TypePtr& dest, const Slice::TypePtr& src)
-{
-    Slice::BuiltinPtr b1 = Slice::BuiltinPtr::dynamicCast(dest);
-    if(b1)
-    {
-        Slice::BuiltinPtr b2 = Slice::BuiltinPtr::dynamicCast(src);
-        switch(b1->kind())
-        {
-        case Slice::Builtin::KindByte:
-        case Slice::Builtin::KindShort:
-        case Slice::Builtin::KindInt:
-        case Slice::Builtin::KindLong:
-        {
-            if(b2)
-            {
-                switch(b2->kind())
-                {
-                case Slice::Builtin::KindByte:
-                case Slice::Builtin::KindShort:
-                case Slice::Builtin::KindInt:
-                case Slice::Builtin::KindLong:
-                case Slice::Builtin::KindString:
-                {
-                    return true;
-                }
-                case Slice::Builtin::KindBool:
-                case Slice::Builtin::KindFloat:
-                case Slice::Builtin::KindDouble:
-                case Slice::Builtin::KindObject:
-                case Slice::Builtin::KindObjectProxy:
-                case Slice::Builtin::KindLocalObject:
-                {
-                    return false;
-                }
-                }
-            }
-
-            return false;
-        }
-        case Slice::Builtin::KindBool:
-        {
-            if(b2 && (b2->kind() == Slice::Builtin::KindBool || b2->kind() == Slice::Builtin::KindString))
-            {
-                return true;
-            }
-
-            return false;
-        }
-        case Slice::Builtin::KindFloat:
-        case Slice::Builtin::KindDouble:
-        {
-            if(b2)
-            {
-                switch(b2->kind())
-                {
-                case Slice::Builtin::KindFloat:
-                case Slice::Builtin::KindDouble:
-                case Slice::Builtin::KindString:
-                {
-                    return true;
-                }
-                case Slice::Builtin::KindByte:
-                case Slice::Builtin::KindShort:
-                case Slice::Builtin::KindInt:
-                case Slice::Builtin::KindLong:
-                case Slice::Builtin::KindBool:
-                case Slice::Builtin::KindObject:
-                case Slice::Builtin::KindObjectProxy:
-                case Slice::Builtin::KindLocalObject:
-                {
-                    return false;
-                }
-                }
-            }
-
-            return false;
-        }
-        case Slice::Builtin::KindString:
-        {
-            if(b2)
-            {
-                switch(b2->kind())
-                {
-                case Slice::Builtin::KindByte:
-                case Slice::Builtin::KindBool:
-                case Slice::Builtin::KindShort:
-                case Slice::Builtin::KindInt:
-                case Slice::Builtin::KindLong:
-                case Slice::Builtin::KindFloat:
-                case Slice::Builtin::KindDouble:
-                case Slice::Builtin::KindString:
-                case Slice::Builtin::KindObjectProxy:
-                {
-                    return true;
-                }
-                case Slice::Builtin::KindObject:
-                case Slice::Builtin::KindLocalObject:
-                {
-                    return false;
-                }
-                }
-
-                return false;
-            }
-            else if(Slice::EnumPtr::dynamicCast(src))
-            {
-                return true;
-            }
-            else if(Slice::ProxyPtr::dynamicCast(src))
-            {
-                return true;
-            }
-
-            return false;
-        }
-        case Slice::Builtin::KindObject:
-        {
-            //
-            // Allow transformation from Object to class. Validation has to
-            // be done during transformation, when the actual type of
-            // an instance can be compared for compatibility with the
-            // new type.
-            //
-            Slice::ClassDeclPtr cl = Slice::ClassDeclPtr::dynamicCast(src);
-            if(cl || (b2 && b2->kind() == Slice::Builtin::KindObject))
-            {
-                return true;
-            }
-
-            return false;
-        }
-        case Slice::Builtin::KindObjectProxy:
-        {
-            Slice::ProxyPtr p = Slice::ProxyPtr::dynamicCast(src);
-            if(p || (b2 && b2->kind() == Slice::Builtin::KindObjectProxy) ||
-               (b2 && b2->kind() == Slice::Builtin::KindString))
-            {
-                return true;
-            }
-
-            return false;
-        }
-        case Slice::Builtin::KindLocalObject:
-        {
-            assert(false);
-            return false;
-        }
-        }
-
-        assert(false);
-    }
-
-    Slice::ClassDeclPtr cl1 = Slice::ClassDeclPtr::dynamicCast(dest);
-    if(cl1)
-    {
-        Slice::ClassDeclPtr cl2 = Slice::ClassDeclPtr::dynamicCast(src);
-        if(cl2 && checkClasses(cl1, cl2))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    Slice::StructPtr s1 = Slice::StructPtr::dynamicCast(dest);
-    if(s1)
-    {
-        Slice::StructPtr s2 = Slice::StructPtr::dynamicCast(src);
-        if(s2 && s1->scoped() == s2->scoped())
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    Slice::ProxyPtr p1 = Slice::ProxyPtr::dynamicCast(dest);
-    if(p1)
-    {
-        Slice::BuiltinPtr b2 = Slice::BuiltinPtr::dynamicCast(src);
-        if(b2 && (b2->kind() == Slice::Builtin::KindObjectProxy || b2->kind() == Slice::Builtin::KindString))
-        {
-            return true;
-        }
-
-        Slice::ProxyPtr p2 = Slice::ProxyPtr::dynamicCast(src);
-        if(p2 && checkClasses(p1->_class(), p2->_class()))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    Slice::DictionaryPtr d1 = Slice::DictionaryPtr::dynamicCast(dest);
-    if(d1)
-    {
-        Slice::DictionaryPtr d2 = Slice::DictionaryPtr::dynamicCast(src);
-        if(d2)
-        {
-            return isCompatible(d1->keyType(), d2->keyType()) &&
-                   isCompatible(d1->valueType(), d2->valueType());
-        }
-
-        return false;
-    }
-
-    Slice::SequencePtr seq1 = Slice::SequencePtr::dynamicCast(dest);
-    if(seq1)
-    {
-        Slice::SequencePtr seq2 = Slice::SequencePtr::dynamicCast(src);
-        if(seq2)
-        {
-            return isCompatible(seq1->type(), seq2->type());
-        }
-
-        return false;
-    }
-
-    Slice::EnumPtr e1 = Slice::EnumPtr::dynamicCast(dest);
-    if(e1)
-    {
-        Slice::BuiltinPtr b2 = Slice::BuiltinPtr::dynamicCast(src);
-        if(b2 && b2->kind() == Slice::Builtin::KindString)
-        {
-            return true;
-        }
-
-        Slice::EnumPtr e2 = Slice::EnumPtr::dynamicCast(src);
-        if(e2 && e1->scoped() == e2->scoped())
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    assert(false);
-    return false;
-}
-
-bool
-FreezeScript::AssignVisitor::checkClasses(const Slice::ClassDeclPtr& dest, const Slice::ClassDeclPtr& src)
-{
-    string s1 = dest->scoped();
-    string s2 = src->scoped();
-    if(s1 == s2)
-    {
-        return true;
-    }
-    else
-    {
-        Slice::ClassDefPtr def = src->definition();
-        if(!def)
-        {
-            error("class " + s2 + " declared but not defined");
-        }
-        return def->isA(s1);
-    }
-
-    return false;
-}
-
-void
-FreezeScript::AssignVisitor::typeMismatchError(const Slice::TypePtr& dest, const Slice::TypePtr& src)
-{
-    ostringstream ostr;
-    ostr << "unable to transform";
-    if(!_context.empty())
-    {
-        ostr << ' ' << _context;
-    }
-    ostr << " from " << typeToString(src) << " to " << typeToString(dest);
-    error(ostr.str());
-}
-
-void
-FreezeScript::AssignVisitor::conversionError(const Slice::TypePtr& dest, const Slice::TypePtr& src,
-                                             const string& value)
-{
-    ostringstream ostr;
-    ostr << "unable to convert";
-    if(!_context.empty())
-    {
-        ostr << ' ' << _context;
-    }
-    ostr << " `" << value << "' from " << typeToString(src) << " to " << typeToString(dest);
-    error(ostr.str());
-}
-
-void
-FreezeScript::AssignVisitor::rangeError(const string& value, const Slice::TypePtr& type)
-{
-    ostringstream ostr;
-    if(!_context.empty())
-    {
-        ostr << _context << ' ';
-    }
-    ostr << "`" << value << "' is out of range for type " << typeToString(type);
-    error(ostr.str());
-}
-
-void
-FreezeScript::AssignVisitor::error(const string& msg)
-{
-    _errorReporter->error(msg);
-}
diff --git a/cpp/src/FreezeScript/AssignVisitor.h b/cpp/src/FreezeScript/AssignVisitor.h
deleted file mode 100644
index 10befd2d335..00000000000
--- a/cpp/src/FreezeScript/AssignVisitor.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_SCRIPT_ASSIGN_VISITOR_H
-#define FREEZE_SCRIPT_ASSIGN_VISITOR_H
-
-#include <FreezeScript/Data.h>
-
-namespace FreezeScript
-{
-
-class AssignVisitor : public DataVisitor
-{
-public:
-
-    AssignVisitor(const DataPtr&, const DataFactoryPtr&, const ErrorReporterPtr&, bool,
-                  const std::string& = std::string());
-
-    virtual void visitBoolean(const BooleanDataPtr&);
-    virtual void visitInteger(const IntegerDataPtr&);
-    virtual void visitDouble(const DoubleDataPtr&);
-    virtual void visitString(const StringDataPtr&);
-    virtual void visitProxy(const ProxyDataPtr&);
-    virtual void visitStruct(const StructDataPtr&);
-    virtual void visitSequence(const SequenceDataPtr&);
-    virtual void visitEnum(const EnumDataPtr&);
-    virtual void visitDictionary(const DictionaryDataPtr&);
-    virtual void visitObject(const ObjectRefPtr&);
-
-private:
-
-    bool isCompatible(const Slice::TypePtr&, const Slice::TypePtr&);
-    bool checkClasses(const Slice::ClassDeclPtr&, const Slice::ClassDeclPtr&);
-    void typeMismatchError(const Slice::TypePtr&, const Slice::TypePtr&);
-    void conversionError(const Slice::TypePtr&, const Slice::TypePtr&, const std::string&);
-    void rangeError(const std::string&, const Slice::TypePtr&);
-    void error(const std::string&);
-
-    DataPtr _src;
-    DataFactoryPtr _factory;
-    ErrorReporterPtr _errorReporter;
-    bool _convert;
-    std::string _context; // Provides additional detail for use in warning messages.
-};
-
-} // End of namespace FreezeScript
-
-#endif
diff --git a/cpp/src/FreezeScript/Data.cpp b/cpp/src/FreezeScript/Data.cpp
deleted file mode 100644
index d28982d7485..00000000000
--- a/cpp/src/FreezeScript/Data.cpp
+++ /dev/null
@@ -1,2585 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <IceUtil/DisableWarnings.h>
-#include <FreezeScript/Data.h>
-#include <FreezeScript/Util.h>
-#include <FreezeScript/Exception.h>
-#include <IceUtil/InputUtil.h>
-#include <climits>
-
-using namespace std;
-using namespace IceUtil;
-
-namespace FreezeScript
-{
-
-//
-// ObjectWriter
-//
-class ObjectWriter : public Ice::ObjectWriter
-{
-public:
-
-    ObjectWriter(const ObjectDataPtr&);
-
-    virtual void write(const Ice::OutputStreamPtr&) const;
-
-private:
-
-    ObjectDataPtr _value;
-};
-
-//
-// ReadObjectCallback
-//
-class ReadObjectCallback : public Ice::ReadObjectCallback
-{
-public:
-
-    ReadObjectCallback(const ObjectRefPtr&);
-
-    virtual void invoke(const Ice::ObjectPtr&);
-
-private:
-
-    ObjectRefPtr _ref;
-};
-
-//
-// ObjectReader
-//
-class ObjectReader : public Ice::ObjectReader
-{
-public:
-
-    ObjectReader(const DataFactoryPtr&, const Slice::TypePtr&);
-
-    virtual void read(const Ice::InputStreamPtr&);
-
-    ObjectDataPtr getValue() const;
-
-private:
-
-    DataFactoryPtr _factory;
-    Slice::TypePtr _type;
-    ObjectDataPtr _value;
-};
-typedef IceUtil::Handle<ObjectReader> ObjectReaderPtr;
-
-} // End of namespace Transform
-
-//
-// ObjectWriter
-//
-FreezeScript::ObjectWriter::ObjectWriter(const ObjectDataPtr& value) :
-    _value(value)
-{
-}
-
-void
-FreezeScript::ObjectWriter::write(const Ice::OutputStreamPtr& out) const
-{
-    out->startObject(0);
-
-    Slice::ClassDeclPtr decl = Slice::ClassDeclPtr::dynamicCast(_value->_type);
-    Slice::ClassDefPtr type;
-    if(decl)
-    {
-        type = decl->definition();
-    }
-    while(type)
-    {
-        Slice::ClassDefPtr base;
-        Slice::ClassList bases = type->bases();
-        if(!bases.empty() && !bases.front()->isInterface())
-        {
-            base = bases.front();
-        }
-
-        out->startSlice(type->scoped(), type->compactId(), !base);
-        Slice::DataMemberList members = type->dataMembers();
-        for(Slice::DataMemberList::iterator p = members.begin(); p != members.end(); ++p)
-        {
-            DataMemberMap::const_iterator q = _value->_members.find((*p)->name());
-            assert(q != _value->_members.end());
-            q->second->marshal(out);
-        }
-        out->endSlice();
-
-        type = base;
-    }
-
-    out->endObject();
-}
-
-//
-// ObjectReader
-//
-FreezeScript::ObjectReader::ObjectReader(const DataFactoryPtr& factory, const Slice::TypePtr& type) :
-    _factory(factory), _type(type)
-{
-}
-
-void
-FreezeScript::ObjectReader::read(const Ice::InputStreamPtr& in)
-{
-    const_cast<ObjectDataPtr&>(_value) = new ObjectData(_factory, _type, true);
-    Slice::ClassDeclPtr decl = Slice::ClassDeclPtr::dynamicCast(_type);
-    Slice::ClassDefPtr type;
-    if(decl)
-    {
-        type = decl->definition();
-    }
-
-    in->startObject();
-
-    while(type)
-    {
-        Slice::ClassDefPtr base;
-        Slice::ClassList bases = type->bases();
-        if(!bases.empty() && !bases.front()->isInterface())
-        {
-            base = bases.front();
-        }
-
-        in->startSlice();
-
-        Slice::DataMemberList members = type->dataMembers();
-        for(Slice::DataMemberList::iterator p = members.begin(); p != members.end(); ++p)
-        {
-            DataMemberMap::iterator q = _value->_members.find((*p)->name());
-            assert(q != _value->_members.end());
-            q->second->unmarshal(in);
-        }
-
-        in->endSlice();
-
-        type = base;
-    }
-
-    in->endObject(false);
-}
-
-FreezeScript::ObjectDataPtr
-FreezeScript::ObjectReader::getValue() const
-{
-    return _value;
-}
-
-//
-// DataFactory
-//
-FreezeScript::DataFactory::DataFactory(const Ice::CommunicatorPtr& communicator, const Slice::UnitPtr& unit,
-                                       const ErrorReporterPtr& errorReporter) :
-    _communicator(communicator), _unit(unit), _errorReporter(errorReporter)
-{
-}
-
-FreezeScript::DataPtr
-FreezeScript::DataFactory::create(const Slice::TypePtr& type, bool readOnly)
-{
-    DataPtr data = createImpl(type, readOnly);
-    if(!readOnly)
-    {
-        initialize(data);
-    }
-    return data;
-}
-
-FreezeScript::DataPtr
-FreezeScript::DataFactory::createBoolean(bool b, bool readOnly)
-{
-    DataPtr data = new BooleanData(getBuiltin(Slice::Builtin::KindBool), _errorReporter, readOnly, b);
-    if(!readOnly)
-    {
-        initialize(data);
-    }
-    return data;
-}
-
-FreezeScript::DataPtr
-FreezeScript::DataFactory::createInteger(Ice::Long i, bool readOnly)
-{
-    DataPtr data = new IntegerData(getBuiltin(Slice::Builtin::KindLong), _errorReporter, readOnly, i);
-    if(!readOnly)
-    {
-        initialize(data);
-    }
-    return data;
-}
-
-FreezeScript::DataPtr
-FreezeScript::DataFactory::createDouble(double d, bool readOnly)
-{
-    DataPtr data = new DoubleData(getBuiltin(Slice::Builtin::KindDouble), _errorReporter, readOnly, d);
-    if(!readOnly)
-    {
-        initialize(data);
-    }
-    return data;
-}
-
-FreezeScript::DataPtr
-FreezeScript::DataFactory::createString(const string& s, bool readOnly)
-{
-    DataPtr data = new StringData(this, getBuiltin(Slice::Builtin::KindString), _errorReporter, readOnly, s);
-    if(!readOnly)
-    {
-        initialize(data);
-    }
-    return data;
-}
-
-FreezeScript::DataPtr
-FreezeScript::DataFactory::createNil(bool readOnly)
-{
-    DataPtr data = new ObjectRef(this, getBuiltin(Slice::Builtin::KindObject), readOnly);
-    if(!readOnly)
-    {
-        initialize(data);
-    }
-    return data;
-}
-
-FreezeScript::DataPtr
-FreezeScript::DataFactory::createObject(const Slice::TypePtr& type, bool readOnly)
-{
-    ObjectRefPtr obj;
-    Slice::ClassDeclPtr cl = Slice::ClassDeclPtr::dynamicCast(type);
-    if(cl)
-    {
-        Slice::ClassDefPtr def = cl->definition();
-        if(!def)
-        {
-            _errorReporter->error("class " + cl->scoped() + " declared but not defined");
-        }
-        obj = new ObjectRef(this, cl, readOnly);
-    }
-    else
-    {
-        Slice::BuiltinPtr b = Slice::BuiltinPtr::dynamicCast(type);
-        if(b && b->kind() == Slice::Builtin::KindObject)
-        {
-            obj = new ObjectRef(this, b, readOnly);
-        }
-    }
-
-    if(!obj)
-    {
-        _errorReporter->error("type `" + typeToString(type) + "' is not a class");
-    }
-
-    obj->instantiate();
-
-    if(!readOnly)
-    {
-        initialize(obj);
-    }
-
-    return obj;
-}
-
-Slice::BuiltinPtr
-FreezeScript::DataFactory::getBuiltin(Slice::Builtin::Kind kind) const
-{
-    return _unit->builtin(kind);
-}
-
-Ice::CommunicatorPtr
-FreezeScript::DataFactory::getCommunicator() const
-{
-    return _communicator;
-}
-
-FreezeScript::ErrorReporterPtr
-FreezeScript::DataFactory::getErrorReporter() const
-{
-    return _errorReporter;
-}
-
-FreezeScript::DataPtr
-FreezeScript::DataFactory::createImpl(const Slice::TypePtr& type, bool readOnly)
-{
-    Slice::BuiltinPtr builtin = Slice::BuiltinPtr::dynamicCast(type);
-    if(builtin)
-    {
-        switch(builtin->kind())
-        {
-        case Slice::Builtin::KindBool:
-            return new BooleanData(builtin, _errorReporter, readOnly);
-
-        case Slice::Builtin::KindByte:
-        case Slice::Builtin::KindShort:
-        case Slice::Builtin::KindInt:
-        case Slice::Builtin::KindLong:
-            return new IntegerData(builtin, _errorReporter, readOnly);
-
-        case Slice::Builtin::KindFloat:
-        case Slice::Builtin::KindDouble:
-            return new DoubleData(builtin, _errorReporter, readOnly);
-
-        case Slice::Builtin::KindString:
-            return new StringData(this, builtin, _errorReporter, readOnly);
-
-        case Slice::Builtin::KindObject:
-            return new ObjectRef(this, builtin, readOnly);
-
-        case Slice::Builtin::KindObjectProxy:
-            return new ProxyData(builtin, _communicator, _errorReporter, readOnly);
-
-        case Slice::Builtin::KindLocalObject:
-            assert(false);
-            return 0;
-        }
-    }
-
-    Slice::SequencePtr seq = Slice::SequencePtr::dynamicCast(type);
-    if(seq)
-    {
-        return new SequenceData(this, seq, _errorReporter, readOnly);
-    }
-
-    Slice::ProxyPtr proxy = Slice::ProxyPtr::dynamicCast(type);
-    if(proxy)
-    {
-        return new ProxyData(proxy, _communicator, _errorReporter, readOnly);
-    }
-
-    Slice::StructPtr st = Slice::StructPtr::dynamicCast(type);
-    if(st)
-    {
-        return new StructData(this, st, _errorReporter, readOnly);
-    }
-
-    Slice::EnumPtr en = Slice::EnumPtr::dynamicCast(type);
-    if(en)
-    {
-        return new EnumData(en, _errorReporter, readOnly);
-    }
-
-    Slice::DictionaryPtr dict = Slice::DictionaryPtr::dynamicCast(type);
-    if(dict)
-    {
-        return new DictionaryData(this, dict, _errorReporter, readOnly);
-    }
-
-    Slice::ClassDeclPtr cl = Slice::ClassDeclPtr::dynamicCast(type);
-    if(cl)
-    {
-        Slice::ClassDefPtr def = cl->definition();
-        if(!def)
-        {
-            _errorReporter->error("class " + cl->scoped() + " declared but not defined");
-        }
-        return new ObjectRef(this, cl, readOnly);
-    }
-
-    return 0;
-}
-
-void
-FreezeScript::DataFactory::initialize(const DataPtr&)
-{
-}
-
-//
-// Data
-//
-FreezeScript::Data::Data(const ErrorReporterPtr& errorReporter, bool readOnly) :
-    _errorReporter(errorReporter), _readOnly(readOnly)
-{
-}
-
-FreezeScript::Data::~Data()
-{
-}
-
-bool
-FreezeScript::Data::readOnly() const
-{
-    return _readOnly;
-}
-
-//
-// PrimitiveData
-//
-FreezeScript::PrimitiveData::PrimitiveData(const ErrorReporterPtr& errorReporter, bool readOnly) :
-    Data(errorReporter, readOnly)
-{
-}
-
-FreezeScript::DataPtr
-FreezeScript::PrimitiveData::getMember(const string&) const
-{
-    return 0;
-}
-
-FreezeScript::DataPtr
-FreezeScript::PrimitiveData::getElement(const DataPtr&) const
-{
-    _errorReporter->error("element requested of primitive value");
-    return 0;
-}
-
-void
-FreezeScript::PrimitiveData::destroy()
-{
-}
-
-//
-// BooleanData
-//
-FreezeScript::BooleanData::BooleanData(const Slice::BuiltinPtr& type, const ErrorReporterPtr& errorReporter,
-                                       bool readOnly) :
-    PrimitiveData(errorReporter, readOnly), _type(type), _value(false)
-{
-}
-
-FreezeScript::BooleanData::BooleanData(const Slice::BuiltinPtr& type, const ErrorReporterPtr& errorReporter,
-                                       bool readOnly, bool value) :
-    PrimitiveData(errorReporter, readOnly), _type(type), _value(value)
-{
-}
-
-bool
-FreezeScript::BooleanData::operator==(const Data& rhs) const
-{
-    return !operator!=(rhs);
-}
-
-bool
-FreezeScript::BooleanData::operator!=(const Data& rhs) const
-{
-    const BooleanData* b = dynamic_cast<const BooleanData*>(&rhs);
-    if(!b)
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _value != b->_value;
-}
-
-bool
-FreezeScript::BooleanData::operator<(const Data& rhs) const
-{
-    const BooleanData* b = dynamic_cast<const BooleanData*>(&rhs);
-    if(!b)
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _value < b->_value;
-}
-
-FreezeScript::DataPtr
-FreezeScript::BooleanData::clone() const
-{
-    return new BooleanData(_type, _errorReporter, _readOnly, _value);
-}
-
-Slice::TypePtr
-FreezeScript::BooleanData::getType() const
-{
-    return _type;
-}
-
-void
-FreezeScript::BooleanData::marshal(const Ice::OutputStreamPtr& out) const
-{
-    out->write(_value);
-}
-
-void
-FreezeScript::BooleanData::unmarshal(const Ice::InputStreamPtr& in)
-{
-    in->read(_value);
-}
-
-bool
-FreezeScript::BooleanData::booleanValue(bool) const
-{
-    return _value;
-}
-
-Ice::Long
-FreezeScript::BooleanData::integerValue(bool) const
-{
-    _errorReporter->error("boolean cannot be converted to integer");
-    return 0;
-}
-
-double
-FreezeScript::BooleanData::doubleValue(bool) const
-{
-    _errorReporter->error("boolean cannot be converted to double");
-    return 0;
-}
-
-string
-FreezeScript::BooleanData::stringValue(bool convert) const
-{
-    if(convert)
-    {
-        return toString();
-    }
-    else
-    {
-        return string();
-    }
-}
-
-string
-FreezeScript::BooleanData::toString() const
-{
-    return (_value ? "true" : "false");
-}
-
-void
-FreezeScript::BooleanData::visit(DataVisitor& visitor)
-{
-    visitor.visitBoolean(this);
-}
-
-bool
-FreezeScript::BooleanData::getValue() const
-{
-    return _value;
-}
-
-void
-FreezeScript::BooleanData::setValue(bool v)
-{
-    _value = v;
-}
-
-//
-// IntegerData
-//
-FreezeScript::IntegerData::IntegerData(const Slice::BuiltinPtr& type, const ErrorReporterPtr& errorReporter,
-                                       bool readOnly) :
-    PrimitiveData(errorReporter, readOnly), _type(type), _value(0)
-{
-}
-
-FreezeScript::IntegerData::IntegerData(const Slice::BuiltinPtr& type, const ErrorReporterPtr& errorReporter,
-                                       bool readOnly, Ice::Long value) :
-    PrimitiveData(errorReporter, readOnly), _type(type), _value(value)
-{
-}
-
-bool
-FreezeScript::IntegerData::operator==(const Data& rhs) const
-{
-    return !operator!=(rhs);
-}
-
-bool
-FreezeScript::IntegerData::operator!=(const Data& rhs) const
-{
-    const IntegerData* i = dynamic_cast<const IntegerData*>(&rhs);
-    if(!i)
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _value != i->_value;
-}
-
-bool
-FreezeScript::IntegerData::operator<(const Data& rhs) const
-{
-    const IntegerData* i = dynamic_cast<const IntegerData*>(&rhs);
-    if(!i)
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _value < i->_value;
-}
-
-FreezeScript::DataPtr
-FreezeScript::IntegerData::clone() const
-{
-    return new IntegerData(_type, _errorReporter, _readOnly, _value);
-}
-
-Slice::TypePtr
-FreezeScript::IntegerData::getType() const
-{
-    return _type;
-}
-
-void
-FreezeScript::IntegerData::marshal(const Ice::OutputStreamPtr& out) const
-{
-    rangeCheck(_value, true);
-
-    switch(_type->kind())
-    {
-    case Slice::Builtin::KindByte:
-    {
-        out->write(static_cast<Ice::Byte>(_value));
-        break;
-    }
-    case Slice::Builtin::KindShort:
-    {
-        out->write(static_cast<Ice::Short>(_value));
-        break;
-    }
-    case Slice::Builtin::KindInt:
-    {
-        out->write(static_cast<Ice::Int>(_value));
-        break;
-    }
-    case Slice::Builtin::KindLong:
-    {
-        out->write(_value);
-        break;
-    }
-
-    case Slice::Builtin::KindBool:
-    case Slice::Builtin::KindFloat:
-    case Slice::Builtin::KindDouble:
-    case Slice::Builtin::KindString:
-    case Slice::Builtin::KindObject:
-    case Slice::Builtin::KindObjectProxy:
-    case Slice::Builtin::KindLocalObject:
-        assert(false);
-    }
-}
-
-void
-FreezeScript::IntegerData::unmarshal(const Ice::InputStreamPtr& in)
-{
-    switch(_type->kind())
-    {
-    case Slice::Builtin::KindByte:
-    {
-        Ice::Byte val;
-        in->read(val);
-        _value = val & 0xff;
-        break;
-    }
-    case Slice::Builtin::KindShort:
-    {
-        Ice::Short val;
-        in->read(val);
-        _value = val;
-        break;
-    }
-    case Slice::Builtin::KindInt:
-    {
-        Ice::Int val;
-        in->read(val);
-        _value = val;
-        break;
-    }
-    case Slice::Builtin::KindLong:
-    {
-        Ice::Long val;
-        in->read(val);
-        _value = val;
-        break;
-    }
-
-    case Slice::Builtin::KindBool:
-    case Slice::Builtin::KindFloat:
-    case Slice::Builtin::KindDouble:
-    case Slice::Builtin::KindString:
-    case Slice::Builtin::KindObject:
-    case Slice::Builtin::KindObjectProxy:
-    case Slice::Builtin::KindLocalObject:
-        assert(false);
-    }
-}
-
-bool
-FreezeScript::IntegerData::booleanValue(bool) const
-{
-    _errorReporter->error("integer cannot be converted to boolean");
-    return 0;
-}
-
-Ice::Long
-FreezeScript::IntegerData::integerValue(bool) const
-{
-    return _value;
-}
-
-double
-FreezeScript::IntegerData::doubleValue(bool convert) const
-{
-    if(convert)
-    {
-        return static_cast<double>(_value);
-    }
-    else
-    {
-        _errorReporter->error("integer cannot be converted to double");
-        return 0;
-    }
-}
-
-string
-FreezeScript::IntegerData::stringValue(bool convert) const
-{
-    if(convert)
-    {
-        return toString();
-    }
-    else
-    {
-        _errorReporter->error("integer cannot be converted to string");
-        return string();
-    }
-}
-
-string
-FreezeScript::IntegerData::toString() const
-{
-    return toString(_value);
-}
-
-void
-FreezeScript::IntegerData::visit(DataVisitor& visitor)
-{
-    visitor.visitInteger(this);
-}
-
-Ice::Long
-FreezeScript::IntegerData::getValue() const
-{
-    return _value;
-}
-
-void
-FreezeScript::IntegerData::setValue(Ice::Long v, bool fatal)
-{
-    if(rangeCheck(v, fatal))
-    {
-        _value = v;
-    }
-}
-
-bool
-FreezeScript::IntegerData::rangeCheck(Ice::Long value, bool fatal) const
-{
-    switch(_type->kind())
-    {
-    case Slice::Builtin::KindByte:
-    {
-        if(value < 0 || value > 255)
-        {
-            _errorReporter->rangeError(toString(value), _type, fatal);
-        }
-        else
-        {
-            return true;
-        }
-        break;
-    }
-
-    case Slice::Builtin::KindShort:
-    {
-        if(value < SHRT_MIN || value > SHRT_MAX)
-        {
-            _errorReporter->rangeError(toString(value), _type, fatal);
-        }
-        else
-        {
-            return true;
-        }
-        break;
-    }
-
-    case Slice::Builtin::KindInt:
-    {
-        if(value < INT_MIN || value > INT_MAX)
-        {
-            _errorReporter->rangeError(toString(value), _type, fatal);
-        }
-        else
-        {
-            return true;
-        }
-        break;
-    }
-
-    case Slice::Builtin::KindLong:
-    {
-        return true;
-    }
-
-    case Slice::Builtin::KindBool:
-    case Slice::Builtin::KindFloat:
-    case Slice::Builtin::KindDouble:
-    case Slice::Builtin::KindString:
-    case Slice::Builtin::KindObject:
-    case Slice::Builtin::KindObjectProxy:
-    case Slice::Builtin::KindLocalObject:
-        assert(false);
-    }
-
-    return false;
-}
-
-string
-FreezeScript::IntegerData::toString(Ice::Long value)
-{
-    char buf[64];
-#ifdef _WIN32
-    sprintf_s(buf, "%I64d", value);
-#elif defined(ICE_64)
-    sprintf(buf, "%ld", value);
-#else
-    sprintf(buf, "%lld", value);
-#endif
-    return string(buf);
-}
-
-//
-// DoubleData
-//
-FreezeScript::DoubleData::DoubleData(const Slice::BuiltinPtr& type, const ErrorReporterPtr& errorReporter,
-                                     bool readOnly) :
-    PrimitiveData(errorReporter, readOnly), _type(type), _value(0)
-{
-}
-
-FreezeScript::DoubleData::DoubleData(const Slice::BuiltinPtr& type, const ErrorReporterPtr& errorReporter,
-                                     bool readOnly, double value) :
-    PrimitiveData(errorReporter, readOnly), _type(type), _value(value)
-{
-}
-
-bool
-FreezeScript::DoubleData::operator==(const Data& rhs) const
-{
-    return !operator!=(rhs);
-}
-
-bool
-FreezeScript::DoubleData::operator!=(const Data& rhs) const
-{
-    const DoubleData* d = dynamic_cast<const DoubleData*>(&rhs);
-    if(!d)
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _value != d->_value;
-}
-
-bool
-FreezeScript::DoubleData::operator<(const Data& rhs) const
-{
-    const DoubleData* d = dynamic_cast<const DoubleData*>(&rhs);
-    if(!d)
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _value < d->_value;
-}
-
-FreezeScript::DataPtr
-FreezeScript::DoubleData::clone() const
-{
-    return new DoubleData(_type, _errorReporter, _readOnly, _value);
-}
-
-Slice::TypePtr
-FreezeScript::DoubleData::getType() const
-{
-    return _type;
-}
-
-void
-FreezeScript::DoubleData::marshal(const Ice::OutputStreamPtr& out) const
-{
-    switch(_type->kind())
-    {
-    case Slice::Builtin::KindFloat:
-    {
-        out->write(static_cast<Ice::Float>(_value));
-        break;
-    }
-    case Slice::Builtin::KindDouble:
-    {
-        out->write(_value);
-        break;
-    }
-
-    case Slice::Builtin::KindByte:
-    case Slice::Builtin::KindShort:
-    case Slice::Builtin::KindInt:
-    case Slice::Builtin::KindLong:
-    case Slice::Builtin::KindBool:
-    case Slice::Builtin::KindString:
-    case Slice::Builtin::KindObject:
-    case Slice::Builtin::KindObjectProxy:
-    case Slice::Builtin::KindLocalObject:
-        assert(false);
-    }
-}
-
-void
-FreezeScript::DoubleData::unmarshal(const Ice::InputStreamPtr& in)
-{
-    switch(_type->kind())
-    {
-    case Slice::Builtin::KindFloat:
-    {
-        Ice::Float val;
-        in->read(val);
-        _value = val;
-        break;
-    }
-    case Slice::Builtin::KindDouble:
-    {
-        in->read(_value);
-        break;
-    }
-
-    case Slice::Builtin::KindByte:
-    case Slice::Builtin::KindShort:
-    case Slice::Builtin::KindInt:
-    case Slice::Builtin::KindLong:
-    case Slice::Builtin::KindBool:
-    case Slice::Builtin::KindString:
-    case Slice::Builtin::KindObject:
-    case Slice::Builtin::KindObjectProxy:
-    case Slice::Builtin::KindLocalObject:
-        assert(false);
-    }
-}
-
-bool
-FreezeScript::DoubleData::booleanValue(bool) const
-{
-    _errorReporter->error("double cannot be converted to boolean");
-    return 0;
-}
-
-Ice::Long
-FreezeScript::DoubleData::integerValue(bool convert) const
-{
-    if(convert)
-    {
-        return static_cast<Ice::Long>(_value);
-    }
-    else
-    {
-        _errorReporter->error("double cannot be converted to integer");
-        return 0;
-    }
-}
-
-double
-FreezeScript::DoubleData::doubleValue(bool) const
-{
-    return _value;
-}
-
-string
-FreezeScript::DoubleData::stringValue(bool convert) const
-{
-    if(convert)
-    {
-        return toString();
-    }
-    else
-    {
-        _errorReporter->error("double cannot be converted to string");
-        return string();
-    }
-}
-
-string
-FreezeScript::DoubleData::toString() const
-{
-    char buff[64];
-    sprintf(buff, "%g", _value);
-    return string(buff);
-}
-
-void
-FreezeScript::DoubleData::visit(DataVisitor& visitor)
-{
-    visitor.visitDouble(this);
-}
-
-double
-FreezeScript::DoubleData::getValue() const
-{
-    return _value;
-}
-
-void
-FreezeScript::DoubleData::setValue(double v)
-{
-    _value = v;
-}
-
-//
-// StringData
-//
-FreezeScript::StringData::StringData(const DataFactoryPtr& factory, const Slice::BuiltinPtr& type,
-                                     const ErrorReporterPtr& errorReporter, bool readOnly) :
-    PrimitiveData(errorReporter, readOnly), _factory(factory), _type(type)
-{
-    setValue("");
-}
-
-FreezeScript::StringData::StringData(const DataFactoryPtr& factory, const Slice::BuiltinPtr& type,
-                                     const ErrorReporterPtr& errorReporter, bool readOnly, const string& value) :
-    PrimitiveData(errorReporter, readOnly), _factory(factory), _type(type)
-{
-    setValue(value);
-}
-
-FreezeScript::DataPtr
-FreezeScript::StringData::getMember(const string& member) const
-{
-    if(member == "length")
-    {
-        _length->setValue(static_cast<Ice::Long>(_value.size()), false);
-        return _length;
-    }
-
-    return 0;
-}
-
-bool
-FreezeScript::StringData::operator==(const Data& rhs) const
-{
-    return !operator!=(rhs);
-}
-
-bool
-FreezeScript::StringData::operator!=(const Data& rhs) const
-{
-    const StringData* s = dynamic_cast<const StringData*>(&rhs);
-    if(!s)
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _value != s->_value;
-}
-
-bool
-FreezeScript::StringData::operator<(const Data& rhs) const
-{
-    const StringData* s = dynamic_cast<const StringData*>(&rhs);
-    if(!s)
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _value < s->_value;
-}
-
-FreezeScript::DataPtr
-FreezeScript::StringData::clone() const
-{
-    return new StringData(_factory, _type, _errorReporter, _readOnly, _value);
-}
-
-Slice::TypePtr
-FreezeScript::StringData::getType() const
-{
-    return _type;
-}
-
-void
-FreezeScript::StringData::marshal(const Ice::OutputStreamPtr& out) const
-{
-    out->write(_value);
-}
-
-void
-FreezeScript::StringData::unmarshal(const Ice::InputStreamPtr& in)
-{
-    string val;
-    in->read(val);
-    setValue(val);
-}
-
-bool
-FreezeScript::StringData::booleanValue(bool) const
-{
-    _errorReporter->error("string cannot be converted to boolean");
-    return false;
-}
-
-Ice::Long
-FreezeScript::StringData::integerValue(bool) const
-{
-    _errorReporter->error("string cannot be converted to integer");
-    return 0;
-}
-
-double
-FreezeScript::StringData::doubleValue(bool) const
-{
-    _errorReporter->error("string cannot be converted to double");
-    return 0;
-}
-
-string
-FreezeScript::StringData::stringValue(bool) const
-{
-    return _value;
-}
-
-string
-FreezeScript::StringData::toString() const
-{
-    return _value;
-}
-
-void
-FreezeScript::StringData::visit(DataVisitor& visitor)
-{
-    visitor.visitString(this);
-}
-
-string
-FreezeScript::StringData::getValue() const
-{
-    return _value;
-}
-
-void
-FreezeScript::StringData::setValue(const string& v)
-{
-    _value = v;
-    _length = IntegerDataPtr::dynamicCast(_factory->createInteger(static_cast<Ice::Long>(_value.size()), true));
-}
-
-//
-// ProxyData
-//
-FreezeScript::ProxyData::ProxyData(const Slice::TypePtr& type, const Ice::CommunicatorPtr& communicator,
-                                   const ErrorReporterPtr& errorReporter, bool readOnly) :
-    Data(errorReporter, readOnly), _type(type), _communicator(communicator)
-{
-}
-
-FreezeScript::ProxyData::ProxyData(const Slice::TypePtr& type, const Ice::CommunicatorPtr& communicator,
-                                   const ErrorReporterPtr& errorReporter, bool readOnly, const Ice::ObjectPrx& value) :
-    Data(errorReporter, readOnly), _type(type), _communicator(communicator), _value(value)
-{
-}
-
-FreezeScript::DataPtr
-FreezeScript::ProxyData::getMember(const string& /*member*/) const
-{
-    // TODO: Support members (id, facet, etc.)?
-
-    return 0;
-}
-
-FreezeScript::DataPtr
-FreezeScript::ProxyData::getElement(const DataPtr&) const
-{
-    _errorReporter->error("element requested of proxy value");
-    return 0;
-}
-
-bool
-FreezeScript::ProxyData::operator==(const Data& rhs) const
-{
-    return !operator!=(rhs);
-}
-
-bool
-FreezeScript::ProxyData::operator!=(const Data& rhs) const
-{
-    const ProxyData* p = dynamic_cast<const ProxyData*>(&rhs);
-    if(!p)
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _value != p->_value;
-}
-
-bool
-FreezeScript::ProxyData::operator<(const Data& rhs) const
-{
-    const ProxyData* p = dynamic_cast<const ProxyData*>(&rhs);
-    if(!p)
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _value < p->_value;
-}
-
-FreezeScript::DataPtr
-FreezeScript::ProxyData::clone() const
-{
-    return new ProxyData(_type, _communicator, _errorReporter, _readOnly, _value);
-}
-
-Slice::TypePtr
-FreezeScript::ProxyData::getType() const
-{
-    return _type;
-}
-
-void
-FreezeScript::ProxyData::destroy()
-{
-}
-
-void
-FreezeScript::ProxyData::marshal(const Ice::OutputStreamPtr& out) const
-{
-    out->write(_value);
-}
-
-void
-FreezeScript::ProxyData::unmarshal(const Ice::InputStreamPtr& in)
-{
-    in->read(_value);
-}
-
-bool
-FreezeScript::ProxyData::booleanValue(bool) const
-{
-    _errorReporter->error("proxy cannot be converted to boolean");
-    return 0;
-}
-
-Ice::Long
-FreezeScript::ProxyData::integerValue(bool) const
-{
-    _errorReporter->error("proxy cannot be converted to integer");
-    return 0;
-}
-
-double
-FreezeScript::ProxyData::doubleValue(bool) const
-{
-    _errorReporter->error("proxy cannot be converted to double");
-    return 0;
-}
-
-string
-FreezeScript::ProxyData::stringValue(bool) const
-{
-    _errorReporter->error("proxy cannot be converted to string");
-    return string();
-}
-
-string
-FreezeScript::ProxyData::toString() const
-{
-    if(_value && _str.empty())
-    {
-        const_cast<string&>(_str) = _communicator->proxyToString(_value);
-    }
-    return _str;
-}
-
-void
-FreezeScript::ProxyData::visit(DataVisitor& visitor)
-{
-    visitor.visitProxy(this);
-}
-
-Ice::ObjectPrx
-FreezeScript::ProxyData::getValue() const
-{
-    return _value;
-}
-
-void
-FreezeScript::ProxyData::setValue(const string& str, bool fatal)
-{
-    try
-    {
-        _value = _communicator->stringToProxy(str);
-        _str = str;
-    }
-    catch(const Ice::LocalException&)
-    {
-        _errorReporter->conversionError(str, _type, fatal);
-    }
-}
-
-void
-FreezeScript::ProxyData::setValue(const Ice::ObjectPrx& v)
-{
-    _value = v;
-    _str.clear();
-}
-
-
-//
-// StructData
-//
-FreezeScript::StructData::StructData(const DataFactoryPtr& factory, const Slice::StructPtr& type,
-                                     const ErrorReporterPtr& errorReporter, bool readOnly) :
-    Data(errorReporter, readOnly), _type(type)
-{
-    Slice::DataMemberList members = type->dataMembers();
-    for(Slice::DataMemberList::iterator q = members.begin(); q != members.end(); ++q)
-    {
-        DataPtr value = factory->create((*q)->type(), _readOnly);
-        assert(value);
-        _members[(*q)->name()] = value;
-    }
-}
-
-FreezeScript::StructData::StructData(const Slice::StructPtr& type, const ErrorReporterPtr& errorReporter,
-                                     bool readOnly, const DataMemberMap& members) :
-    Data(errorReporter, readOnly), _type(type)
-{
-    for(DataMemberMap::const_iterator p = members.begin(); p != members.end(); ++p)
-    {
-        _members[p->first] = p->second->clone();
-    }
-}
-
-FreezeScript::DataPtr
-FreezeScript::StructData::getMember(const string& member) const
-{
-    DataMemberMap::const_iterator p = _members.find(member);
-    if(p != _members.end())
-    {
-        return p->second;
-    }
-
-    return 0;
-}
-
-FreezeScript::DataPtr
-FreezeScript::StructData::getElement(const DataPtr&) const
-{
-    _errorReporter->error("element requested of struct value");
-    return 0;
-}
-
-bool
-FreezeScript::StructData::operator==(const Data& rhs) const
-{
-    return !operator!=(rhs);
-}
-
-bool
-FreezeScript::StructData::operator!=(const Data& rhs) const
-{
-    const StructData* s = dynamic_cast<const StructData*>(&rhs);
-    if(!s || _type->scoped() != s->_type->scoped())
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    assert(_members.size() == s->_members.size());
-
-    for(DataMemberMap::const_iterator p = _members.begin(); p != _members.end(); ++p)
-    {
-        DataMemberMap::const_iterator q = s->_members.find(p->first);
-        assert(q != s->_members.end());
-
-        if(p->second != q->second)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-bool
-FreezeScript::StructData::operator<(const Data& rhs) const
-{
-    const StructData* s = dynamic_cast<const StructData*>(&rhs);
-    if(!s || _type->scoped() != s->_type->scoped())
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    assert(_members.size() == s->_members.size());
-
-    for(DataMemberMap::const_iterator p = _members.begin(); p != _members.end(); ++p)
-    {
-        DataMemberMap::const_iterator q = s->_members.find(p->first);
-        assert(q != s->_members.end());
-
-        if(p->second < q->second)
-        {
-            return true;
-        }
-        else if(q->second < p->second)
-        {
-            return false;
-        }
-    }
-
-    return false;
-}
-
-FreezeScript::DataPtr
-FreezeScript::StructData::clone() const
-{
-    return new StructData(_type, _errorReporter, _readOnly, _members);
-}
-
-Slice::TypePtr
-FreezeScript::StructData::getType() const
-{
-    return _type;
-}
-
-void
-FreezeScript::StructData::destroy()
-{
-    for(DataMemberMap::const_iterator p = _members.begin(); p != _members.end(); ++p)
-    {
-        p->second->destroy();
-    }
-}
-
-void
-FreezeScript::StructData::marshal(const Ice::OutputStreamPtr& out) const
-{
-    Slice::DataMemberList members = _type->dataMembers();
-    for(Slice::DataMemberList::iterator p = members.begin(); p != members.end(); ++p)
-    {
-        DataMemberMap::const_iterator q = _members.find((*p)->name());
-        assert(q != _members.end());
-        q->second->marshal(out);
-    }
-}
-
-void
-FreezeScript::StructData::unmarshal(const Ice::InputStreamPtr& in)
-{
-    Slice::DataMemberList members = _type->dataMembers();
-    for(Slice::DataMemberList::iterator p = members.begin(); p != members.end(); ++p)
-    {
-        DataMemberMap::const_iterator q = _members.find((*p)->name());
-        assert(q != _members.end());
-        q->second->unmarshal(in);
-    }
-}
-
-bool
-FreezeScript::StructData::booleanValue(bool) const
-{
-    _errorReporter->error("struct " + typeToString(_type) + " cannot be converted to boolean");
-    return 0;
-}
-
-Ice::Long
-FreezeScript::StructData::integerValue(bool) const
-{
-    _errorReporter->error("struct " + typeToString(_type) + " cannot be converted to integer");
-    return 0;
-}
-
-double
-FreezeScript::StructData::doubleValue(bool) const
-{
-    _errorReporter->error("struct " + typeToString(_type) + " cannot be converted to double");
-    return 0;
-}
-
-string
-FreezeScript::StructData::stringValue(bool) const
-{
-    _errorReporter->error("struct " + typeToString(_type) + " cannot be converted to string");
-    return string();
-}
-
-string
-FreezeScript::StructData::toString() const
-{
-    return stringValue();
-}
-
-void
-FreezeScript::StructData::visit(DataVisitor& visitor)
-{
-    visitor.visitStruct(this);
-}
-
-FreezeScript::DataMemberMap&
-FreezeScript::StructData::getMembers()
-{
-    return _members;
-}
-
-//
-// SequenceData
-//
-FreezeScript::SequenceData::SequenceData(const DataFactoryPtr& factory, const Slice::SequencePtr& type,
-                                         const ErrorReporterPtr& errorReporter, bool readOnly) :
-    Data(errorReporter, readOnly), _factory(factory), _type(type)
-{
-    _length = IntegerDataPtr::dynamicCast(_factory->createInteger(0, true));
-}
-
-FreezeScript::SequenceData::SequenceData(const DataFactoryPtr& factory, const Slice::SequencePtr& type,
-                                         const ErrorReporterPtr& errorReporter, bool readOnly,
-                                         const DataList& elements) :
-    Data(errorReporter, readOnly), _factory(factory), _type(type)
-{
-    for(DataList::const_iterator p = elements.begin(); p != elements.end(); ++p)
-    {
-        _elements.push_back((*p)->clone());
-    }
-    _length = IntegerDataPtr::dynamicCast(_factory->createInteger(static_cast<Ice::Long>(_elements.size()), true));
-}
-
-FreezeScript::DataPtr
-FreezeScript::SequenceData::getMember(const string& member) const
-{
-    if(member == "length")
-    {
-        _length->setValue(static_cast<Ice::Long>(_elements.size()), false);
-        return _length;
-    }
-
-    return 0;
-}
-
-FreezeScript::DataPtr
-FreezeScript::SequenceData::getElement(const DataPtr& element) const
-{
-    IntegerDataPtr i = IntegerDataPtr::dynamicCast(element);
-    if(!i)
-    {
-        _errorReporter->error("invalid sequence index type " + typeToString(element->getType()));
-    }
-
-    Ice::Long iv = i->integerValue();
-    if(iv < 0 || iv >= static_cast<Ice::Long>(_elements.size()))
-    {
-        _errorReporter->error("sequence index " + i->toString() + " out of range");
-    }
-
-    return _elements[static_cast<DataList::size_type>(iv)];
-}
-
-bool
-FreezeScript::SequenceData::operator==(const Data& rhs) const
-{
-    return !operator!=(rhs);
-}
-
-bool
-FreezeScript::SequenceData::operator!=(const Data& rhs) const
-{
-    const SequenceData* s = dynamic_cast<const SequenceData*>(&rhs);
-    if(!s || _type->scoped() != s->_type->scoped())
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _elements != s->_elements;
-}
-
-bool
-FreezeScript::SequenceData::operator<(const Data& rhs) const
-{
-    const SequenceData* s = dynamic_cast<const SequenceData*>(&rhs);
-    if(!s || _type->scoped() != s->_type->scoped())
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _elements < s->_elements;
-}
-
-FreezeScript::DataPtr
-FreezeScript::SequenceData::clone() const
-{
-    return new SequenceData(_factory, _type, _errorReporter, _readOnly, _elements);
-}
-
-Slice::TypePtr
-FreezeScript::SequenceData::getType() const
-{
-    return _type;
-}
-
-void
-FreezeScript::SequenceData::destroy()
-{
-    for(DataList::const_iterator p = _elements.begin(); p != _elements.end(); ++p)
-    {
-        (*p)->destroy();
-    }
-}
-
-void
-FreezeScript::SequenceData::marshal(const Ice::OutputStreamPtr& out) const
-{
-    out->writeSize(static_cast<int>(_elements.size()));
-    for(DataList::const_iterator p = _elements.begin(); p != _elements.end(); ++p)
-    {
-        (*p)->marshal(out);
-    }
-}
-
-void
-FreezeScript::SequenceData::unmarshal(const Ice::InputStreamPtr& in)
-{
-    Slice::TypePtr type = _type->type();
-    Ice::Int sz = in->readSize();
-    _elements.reserve(sz);
-    for(Ice::Int i = 0; i < sz; ++i)
-    {
-        DataPtr v = _factory->create(type, _readOnly);
-        v->unmarshal(in);
-        _elements.push_back(v);
-    }
-    _length->setValue(sz, false);
-}
-
-bool
-FreezeScript::SequenceData::booleanValue(bool) const
-{
-    _errorReporter->error("sequence " + typeToString(_type) + " cannot be converted to boolean");
-    return 0;
-}
-
-Ice::Long
-FreezeScript::SequenceData::integerValue(bool) const
-{
-    _errorReporter->error("sequence " + typeToString(_type) + " cannot be converted to integer");
-    return 0;
-}
-
-double
-FreezeScript::SequenceData::doubleValue(bool) const
-{
-    _errorReporter->error("sequence " + typeToString(_type) + " cannot be converted to double");
-    return 0;
-}
-
-string
-FreezeScript::SequenceData::stringValue(bool) const
-{
-    _errorReporter->error("sequence " + typeToString(_type) + " cannot be converted to string");
-    return string();
-}
-
-string
-FreezeScript::SequenceData::toString() const
-{
-    return stringValue();
-}
-
-void
-FreezeScript::SequenceData::visit(DataVisitor& visitor)
-{
-    visitor.visitSequence(this);
-}
-
-FreezeScript::DataList&
-FreezeScript::SequenceData::getElements()
-{
-    return _elements;
-}
-
-//
-// EnumData
-//
-FreezeScript::EnumData::EnumData(const Slice::EnumPtr& type, const ErrorReporterPtr& errorReporter, bool readOnly) :
-    Data(errorReporter, readOnly), _type(type), _value(0)
-{
-    _count = static_cast<int>(type->getEnumerators().size());
-}
-
-FreezeScript::EnumData::EnumData(const Slice::EnumPtr& type, const ErrorReporterPtr& errorReporter, bool readOnly,
-                                 Ice::Int value) :
-    Data(errorReporter, readOnly), _type(type), _value(value)
-{
-    _count = static_cast<int>(type->getEnumerators().size());
-}
-
-FreezeScript::DataPtr
-FreezeScript::EnumData::getMember(const string&) const
-{
-    return 0;
-}
-
-FreezeScript::DataPtr
-FreezeScript::EnumData::getElement(const DataPtr&) const
-{
-    _errorReporter->error("element requested of enum value");
-    return 0;
-}
-
-bool
-FreezeScript::EnumData::operator==(const Data& rhs) const
-{
-    return !operator!=(rhs);
-}
-
-bool
-FreezeScript::EnumData::operator!=(const Data& rhs) const
-{
-    const EnumData* e = dynamic_cast<const EnumData*>(&rhs);
-    if(!e || _type->scoped() != e->_type->scoped())
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _value != e->_value;
-}
-
-bool
-FreezeScript::EnumData::operator<(const Data& rhs) const
-{
-    const EnumData* e = dynamic_cast<const EnumData*>(&rhs);
-    if(!e || _type->scoped() != e->_type->scoped())
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _value < e->_value;
-}
-
-FreezeScript::DataPtr
-FreezeScript::EnumData::clone() const
-{
-    return new EnumData(_type, _errorReporter, _value);
-}
-
-Slice::TypePtr
-FreezeScript::EnumData::getType() const
-{
-    return _type;
-}
-
-void
-FreezeScript::EnumData::destroy()
-{
-}
-
-void
-FreezeScript::EnumData::marshal(const Ice::OutputStreamPtr& out) const
-{
-    if(_count <= 127)
-    {
-        out->write(static_cast<Ice::Byte>(_value));
-    }
-    else if(_count <= 32767)
-    {
-        out->write(static_cast<Ice::Short>(_value));
-    }
-    else
-    {
-        out->write(_value);
-    }
-}
-
-void
-FreezeScript::EnumData::unmarshal(const Ice::InputStreamPtr& in)
-{
-    if(_count <= 127)
-    {
-        Ice::Byte val;
-        in ->read(val);
-        _value = val & 0xff;
-    }
-    else if(_count <= 32767)
-    {
-        Ice::Short val;
-        in->read(val);
-        _value = val;
-    }
-    else
-    {
-        in->read(_value);
-    }
-}
-
-bool
-FreezeScript::EnumData::booleanValue(bool) const
-{
-    _errorReporter->error("enum " + typeToString(_type) + " cannot be converted to boolean");
-    return 0;
-}
-
-Ice::Long
-FreezeScript::EnumData::integerValue(bool convert) const
-{
-    if(convert)
-    {
-        return _value;
-    }
-    else
-    {
-        _errorReporter->error("enum " + typeToString(_type) + " cannot be converted to integer");
-        return 0;
-    }
-}
-
-double
-FreezeScript::EnumData::doubleValue(bool) const
-{
-    _errorReporter->error("enum " + typeToString(_type) + " cannot be converted to double");
-    return 0;
-}
-
-string
-FreezeScript::EnumData::stringValue(bool) const
-{
-    _errorReporter->error("enum " + typeToString(_type) + " cannot be converted to string");
-    return string();
-}
-
-string
-FreezeScript::EnumData::toString() const
-{
-    if(_name.empty())
-    {
-        Slice::EnumeratorList l = _type->getEnumerators();
-        Slice::EnumeratorList::const_iterator p = l.begin();
-        Ice::Int i = _value;
-        while(i > 0)
-        {
-            ++p;
-            assert(p != l.end());
-            --i;
-        }
-        const_cast<string&>(_name) = (*p)->name();
-    }
-    return _name;
-}
-
-void
-FreezeScript::EnumData::visit(DataVisitor& visitor)
-{
-    visitor.visitEnum(this);
-}
-
-Ice::Int
-FreezeScript::EnumData::getValue() const
-{
-    return _value;
-}
-
-bool
-FreezeScript::EnumData::setValue(Ice::Int v)
-{
-    if(v >= 0 && v < _count)
-    {
-        _value = v;
-        _name.clear();
-        return true;
-    }
-    return false;
-}
-
-bool
-FreezeScript::EnumData::setValueAsString(const string& v)
-{
-    Slice::EnumeratorList l = _type->getEnumerators();
-    Slice::EnumeratorList::const_iterator p;
-    Ice::Int i = 0;
-    for(p = l.begin(); p != l.end(); ++p, ++i)
-    {
-        if((*p)->name() == v)
-        {
-            _value = i;
-            _name = v;
-            break;
-        }
-    }
-    return p != l.end();
-}
-
-//
-// DictionaryData
-//
-FreezeScript::DictionaryData::DictionaryData(const DataFactoryPtr& factory, const Slice::DictionaryPtr& type,
-                                             const ErrorReporterPtr& errorReporter, bool readOnly) :
-    Data(errorReporter, readOnly), _factory(factory), _type(type)
-{
-    _length = IntegerDataPtr::dynamicCast(_factory->createInteger(0, true));
-}
-
-FreezeScript::DictionaryData::DictionaryData(const DataFactoryPtr& factory, const Slice::DictionaryPtr& type,
-                                             const ErrorReporterPtr& errorReporter, bool readOnly, const DataMap& m) :
-    Data(errorReporter, readOnly), _factory(factory), _type(type)
-{
-    for(DataMap::const_iterator p = m.begin(); p != m.end(); ++p)
-    {
-        _map.insert(DataMap::value_type(p->first->clone(), p->second->clone()));
-    }
-    _length = IntegerDataPtr::dynamicCast(_factory->createInteger(static_cast<Ice::Long>(_map.size()), true));
-}
-
-FreezeScript::DataPtr
-FreezeScript::DictionaryData::getMember(const string& member) const
-{
-    if(member == "length")
-    {
-        _length->setValue(static_cast<Ice::Long>(_map.size()), false);
-        return _length;
-    }
-
-    return 0;
-}
-
-FreezeScript::DataPtr
-FreezeScript::DictionaryData::getElement(const DataPtr& element) const
-{
-    DataMap::const_iterator p = _map.find(element);
-    if(p != _map.end())
-    {
-        return p->second;
-    }
-
-    return 0;
-}
-
-bool
-FreezeScript::DictionaryData::operator==(const Data& rhs) const
-{
-    return !operator!=(rhs);
-}
-
-bool
-FreezeScript::DictionaryData::operator!=(const Data& rhs) const
-{
-    const DictionaryData* d = dynamic_cast<const DictionaryData*>(&rhs);
-    if(!d || _type->scoped() != d->_type->scoped())
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _map != d->_map;
-}
-
-bool
-FreezeScript::DictionaryData::operator<(const Data& rhs) const
-{
-    const DictionaryData* d = dynamic_cast<const DictionaryData*>(&rhs);
-    if(!d || _type->scoped() != d->_type->scoped())
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-        assert(false);
-    }
-
-    return _map < d->_map;
-}
-
-FreezeScript::DataPtr
-FreezeScript::DictionaryData::clone() const
-{
-    return new DictionaryData(_factory, _type, _errorReporter, _readOnly, _map);
-}
-
-Slice::TypePtr
-FreezeScript::DictionaryData::getType() const
-{
-    return _type;
-}
-
-void
-FreezeScript::DictionaryData::destroy()
-{
-    for(DataMap::const_iterator p = _map.begin(); p != _map.end(); ++p)
-    {
-        p->first->destroy();
-        p->second->destroy();
-    }
-}
-
-void
-FreezeScript::DictionaryData::marshal(const Ice::OutputStreamPtr& out) const
-{
-    out->writeSize(static_cast<int>(_map.size()));
-    for(DataMap::const_iterator p = _map.begin(); p != _map.end(); ++p)
-    {
-        p->first->marshal(out);
-        p->second->marshal(out);
-    }
-}
-
-void
-FreezeScript::DictionaryData::unmarshal(const Ice::InputStreamPtr& in)
-{
-    Slice::TypePtr keyType = _type->keyType();
-    Slice::TypePtr valueType = _type->valueType();
-
-    Ice::Int sz = in->readSize();
-
-    for(Ice::Int i = 0; i < sz; ++i)
-    {
-        DataPtr key = _factory->create(keyType, _readOnly);
-        key->unmarshal(in);
-
-        DataPtr value = _factory->create(valueType, _readOnly);
-        value->unmarshal(in);
-
-        _map.insert(DataMap::value_type(key, value));
-    }
-
-    _length->setValue(static_cast<Ice::Long>(_map.size()), false);
-}
-
-bool
-FreezeScript::DictionaryData::booleanValue(bool) const
-{
-    _errorReporter->error("dictionary " + typeToString(_type) + " cannot be converted to boolean");
-    return 0;
-}
-
-Ice::Long
-FreezeScript::DictionaryData::integerValue(bool) const
-{
-    _errorReporter->error("dictionary " + typeToString(_type) + " cannot be converted to integer");
-    return 0;
-}
-
-double
-FreezeScript::DictionaryData::doubleValue(bool) const
-{
-    _errorReporter->error("dictionary " + typeToString(_type) + " cannot be converted to double");
-    return 0;
-}
-
-string
-FreezeScript::DictionaryData::stringValue(bool) const
-{
-    _errorReporter->error("dictionary " + typeToString(_type) + " cannot be converted to string");
-    return string();
-}
-
-string
-FreezeScript::DictionaryData::toString() const
-{
-    return stringValue();
-}
-
-void
-FreezeScript::DictionaryData::visit(DataVisitor& visitor)
-{
-    visitor.visitDictionary(this);
-}
-
-FreezeScript::DataMap&
-FreezeScript::DictionaryData::getElements()
-{
-    return _map;
-}
-
-//
-// ObjectData
-//
-FreezeScript::ObjectData::ObjectData(const DataFactoryPtr& factory, const Slice::TypePtr& type, bool readOnly) :
-    Data(factory->getErrorReporter(), readOnly), _type(type), _refCount(0)
-{
-    Slice::ClassDeclPtr decl = Slice::ClassDeclPtr::dynamicCast(type);
-    if(decl)
-    {
-        Slice::ClassDefPtr def = decl->definition();
-        assert(def);
-        Slice::DataMemberList members = def->allDataMembers();
-        for(Slice::DataMemberList::iterator p = members.begin(); p != members.end(); ++p)
-        {
-            _members[(*p)->name()] = factory->create((*p)->type(), _readOnly);
-        }
-        _id = factory->createString(decl->scoped(), true);
-    }
-    else
-    {
-        _id = factory->createString("::Ice::Object", true);
-    }
-}
-
-FreezeScript::DataPtr
-FreezeScript::ObjectData::getMember(const string& member) const
-{
-    if(member == "ice_id")
-    {
-        return _id;
-    }
-
-    DataMemberMap::const_iterator p = _members.find(member);
-    if(p != _members.end())
-    {
-        return p->second;
-    }
-
-    return 0;
-}
-
-FreezeScript::DataPtr
-FreezeScript::ObjectData::getElement(const DataPtr& /*element*/) const
-{
-    _errorReporter->error("element requested of object value");
-    return 0;
-}
-
-bool
-FreezeScript::ObjectData::operator==(const Data& rhs) const
-{
-    return !operator!=(rhs);
-}
-
-bool
-FreezeScript::ObjectData::operator!=(const Data& /*rhs*/) const
-{
-    _errorReporter->error("object comparison not supported");
-    return false;
-}
-
-bool
-FreezeScript::ObjectData::operator<(const Data& /*rhs*/) const
-{
-    _errorReporter->error("object comparison not supported");
-    return false;
-}
-
-FreezeScript::DataPtr
-FreezeScript::ObjectData::clone() const
-{
-    assert(false);
-    return 0;
-}
-
-Slice::TypePtr
-FreezeScript::ObjectData::getType() const
-{
-    return _type;
-}
-
-void
-FreezeScript::ObjectData::destroy()
-{
-    assert(false);
-}
-
-void
-FreezeScript::ObjectData::marshal(const Ice::OutputStreamPtr& out) const
-{
-    if(!_marshaler)
-    {
-        const_cast<Ice::ObjectPtr&>(_marshaler) = new ObjectWriter(const_cast<ObjectData*>(this));
-    }
-    out->writeObject(_marshaler);
-}
-
-void
-FreezeScript::ObjectData::unmarshal(const Ice::InputStreamPtr& /*in*/)
-{
-    //
-    // Unmarshaling is done by ObjectReader.
-    //
-    assert(false);
-}
-
-bool
-FreezeScript::ObjectData::booleanValue(bool) const
-{
-    assert(false);
-    return 0;
-}
-
-Ice::Long
-FreezeScript::ObjectData::integerValue(bool) const
-{
-    assert(false);
-    return 0;
-}
-
-double
-FreezeScript::ObjectData::doubleValue(bool) const
-{
-    assert(false);
-    return 0;
-}
-
-string
-FreezeScript::ObjectData::stringValue(bool) const
-{
-    assert(false);
-    return string();
-}
-
-string
-FreezeScript::ObjectData::toString() const
-{
-    assert(false);
-    return string();
-}
-
-void
-FreezeScript::ObjectData::visit(DataVisitor& /*visitor*/)
-{
-    assert(false);
-}
-
-FreezeScript::DataMemberMap&
-FreezeScript::ObjectData::getMembers()
-{
-    return _members;
-}
-
-void
-FreezeScript::ObjectData::incRef()
-{
-    _refCount++;
-}
-
-void
-FreezeScript::ObjectData::decRef()
-{
-    assert(_refCount > 0);
-    _refCount--;
-    if(_refCount == 0)
-    {
-        destroyI();
-    }
-}
-
-void
-FreezeScript::ObjectData::destroyI()
-{
-    DataMemberMap members = _members;
-
-    _members.clear();
-    _marshaler = 0;
-
-    for(DataMemberMap::const_iterator p = members.begin(); p != members.end(); ++p)
-    {
-        p->second->destroy();
-    }
-}
-
-//
-// ObjectRef
-//
-FreezeScript::ObjectRef::ObjectRef(const DataFactoryPtr& factory, const Slice::TypePtr& type, bool readOnly) :
-    Data(factory->getErrorReporter(), readOnly), _factory(factory), _type(type)
-{
-}
-
-FreezeScript::ObjectRef::ObjectRef(const DataFactoryPtr& factory, const Slice::TypePtr& type, bool readOnly,
-                                   const ObjectDataPtr& value) :
-    Data(factory->getErrorReporter(), readOnly), _factory(factory), _type(type), _value(value)
-{
-    _value->incRef();
-}
-
-FreezeScript::DataPtr
-FreezeScript::ObjectRef::getMember(const string& member) const
-{
-    if(!_value)
-    {
-        _errorReporter->error("member `" + member + "' requested of nil object");
-    }
-
-    return _value->getMember(member);
-}
-
-FreezeScript::DataPtr
-FreezeScript::ObjectRef::getElement(const DataPtr&) const
-{
-    _errorReporter->error("element requested of object value");
-    return 0;
-}
-
-bool
-FreezeScript::ObjectRef::operator==(const Data& rhs) const
-{
-    return !operator!=(rhs);
-}
-
-bool
-FreezeScript::ObjectRef::operator!=(const Data& rhs) const
-{
-    const ObjectRef* r = dynamic_cast<const ObjectRef*>(&rhs);
-    if(!r)
-    {
-        _errorReporter->typeMismatchError(_type, rhs.getType(), true);
-    }
-
-    //
-    // Reference comparison.
-    //
-    return _value.get() != r->_value.get();
-}
-
-bool
-FreezeScript::ObjectRef::operator<(const Data& /*rhs*/) const
-{
-    _errorReporter->error("object comparison not supported");
-    return false;
-}
-
-FreezeScript::DataPtr
-FreezeScript::ObjectRef::clone() const
-{
-    return new ObjectRef(_factory, _type, _value);
-}
-
-Slice::TypePtr
-FreezeScript::ObjectRef::getType() const
-{
-    return _type;
-}
-
-void
-FreezeScript::ObjectRef::destroy()
-{
-    if(_value)
-    {
-        _value->decRef();
-        _value = 0;
-    }
-}
-
-void
-FreezeScript::ObjectRef::marshal(const Ice::OutputStreamPtr& out) const
-{
-    if(!_value)
-    {
-        out->writeObject(0);
-        return;
-    }
-
-    _value->marshal(out);
-}
-
-FreezeScript::ReadObjectCallback::ReadObjectCallback(const ObjectRefPtr& ref) :
-    _ref(ref)
-{
-}
-
-void
-FreezeScript::ReadObjectCallback::invoke(const Ice::ObjectPtr& p)
-{
-    if(p)
-    {
-        ObjectReaderPtr reader = ObjectReaderPtr::dynamicCast(p);
-        assert(reader);
-
-        _ref->setValue(reader->getValue());
-    }
-}
-
-void
-FreezeScript::ObjectRef::unmarshal(const Ice::InputStreamPtr& in)
-{
-    in->readObject(new ReadObjectCallback(this));
-}
-
-bool
-FreezeScript::ObjectRef::booleanValue(bool) const
-{
-    _errorReporter->error(typeToString(_type) + " cannot be converted to boolean");
-    return 0;
-}
-
-Ice::Long
-FreezeScript::ObjectRef::integerValue(bool) const
-{
-    _errorReporter->error(typeToString(_type) + " cannot be converted to integer");
-    return 0;
-}
-
-double
-FreezeScript::ObjectRef::doubleValue(bool) const
-{
-    _errorReporter->error(typeToString(_type) + " cannot be converted to double");
-    return 0;
-}
-
-string
-FreezeScript::ObjectRef::stringValue(bool) const
-{
-    _errorReporter->error(typeToString(_type) + " cannot be converted to string");
-    return string();
-}
-
-string
-FreezeScript::ObjectRef::toString() const
-{
-    return stringValue();
-}
-
-void
-FreezeScript::ObjectRef::visit(DataVisitor& visitor)
-{
-    visitor.visitObject(this);
-}
-
-void
-FreezeScript::ObjectRef::instantiate()
-{
-    ObjectDataPtr data = new ObjectData(_factory, _type, _readOnly);
-    setValue(data);
-}
-
-FreezeScript::ObjectDataPtr
-FreezeScript::ObjectRef::getValue() const
-{
-    return _value;
-}
-
-void
-FreezeScript::ObjectRef::setValue(const ObjectDataPtr& value)
-{
-    // TODO: Type check?
-    ObjectDataPtr oldValue = _value;
-    _value = value;
-    if(_value)
-    {
-        _value->incRef();
-    }
-    if(oldValue)
-    {
-        oldValue->decRef();
-    }
-}
-
-//
-// ObjectFactory
-//
-Ice::ObjectPtr
-FreezeScript::ObjectFactory::create(const string& id)
-{
-    Ice::ObjectPtr result;
-
-    if(_factory)
-    {
-        if(id == Ice::Object::ice_staticId())
-        {
-            result = new ObjectReader(_factory, _unit->builtin(Slice::Builtin::KindObject));
-        }
-        else
-        {
-            Slice::TypeList l = _unit->lookupTypeNoBuiltin(id);
-            if(!l.empty())
-            {
-                Slice::ClassDeclPtr decl = Slice::ClassDeclPtr::dynamicCast(l.front());
-                if(!decl)
-                {
-                    _factory->getErrorReporter()->error("Slice definition for `" + id + "' is not a class");
-                }
-                Slice::ClassDefPtr def = decl->definition();
-                if(!def)
-                {
-                    _factory->getErrorReporter()->error("no class definition for `" + id + "'");
-                }
-                result = new ObjectReader(_factory, decl);
-            }
-        }
-    }
-
-    return result;
-}
-
-void
-FreezeScript::ObjectFactory::destroy()
-{
-}
-
-void
-FreezeScript::ObjectFactory::activate(const DataFactoryPtr& factory, const Slice::UnitPtr& unit)
-{
-    assert(!_factory && !_unit);
-    _factory = factory;
-    _unit = unit;
-}
-void
-FreezeScript::ObjectFactory::deactivate()
-{
-    _factory = 0;
-    _unit = 0;
-}
-
-//
-// DataVisitor
-//
-FreezeScript::DataVisitor::~DataVisitor()
-{
-}
-
-void
-FreezeScript::DataVisitor::visitBoolean(const BooleanDataPtr&)
-{
-}
-
-void
-FreezeScript::DataVisitor::visitInteger(const IntegerDataPtr&)
-{
-}
-
-void
-FreezeScript::DataVisitor::visitDouble(const DoubleDataPtr&)
-{
-}
-
-void
-FreezeScript::DataVisitor::visitString(const StringDataPtr&)
-{
-}
-
-void
-FreezeScript::DataVisitor::visitProxy(const ProxyDataPtr&)
-{
-}
-
-void
-FreezeScript::DataVisitor::visitStruct(const StructDataPtr&)
-{
-}
-
-void
-FreezeScript::DataVisitor::visitSequence(const SequenceDataPtr&)
-{
-}
-
-void
-FreezeScript::DataVisitor::visitEnum(const EnumDataPtr&)
-{
-}
-
-void
-FreezeScript::DataVisitor::visitDictionary(const DictionaryDataPtr&)
-{
-}
-
-void
-FreezeScript::DataVisitor::visitObject(const ObjectRefPtr&)
-{
-}
diff --git a/cpp/src/FreezeScript/Data.h b/cpp/src/FreezeScript/Data.h
deleted file mode 100644
index d3064729b7c..00000000000
--- a/cpp/src/FreezeScript/Data.h
+++ /dev/null
@@ -1,618 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_SCRIPT_DATA_H
-#define FREEZE_SCRIPT_DATA_H
-
-#include <Ice/Ice.h>
-#include <Slice/Parser.h>
-#include <FreezeScript/Error.h>
-
-namespace FreezeScript
-{
-
-class Data;
-typedef IceUtil::Handle<Data> DataPtr;
-
-class DataVisitor;
-
-typedef std::map<std::string, DataPtr> DataMemberMap;
-typedef std::vector<DataPtr> DataList;
-typedef std::map<DataPtr, DataPtr> DataMap;
-
-class ObjectWriter;
-class ObjectReader;
-
-class ObjectData;
-typedef IceUtil::Handle<ObjectData> ObjectDataPtr;
-
-class DataFactory : public IceUtil::SimpleShared
-{
-public:
-
-    DataFactory(const Ice::CommunicatorPtr&, const Slice::UnitPtr&, const ErrorReporterPtr&);
-
-    DataPtr create(const Slice::TypePtr&, bool);
-    DataPtr createBoolean(bool, bool);
-    DataPtr createInteger(Ice::Long, bool);
-    DataPtr createDouble(double, bool);
-    DataPtr createString(const std::string&, bool);
-    DataPtr createNil(bool);
-    DataPtr createObject(const Slice::TypePtr&, bool);
-
-    Slice::BuiltinPtr getBuiltin(Slice::Builtin::Kind) const;
-
-    Ice::CommunicatorPtr getCommunicator() const;
-    ErrorReporterPtr getErrorReporter() const;
-
-protected:
-
-    DataPtr createImpl(const Slice::TypePtr&, bool);
-
-    virtual void initialize(const DataPtr&);
-
-    Ice::CommunicatorPtr _communicator;
-    Slice::UnitPtr _unit; // Only used for creating builtin types.
-    ErrorReporterPtr _errorReporter;
-};
-typedef IceUtil::Handle<DataFactory> DataFactoryPtr;
-
-class Data : public IceUtil::SimpleShared
-{
-public:
-
-    virtual ~Data();
-
-    virtual DataPtr getMember(const std::string&) const = 0;
-    virtual DataPtr getElement(const DataPtr&) const = 0;
-
-    virtual bool operator==(const Data&) const = 0;
-    virtual bool operator!=(const Data&) const = 0;
-    virtual bool operator<(const Data&) const = 0;
-
-    virtual DataPtr clone() const = 0;
-
-    bool readOnly() const;
-    virtual Slice::TypePtr getType() const = 0;
-    virtual void destroy() = 0;
-
-    virtual void marshal(const Ice::OutputStreamPtr&) const = 0;
-    virtual void unmarshal(const Ice::InputStreamPtr&) = 0;
-
-    virtual bool booleanValue(bool = false) const = 0;
-    virtual Ice::Long integerValue(bool = false) const = 0;
-    virtual double doubleValue(bool = false) const = 0;
-    virtual std::string stringValue(bool = false) const = 0;
-    virtual std::string toString() const = 0;
-
-    virtual void visit(DataVisitor&) = 0;
-
-protected:
-
-    Data(const ErrorReporterPtr&, bool);
-
-    ErrorReporterPtr _errorReporter;
-    bool _readOnly;
-};
-
-class PrimitiveData : public Data
-{
-public:
-
-    virtual DataPtr getMember(const std::string&) const;
-    virtual DataPtr getElement(const DataPtr&) const;
-
-    virtual void destroy();
-
-protected:
-
-    PrimitiveData(const ErrorReporterPtr&, bool);
-};
-typedef IceUtil::Handle<PrimitiveData> PrimitiveDataPtr;
-
-class BooleanData : public PrimitiveData
-{
-public:
-
-    BooleanData(const Slice::BuiltinPtr&, const ErrorReporterPtr&, bool);
-    BooleanData(const Slice::BuiltinPtr&, const ErrorReporterPtr&, bool, bool);
-
-    virtual bool operator==(const Data&) const;
-    virtual bool operator!=(const Data&) const;
-    virtual bool operator<(const Data&) const;
-
-    virtual DataPtr clone() const;
-
-    virtual Slice::TypePtr getType() const;
-
-    virtual void marshal(const Ice::OutputStreamPtr&) const;
-    virtual void unmarshal(const Ice::InputStreamPtr&);
-
-    virtual bool booleanValue(bool = false) const;
-    virtual Ice::Long integerValue(bool = false) const;
-    virtual double doubleValue(bool = false) const;
-    virtual std::string stringValue(bool = false) const;
-    virtual std::string toString() const;
-
-    virtual void visit(DataVisitor&);
-
-    bool getValue() const;
-    void setValue(bool);
-
-private:
-
-    Slice::BuiltinPtr _type;
-    bool _value;
-};
-typedef IceUtil::Handle<BooleanData> BooleanDataPtr;
-
-class IntegerData : public PrimitiveData
-{
-public:
-
-    IntegerData(const Slice::BuiltinPtr&, const ErrorReporterPtr&, bool);
-    IntegerData(const Slice::BuiltinPtr&, const ErrorReporterPtr&, bool, Ice::Long);
-
-    virtual bool operator==(const Data&) const;
-    virtual bool operator!=(const Data&) const;
-    virtual bool operator<(const Data&) const;
-
-    virtual DataPtr clone() const;
-
-    virtual Slice::TypePtr getType() const;
-
-    virtual void marshal(const Ice::OutputStreamPtr&) const;
-    virtual void unmarshal(const Ice::InputStreamPtr&);
-
-    virtual bool booleanValue(bool = false) const;
-    virtual Ice::Long integerValue(bool = false) const;
-    virtual double doubleValue(bool = false) const;
-    virtual std::string stringValue(bool = false) const;
-    virtual std::string toString() const;
-
-    virtual void visit(DataVisitor&);
-
-    Ice::Long getValue() const;
-    void setValue(Ice::Long, bool);
-
-private:
-
-    bool rangeCheck(Ice::Long, bool) const;
-    static std::string toString(Ice::Long);
-
-    Slice::BuiltinPtr _type;
-    Ice::Long _value;
-};
-typedef IceUtil::Handle<IntegerData> IntegerDataPtr;
-
-class DoubleData : public PrimitiveData
-{
-public:
-
-    DoubleData(const Slice::BuiltinPtr&, const ErrorReporterPtr&, bool);
-    DoubleData(const Slice::BuiltinPtr&, const ErrorReporterPtr&, bool, double);
-
-    virtual bool operator==(const Data&) const;
-    virtual bool operator!=(const Data&) const;
-    virtual bool operator<(const Data&) const;
-
-    virtual DataPtr clone() const;
-
-    virtual Slice::TypePtr getType() const;
-
-    virtual void marshal(const Ice::OutputStreamPtr&) const;
-    virtual void unmarshal(const Ice::InputStreamPtr&);
-
-    virtual bool booleanValue(bool = false) const;
-    virtual Ice::Long integerValue(bool = false) const;
-    virtual double doubleValue(bool = false) const;
-    virtual std::string stringValue(bool = false) const;
-    virtual std::string toString() const;
-
-    virtual void visit(DataVisitor&);
-
-    double getValue() const;
-    void setValue(double);
-
-private:
-
-    Slice::BuiltinPtr _type;
-    double _value;
-};
-typedef IceUtil::Handle<DoubleData> DoubleDataPtr;
-
-class StringData : public PrimitiveData
-{
-public:
-
-    StringData(const DataFactoryPtr&, const Slice::BuiltinPtr&, const ErrorReporterPtr&, bool);
-    StringData(const DataFactoryPtr&, const Slice::BuiltinPtr&, const ErrorReporterPtr&, bool, const std::string&);
-
-    virtual DataPtr getMember(const std::string&) const;
-
-    virtual bool operator==(const Data&) const;
-    virtual bool operator!=(const Data&) const;
-    virtual bool operator<(const Data&) const;
-
-    virtual DataPtr clone() const;
-
-    virtual Slice::TypePtr getType() const;
-
-    virtual void marshal(const Ice::OutputStreamPtr&) const;
-    virtual void unmarshal(const Ice::InputStreamPtr&);
-
-    virtual bool booleanValue(bool = false) const;
-    virtual Ice::Long integerValue(bool = false) const;
-    virtual double doubleValue(bool = false) const;
-    virtual std::string stringValue(bool = false) const;
-    virtual std::string toString() const;
-
-    virtual void visit(DataVisitor&);
-
-    std::string getValue() const;
-    void setValue(const std::string&);
-
-private:
-
-    DataFactoryPtr _factory;
-    Slice::BuiltinPtr _type;
-    std::string _value;
-    IntegerDataPtr _length;
-};
-typedef IceUtil::Handle<StringData> StringDataPtr;
-
-class ProxyData : public Data
-{
-public:
-
-    ProxyData(const Slice::TypePtr&, const Ice::CommunicatorPtr&, const ErrorReporterPtr&, bool);
-    ProxyData(const Slice::TypePtr&, const Ice::CommunicatorPtr&, const ErrorReporterPtr&, bool, const Ice::ObjectPrx&);
-
-    virtual DataPtr getMember(const std::string&) const;
-    virtual DataPtr getElement(const DataPtr&) const;
-
-    virtual bool operator==(const Data&) const;
-    virtual bool operator!=(const Data&) const;
-    virtual bool operator<(const Data&) const;
-
-    virtual DataPtr clone() const;
-
-    virtual Slice::TypePtr getType() const;
-    virtual void destroy();
-
-    virtual void marshal(const Ice::OutputStreamPtr&) const;
-    virtual void unmarshal(const Ice::InputStreamPtr&);
-
-    virtual bool booleanValue(bool = false) const;
-    virtual Ice::Long integerValue(bool = false) const;
-    virtual double doubleValue(bool = false) const;
-    virtual std::string stringValue(bool = false) const;
-    virtual std::string toString() const;
-
-    virtual void visit(DataVisitor&);
-
-    Ice::ObjectPrx getValue() const;
-    void setValue(const std::string&, bool);
-    void setValue(const Ice::ObjectPrx&);
-
-private:
-
-    Slice::TypePtr _type; // Can be Builtin or Proxy
-    Ice::CommunicatorPtr _communicator;
-    Ice::ObjectPrx _value;
-    std::string _str;
-};
-typedef IceUtil::Handle<ProxyData> ProxyDataPtr;
-
-class StructData : public Data
-{
-public:
-
-    StructData(const DataFactoryPtr&, const Slice::StructPtr&, const ErrorReporterPtr&, bool);
-
-    virtual DataPtr getMember(const std::string&) const;
-    virtual DataPtr getElement(const DataPtr&) const;
-
-    virtual bool operator==(const Data&) const;
-    virtual bool operator!=(const Data&) const;
-    virtual bool operator<(const Data&) const;
-
-    virtual DataPtr clone() const;
-
-    virtual Slice::TypePtr getType() const;
-
-    virtual void marshal(const Ice::OutputStreamPtr&) const;
-    virtual void unmarshal(const Ice::InputStreamPtr&);
-
-    virtual void destroy();
-
-    virtual bool booleanValue(bool = false) const;
-    virtual Ice::Long integerValue(bool = false) const;
-    virtual double doubleValue(bool = false) const;
-    virtual std::string stringValue(bool = false) const;
-    virtual std::string toString() const;
-
-    virtual void visit(DataVisitor&);
-
-    DataMemberMap& getMembers();
-
-private:
-
-    StructData(const Slice::StructPtr&, const ErrorReporterPtr&, bool, const DataMemberMap&);
-
-    Slice::StructPtr _type;
-    DataMemberMap _members;
-};
-typedef IceUtil::Handle<StructData> StructDataPtr;
-
-class SequenceData : public Data
-{
-public:
-
-    SequenceData(const DataFactoryPtr&, const Slice::SequencePtr&, const ErrorReporterPtr&, bool);
-
-    virtual DataPtr getMember(const std::string&) const;
-    virtual DataPtr getElement(const DataPtr&) const;
-
-    virtual bool operator==(const Data&) const;
-    virtual bool operator!=(const Data&) const;
-    virtual bool operator<(const Data&) const;
-
-    virtual DataPtr clone() const;
-
-    virtual Slice::TypePtr getType() const;
-    virtual void destroy();
-
-    virtual void marshal(const Ice::OutputStreamPtr&) const;
-    virtual void unmarshal(const Ice::InputStreamPtr&);
-
-    virtual bool booleanValue(bool = false) const;
-    virtual Ice::Long integerValue(bool = false) const;
-    virtual double doubleValue(bool = false) const;
-    virtual std::string stringValue(bool = false) const;
-    virtual std::string toString() const;
-
-    virtual void visit(DataVisitor&);
-
-    DataList& getElements();
-
-private:
-
-    SequenceData(const DataFactoryPtr&, const Slice::SequencePtr&, const ErrorReporterPtr&, bool, const DataList&);
-
-    DataFactoryPtr _factory;
-    Slice::SequencePtr _type;
-    DataList _elements;
-    IntegerDataPtr _length;
-};
-typedef IceUtil::Handle<SequenceData> SequenceDataPtr;
-
-class EnumData : public Data
-{
-public:
-
-    EnumData(const Slice::EnumPtr&, const ErrorReporterPtr&, bool);
-    EnumData(const Slice::EnumPtr&, const ErrorReporterPtr&, bool, Ice::Int);
-
-    virtual DataPtr getMember(const std::string&) const;
-    virtual DataPtr getElement(const DataPtr&) const;
-
-    virtual bool operator==(const Data&) const;
-    virtual bool operator!=(const Data&) const;
-    virtual bool operator<(const Data&) const;
-
-    virtual DataPtr clone() const;
-
-    virtual Slice::TypePtr getType() const;
-    virtual void destroy();
-
-    virtual void marshal(const Ice::OutputStreamPtr&) const;
-    virtual void unmarshal(const Ice::InputStreamPtr&);
-
-    virtual bool booleanValue(bool = false) const;
-    virtual Ice::Long integerValue(bool = false) const;
-    virtual double doubleValue(bool = false) const;
-    virtual std::string stringValue(bool = false) const;
-    virtual std::string toString() const;
-
-    virtual void visit(DataVisitor&);
-
-    Ice::Int getValue() const;
-    bool setValue(Ice::Int);
-    bool setValueAsString(const std::string&);
-
-private:
-
-    Slice::EnumPtr _type;
-    Ice::Int _value;
-    std::string _name;
-    Ice::Int _count;
-};
-typedef IceUtil::Handle<EnumData> EnumDataPtr;
-
-class DictionaryData : public Data
-{
-public:
-
-    DictionaryData(const DataFactoryPtr&, const Slice::DictionaryPtr&, const ErrorReporterPtr&, bool);
-
-    virtual DataPtr getMember(const std::string&) const;
-    virtual DataPtr getElement(const DataPtr&) const;
-
-    virtual bool operator==(const Data&) const;
-    virtual bool operator!=(const Data&) const;
-    virtual bool operator<(const Data&) const;
-
-    virtual DataPtr clone() const;
-
-    virtual Slice::TypePtr getType() const;
-    virtual void destroy();
-
-    virtual void marshal(const Ice::OutputStreamPtr&) const;
-    virtual void unmarshal(const Ice::InputStreamPtr&);
-
-    virtual bool booleanValue(bool = false) const;
-    virtual Ice::Long integerValue(bool = false) const;
-    virtual double doubleValue(bool = false) const;
-    virtual std::string stringValue(bool = false) const;
-    virtual std::string toString() const;
-
-    virtual void visit(DataVisitor&);
-
-    DataMap& getElements();
-
-private:
-
-    DictionaryData(const DataFactoryPtr&, const Slice::DictionaryPtr&, const ErrorReporterPtr&, bool, const DataMap&);
-
-    DataFactoryPtr _factory;
-    Slice::DictionaryPtr _type;
-    DataMap _map;
-    IntegerDataPtr _length;
-};
-typedef IceUtil::Handle<DictionaryData> DictionaryDataPtr;
-
-class ObjectData : public Data
-{
-public:
-
-    ObjectData(const DataFactoryPtr&, const Slice::TypePtr&, bool);
-
-    virtual DataPtr getMember(const std::string&) const;
-    virtual DataPtr getElement(const DataPtr&) const;
-
-    virtual bool operator==(const Data&) const;
-    virtual bool operator!=(const Data&) const;
-    virtual bool operator<(const Data&) const;
-
-    virtual DataPtr clone() const;
-
-    virtual Slice::TypePtr getType() const;
-    virtual void destroy();
-
-    virtual void marshal(const Ice::OutputStreamPtr&) const;
-    virtual void unmarshal(const Ice::InputStreamPtr&);
-
-    virtual bool booleanValue(bool = false) const;
-    virtual Ice::Long integerValue(bool = false) const;
-    virtual double doubleValue(bool = false) const;
-    virtual std::string stringValue(bool = false) const;
-    virtual std::string toString() const;
-
-    virtual void visit(DataVisitor&);
-
-    DataMemberMap& getMembers();
-
-    void incRef();
-    void decRef();
-
-private:
-
-    void destroyI();
-
-    Slice::TypePtr _type; // Can be Builtin (Object) or ClassDecl
-    DataPtr _facetMap;
-    DataMemberMap _members;
-    Ice::ObjectPtr _marshaler;
-    Ice::Int _refCount;
-    DataPtr _id;
-
-    friend class ObjectWriter;
-    friend class ObjectReader;
-};
-
-class ObjectRef : public Data
-{
-public:
-
-    ObjectRef(const DataFactoryPtr&, const Slice::TypePtr&, bool);
-    ObjectRef(const DataFactoryPtr&, const Slice::TypePtr&, bool, const ObjectDataPtr&);
-
-    virtual DataPtr getMember(const std::string&) const;
-    virtual DataPtr getElement(const DataPtr&) const;
-
-    virtual bool operator==(const Data&) const;
-    virtual bool operator!=(const Data&) const;
-    virtual bool operator<(const Data&) const;
-
-    virtual DataPtr clone() const;
-
-    virtual Slice::TypePtr getType() const;
-    virtual void destroy();
-
-    virtual void marshal(const Ice::OutputStreamPtr&) const;
-    virtual void unmarshal(const Ice::InputStreamPtr&);
-
-    virtual bool booleanValue(bool = false) const;
-    virtual Ice::Long integerValue(bool = false) const;
-    virtual double doubleValue(bool = false) const;
-    virtual std::string stringValue(bool = false) const;
-    virtual std::string toString() const;
-
-    virtual void visit(DataVisitor&);
-
-    void instantiate();
-    ObjectDataPtr getValue() const;
-    void setValue(const ObjectDataPtr&);
-
-private:
-
-    DataFactoryPtr _factory;
-    Slice::TypePtr _type; // Formal type: can be Builtin (Object) or ClassDecl
-    ObjectDataPtr _value;
-};
-typedef IceUtil::Handle<ObjectRef> ObjectRefPtr;
-
-class ObjectFactory : public Ice::ObjectFactory
-{
-public:
-
-    virtual Ice::ObjectPtr create(const std::string&);
-    virtual void destroy();
-
-    void activate(const DataFactoryPtr&, const Slice::UnitPtr&);
-    void deactivate();
-
-private:
-
-    DataFactoryPtr _factory;
-    Slice::UnitPtr _unit;
-};
-typedef IceUtil::Handle<ObjectFactory> ObjectFactoryPtr;
-
-class ClassNotFoundException
-{
-public:
-
-    ClassNotFoundException(const std::string& s) : id(s) {}
-
-    std::string id;
-};
-
-class DataVisitor
-{
-public:
-
-    virtual ~DataVisitor();
-
-    virtual void visitBoolean(const BooleanDataPtr&);
-    virtual void visitInteger(const IntegerDataPtr&);
-    virtual void visitDouble(const DoubleDataPtr&);
-    virtual void visitString(const StringDataPtr&);
-    virtual void visitProxy(const ProxyDataPtr&);
-    virtual void visitStruct(const StructDataPtr&);
-    virtual void visitSequence(const SequenceDataPtr&);
-    virtual void visitEnum(const EnumDataPtr&);
-    virtual void visitDictionary(const DictionaryDataPtr&);
-    virtual void visitObject(const ObjectRefPtr&);
-};
-
-} // End of namespace FreezeScript
-
-#endif
diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp
deleted file mode 100644
index fabc06e7029..00000000000
--- a/cpp/src/FreezeScript/DumpDB.cpp
+++ /dev/null
@@ -1,980 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/DumpDescriptors.h>
-#include <FreezeScript/Util.h>
-#include <FreezeScript/Exception.h>
-#include <Freeze/Initialize.h>
-#include <Freeze/Connection.h>
-#include <IceUtil/OutputUtil.h>
-#include <IceUtil/Options.h>
-#include <IceUtil/FileUtil.h>
-#include <db_cxx.h>
-#include <sys/stat.h>
-#include <algorithm>
-
-using namespace std;
-using namespace IceUtil;
-using namespace IceUtilInternal;
-
-#ifdef _WIN32
-#   define FREEZE_SCRIPT_DB_MODE 0
-#else
-#   define FREEZE_SCRIPT_DB_MODE (S_IRUSR | S_IWUSR)
-#endif
-
-namespace FreezeScript
-{
-
-//
-// SliceVisitor generates default descriptors.
-//
-class SliceVisitor : public Slice::ParserVisitor
-{
-public:
-
-    SliceVisitor(IceUtilInternal::XMLOutput&, const Slice::TypePtr&, const Slice::TypePtr&, const string&);
-
-    virtual bool visitClassDefStart(const Slice::ClassDefPtr&);
-    virtual bool visitStructStart(const Slice::StructPtr&);
-    virtual void visitSequence(const Slice::SequencePtr&);
-    virtual void visitDictionary(const Slice::DictionaryPtr&);
-    virtual void visitEnum(const Slice::EnumPtr&);
-
-private:
-
-    IceUtilInternal::XMLOutput& _out;
-};
-
-class DescriptorHandler : public IceXML::Handler
-{
-public:
-
-    DescriptorHandler(const DataFactoryPtr&, const Slice::UnitPtr&, const ErrorReporterPtr&,
-                      const FreezeScript::ObjectFactoryPtr&);
-
-    virtual void startElement(const std::string&, const IceXML::Attributes&, int, int);
-    virtual void endElement(const std::string&, int, int);
-    virtual void characters(const std::string&, int, int);
-    virtual void error(const std::string&, int, int);
-
-    DumpDBDescriptorPtr descriptor() const;
-
-private:
-
-    DataFactoryPtr _factory;
-    Slice::UnitPtr _unit;
-    ErrorReporterPtr _errorReporter;
-    DescriptorPtr _current;
-    DumpDBDescriptorPtr _descriptor;
-    FreezeScript::ObjectFactoryPtr _objectFactory;
-};
-
-}
-
-static void
-usage(const string& n)
-{
-    cerr << "Usage:\n";
-    cerr << "\n";
-    cerr << n << " [options] dbenv db\n";
-    cerr << n << " -c dbenv [db]\n";
-    cerr << "\n";
-    cerr <<
-        "Options:\n"
-        "-h, --help            Show this message.\n"
-        "-v, --version         Display the Ice version.\n"
-        "-DNAME                Define NAME as 1.\n"
-        "-DNAME=DEF            Define NAME as DEF.\n"
-        "-UNAME                Remove any definition for NAME.\n"
-        "-IDIR                 Put DIR in the include file search path.\n"
-        "-d, --debug           Print debug messages.\n"
-        "--ice                 Permit `Ice' prefix (for building Ice source code only).\n"
-        "--underscore          Permit underscores in Slice identifiers.\n"
-        "-o FILE               Output sample descriptors into the file FILE.\n"
-        "-f FILE               Execute the descriptors in the file FILE.\n"
-        "--load SLICE          Load Slice definitions from the file SLICE.\n"
-        "-e                    Indicates the database is an Evictor database.\n"
-        "--key TYPE            Specifies the Slice type of the database key.\n"
-        "--value TYPE          Specifies the Slice type of the database value.\n"
-        "--select EXPR         Dump a record only if EXPR is true.\n"
-        "-c, --catalog         Display information about the databases in an\n"
-        "                      environment, or about a particular database.\n"
-        ;
-}
-
-static void
-printCatalogData(const string& dbName, const Freeze::CatalogData& data)
-{
-    cout << dbName << ": ";
-    if(data.evictor)
-    {
-        cout << "Evictor database" << endl;
-    }
-    else
-    {
-        cout << "Map database" << endl;
-        cout << "  key type   = " << data.key << endl;
-        cout << "  value type = " << data.value << endl;
-    }
-}
-
-static int
-run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator,
-    const FreezeScript::CompactIdResolverIPtr& resolver)
-{
-    vector<string> cppArgs;
-    bool debug;
-    bool ice = true; // Needs to be true in order to create default definitions.
-    bool underscore;
-    string outputFile;
-    string inputFile;
-    vector<string> slice;
-    bool evictor;
-    string keyTypeName;
-    string valueTypeName;
-    string selectExpr;
-    string dbEnvName, dbName;
-    const string appName = originalArgs[0];
-    IceUtilInternal::Options opts;
-    opts.addOpt("h", "help");
-    opts.addOpt("v", "version");
-    opts.addOpt("D", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("U", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("I", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("d", "debug");
-    opts.addOpt("", "ice");
-    opts.addOpt("", "underscore");
-    opts.addOpt("o", "", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("f", "", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "load", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("e");
-    opts.addOpt("", "key", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "value", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "select", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("c", "catalog");
-
-    vector<string> args;
-    try
-    {
-        args = opts.parse(originalArgs);
-    }
-    catch(const IceUtilInternal::BadOptException& e)
-    {
-        cerr << appName << ": " << e.reason << endl;
-        usage(appName);
-        return EXIT_FAILURE;
-    }
-
-    //
-    // Freeze creates a lock file by default to prevent multiple processes from opening
-    // the same database environment simultaneously. In the case of a read-only program
-    // such as dumpdb, however, we still want to be able to open the environment despite
-    // the lock. This assumes of course that the other process has opened the environment
-    // with DbPrivate=0. If DbPrivate=0 is also set for dumpdb, we disable the lock.
-    //
-    if(!args.empty())
-    {
-        //
-        // If an argument is present, we assume it is the name of the database environment.
-        //
-        Ice::PropertiesPtr props = communicator->getProperties();
-        string prefix = "Freeze.DbEnv." + args[0];
-        if(props->getPropertyAsIntWithDefault(prefix + ".DbPrivate", 1) <= 0)
-        {
-            props->setProperty(prefix + ".LockFile", "0");
-        }
-    }
-
-    if(opts.isSet("h"))
-    {
-        usage(appName);
-        return EXIT_SUCCESS;
-    }
-    if(opts.isSet("version"))
-    {
-        cout << ICE_STRING_VERSION << endl;
-        return EXIT_SUCCESS;
-    }
-    if(opts.isSet("c"))
-    {
-        if(args.empty())
-        {
-            cerr << appName << ": no database environment specified." << endl;
-            usage(appName);
-            return EXIT_FAILURE;
-        }
-        else if(args.size() > 2)
-        {
-            usage(appName);
-            return EXIT_FAILURE;
-        }
-        try
-        {
-            FreezeScript::CatalogDataMap catalog = FreezeScript::readCatalog(communicator, args[0]);
-            if(args.size() == 1)
-            {
-                if(catalog.empty())
-                {
-                    cout << "Catalog is empty." << endl;
-                }
-                else
-                {
-                    cout << "Catalog contents:" << endl;
-                    for(FreezeScript::CatalogDataMap::const_iterator p = catalog.begin(); p != catalog.end(); ++p)
-                    {
-                        cout << endl;
-                        printCatalogData(p->first, p->second);
-                    }
-                }
-            }
-            else
-            {
-                FreezeScript::CatalogDataMap::const_iterator p = catalog.find(args[1]);
-                if(p == catalog.end())
-                {
-                    cerr << appName << ": database `" << args[1] << "' not found in environment `" << args[0] << "'."
-                         << endl;
-                    return EXIT_FAILURE;
-                }
-                else
-                {
-                    printCatalogData(p->first, p->second);
-                }
-            }
-            return EXIT_SUCCESS;
-        }
-        catch(const FreezeScript::FailureException& ex)
-        {
-            cerr << appName << ": " << ex.reason() << endl;
-            return EXIT_FAILURE;
-        }
-    }
-    if(opts.isSet("D"))
-    {
-        vector<string> optargs = opts.argVec("D");
-        for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-        {
-            cppArgs.push_back("-D" + *i);
-        }
-    }
-    if(opts.isSet("U"))
-    {
-        vector<string> optargs = opts.argVec("U");
-        for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-        {
-            cppArgs.push_back("-U" + *i);
-        }
-    }
-    if(opts.isSet("I"))
-    {
-        vector<string> optargs = opts.argVec("I");
-        for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-        {
-            cppArgs.push_back("-I" + *i);
-        }
-    }
-    debug = opts.isSet("debug");
-
-    // No need to set --ice option here -- it is always true.
-
-    underscore = opts.isSet("underscore");
-
-    if(opts.isSet("o"))
-    {
-        outputFile = opts.optArg("o");
-    }
-    if(opts.isSet("f"))
-    {
-        inputFile = opts.optArg("f");
-    }
-    if(opts.isSet("load"))
-    {
-        vector<string> optArgs = opts.argVec("load");
-        for(vector<string>::const_iterator i = optArgs.begin(); i != optArgs.end(); ++i)
-        {
-            slice.push_back(*i);
-        }
-    }
-    evictor = opts.isSet("e");
-    if(opts.isSet("key"))
-    {
-        keyTypeName = opts.optArg("key");
-    }
-    if(opts.isSet("value"))
-    {
-        valueTypeName = opts.optArg("value");
-    }
-    if(opts.isSet("select"))
-    {
-        selectExpr = opts.optArg("select");
-    }
-
-    if(outputFile.empty() && args.size() != 2)
-    {
-        usage(appName);
-        return EXIT_FAILURE;
-    }
-
-    if(!args.empty())
-    {
-        dbEnvName = args[0];
-    }
-    if(args.size() == 2)
-    {
-        dbName = args[1];
-    }
-    else
-    {
-        usage(appName);
-        return EXIT_FAILURE;
-    }
-
-    if(!inputFile.empty() && !selectExpr.empty())
-    {
-        cerr << appName << ": an input file cannot be specified with --select" << endl;
-        return EXIT_FAILURE;
-    }
-
-    Slice::UnitPtr unit = Slice::Unit::createUnit(true, true, ice, underscore);
-    FreezeScript::Destroyer<Slice::UnitPtr> unitD(unit);
-    if(!FreezeScript::parseSlice(appName, unit, slice, cppArgs, debug, "-D__DUMPDB__"))
-    {
-        return EXIT_FAILURE;
-    }
-
-    FreezeScript::createEvictorSliceTypes(unit);
-
-    FreezeScript::collectCompactIds(unit, resolver);
-
-    //
-    // If no input file was provided, then we need to generate default descriptors.
-    //
-    string descriptors;
-    if(inputFile.empty())
-    {
-        const string evictorKeyTypeName = "::Ice::Identity";
-        const string oldEvictorValueTypeName = "::Freeze::ObjectRecord";
-        const string newEvictorValueTypeName = "Object";
-
-        if((!keyTypeName.empty() && valueTypeName.empty()) || (keyTypeName.empty() && !valueTypeName.empty() && !evictor))
-        {
-            cerr << appName << ": a key type and a value type must be specified" << endl;
-            usage(appName);
-            return EXIT_FAILURE;
-        }
-        else if(valueTypeName.empty())
-        {
-            try
-            {
-                FreezeScript::CatalogDataMap catalog = FreezeScript::readCatalog(communicator, dbEnvName);
-                FreezeScript::CatalogDataMap::iterator p = catalog.find(dbName);
-                if(p == catalog.end())
-                {
-                    cerr << appName << ": database `" << dbName << "' not found in catalog." << endl;
-                    cerr << "Current catalog databases:" << endl;
-                    for(p = catalog.begin(); p != catalog.end(); ++p)
-                    {
-                        cerr << "  " << p->first << endl;
-                    }
-                    return EXIT_FAILURE;
-                }
-                else
-                {
-                    if(p->second.evictor)
-                    {
-                        evictor = true;
-                    }
-                    keyTypeName = p->second.key;
-                    valueTypeName = p->second.value;
-
-                    if(evictor && valueTypeName.empty())
-                    {
-                        valueTypeName = oldEvictorValueTypeName;
-                    }
-                }
-            }
-            catch(const FreezeScript::FailureException& ex)
-            {
-                cerr << appName << ": " << ex.reason() << endl;
-                return EXIT_FAILURE;
-            }
-        }
-
-        if(evictor)
-        {
-            if(keyTypeName.empty())
-            {
-                keyTypeName = evictorKeyTypeName;
-            }
-            if(valueTypeName.empty())
-            {
-                valueTypeName = newEvictorValueTypeName;
-            }
-        }
-
-        Slice::TypePtr keyType, valueType;
-        Slice::TypeList l;
-
-        l = unit->lookupType(keyTypeName, false);
-        if(l.empty())
-        {
-            cerr << appName << ": unknown key type `" << keyTypeName << "'" << endl;
-            return EXIT_FAILURE;
-        }
-        keyType = l.front();
-
-        l = unit->lookupType(valueTypeName, false);
-        if(l.empty())
-        {
-            cerr << appName << ": unknown value type `" << valueTypeName << "'" << endl;
-            return EXIT_FAILURE;
-        }
-        valueType = l.front();
-
-        ostringstream os;
-        IceUtilInternal::XMLOutput out(os);
-
-        out << se("dumpdb");
-
-        FreezeScript::SliceVisitor visitor(out, keyType, valueType, selectExpr);
-        unit->visit(&visitor, false);
-
-        out << ee;
-
-        descriptors = os.str();
-
-        if(!outputFile.empty())
-        {
-            IceUtilInternal::ofstream of(outputFile);
-            if(!of.good())
-            {
-                cerr << appName << ": unable to open file `" << outputFile << "'" << endl;
-                return EXIT_FAILURE;
-            }
-            of << descriptors << endl;
-            of.close();
-            return EXIT_SUCCESS;
-        }
-    }
-    else
-    {
-        IceUtilInternal::ifstream in(inputFile);
-        char buff[1024];
-        while(true)
-        {
-            in.read(buff, 1024);
-            descriptors.append(buff, static_cast<size_t>(in.gcount()));
-            if(in.gcount() < 1024)
-            {
-                break;
-            }
-        }
-        in.close();
-    }
-    FreezeScript::ObjectFactoryPtr objectFactory = new FreezeScript::ObjectFactory;
-    communicator->addObjectFactory(objectFactory, "");
-
-    DbEnv dbEnv(0);
-    DbTxn* txn = 0;
-    Freeze::ConnectionPtr connection;
-    int status = EXIT_SUCCESS;
-    try
-    {
-#ifdef _WIN32
-        //
-        // Berkeley DB may use a different C++ runtime.
-        //
-        dbEnv.set_alloc(::malloc, ::realloc, ::free);
-#endif
-
-        //
-        // Open the database environment and start a transaction.
-        //
-        {
-            u_int32_t flags = DB_THREAD | DB_CREATE | DB_INIT_TXN | DB_INIT_MPOOL;
-            dbEnv.open(dbEnvName.c_str(), flags, FREEZE_SCRIPT_DB_MODE);
-        }
-
-        //
-        // We're creating a connection just to make sure the database environment
-        // isn't locked.
-        //
-        connection = Freeze::createConnection(communicator, dbEnvName, dbEnv);
-
-        dbEnv.txn_begin(0, &txn, 0);
-
-        FreezeScript::ErrorReporterPtr errorReporter = new FreezeScript::ErrorReporter(cerr, false);
-        try
-        {
-            FreezeScript::DataFactoryPtr factory = new FreezeScript::DataFactory(communicator, unit, errorReporter);
-            FreezeScript::DescriptorHandler dh(factory, unit, errorReporter, objectFactory);
-
-            istringstream istr(descriptors);
-            IceXML::Parser::parse(istr, dh);
-
-            FreezeScript::DumpDBDescriptorPtr descriptor = dh.descriptor();
-            descriptor->validate();
-
-            if(evictor)
-            {
-                //
-                // The evictor database file contains multiple databases. We must first
-                // determine the names of those databases, ignoring any whose names
-                // begin with "$index:". Each database represents a separate facet, with
-                // the facet name used as the database name. The database named "$default"
-                // represents the main object.
-                //
-                vector<string> dbNames;
-                {
-                    Db db(&dbEnv, 0);
-                    db.open(txn, dbName.c_str(), 0, DB_UNKNOWN, DB_RDONLY, 0);
-                    Dbt dbKey, dbValue;
-                    dbKey.set_flags(DB_DBT_MALLOC);
-                    dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-                    Dbc* dbc = 0;
-                    db.cursor(txn, &dbc, 0);
-
-                    while(dbc->get(&dbKey, &dbValue, DB_NEXT) == 0)
-                    {
-                        string s(static_cast<char*>(dbKey.get_data()), dbKey.get_size());
-                        if(s.find("$index:") != 0)
-                        {
-                            dbNames.push_back(s);
-                        }
-                        free(dbKey.get_data());
-                    }
-
-                    dbc->close();
-                    db.close(0);
-                }
-
-                //
-                // Dump each database.
-                //
-                for(vector<string>::iterator p = dbNames.begin(); p != dbNames.end(); ++p)
-                {
-                    string name = *p;
-                    string facet = (name == "$default" ? string("") : name);
-                    Db db(&dbEnv, 0);
-                    db.open(txn, dbName.c_str(), name.c_str(), DB_BTREE, DB_RDONLY, FREEZE_SCRIPT_DB_MODE);
-                    descriptor->dump(communicator, &db, txn, facet);
-                    db.close(0);
-                }
-            }
-            else
-            {
-                //
-                // Dump a map database.
-                //
-                Db db(&dbEnv, 0);
-                db.open(txn, dbName.c_str(), 0, DB_BTREE, DB_RDONLY, FREEZE_SCRIPT_DB_MODE);
-                descriptor->dump(communicator, &db, txn, "");
-                db.close(0);
-            }
-        }
-        catch(const IceXML::ParserException& ex)
-        {
-            errorReporter->error(ex.reason());
-        }
-    }
-    catch(const DbException& ex)
-    {
-        cerr << appName << ": database error: " << ex.what() << endl;
-        status = EXIT_FAILURE;
-    }
-    catch(...)
-    {
-        try
-        {
-            if(txn)
-            {
-                txn->abort();
-            }
-            dbEnv.close(0);
-        }
-        catch(const DbException& ex)
-        {
-            cerr << appName << ": database error: " << ex.what() << endl;
-        }
-        if(connection)
-        {
-            connection->close();
-            connection = 0;
-        }
-        throw;
-    }
-
-    try
-    {
-        if(txn)
-        {
-            txn->abort();
-        }
-        if(connection)
-        {
-            connection->close();
-        }
-        dbEnv.close(0);
-    }
-    catch(const DbException& ex)
-    {
-        cerr << appName << ": database error: " << ex.what() << endl;
-        status = EXIT_FAILURE;
-    }
-
-    return status;
-}
-
-#ifdef _WIN32
-
-int
-wmain(int argc, wchar_t* argv[])
-
-#else
-
-int
-main(int argc, char* argv[])
-
-#endif
-{
-    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
-    assert(args.size() > 0);
-    const string appName = args[0];
-
-    Ice::InitializationData initData;
-    FreezeScript::CompactIdResolverIPtr resolver = new FreezeScript::CompactIdResolverI;
-    initData.compactIdResolver = resolver;
-
-    Ice::CommunicatorPtr communicator;
-    int status = EXIT_SUCCESS;
-    try
-    {
-        communicator = Ice::initialize(args, initData);
-        status = run(args, communicator, resolver);
-    }
-    catch(const FreezeScript::FailureException& ex)
-    {
-        string reason = ex.reason();
-        cerr << appName << ": " << reason;
-        if(reason[reason.size() - 1] != '\n')
-        {
-            cerr << endl;
-        }
-        return EXIT_FAILURE;
-    }
-    catch(const std::exception& ex)
-    {
-        cerr << appName << ": " << ex.what() << endl;
-        status = EXIT_FAILURE;
-    }
-    catch(...)
-    {
-        cerr << appName << ": unknown error" << endl;
-        return EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
-
-//
-// SliceVisitor
-//
-FreezeScript::SliceVisitor::SliceVisitor(IceUtilInternal::XMLOutput& out, const Slice::TypePtr& keyType,
-                                         const Slice::TypePtr& valueType, const string& selectExpr) :
-    _out(out)
-{
-    out << se("database") << attr("key", typeToString(keyType)) << attr("value", typeToString(valueType));
-    out << se("record");
-    if(!selectExpr.empty())
-    {
-        out << se("if") << attr("test", selectExpr);
-        out << se("echo") << attr("message", "Key: ") << attr("value", "key") << ee;
-        out << se("echo") << attr("message", "Value: ") << attr("value", "value") << ee;
-        out << ee;
-    }
-    else
-    {
-        out << se("echo") << attr("message", "Key: ") << attr("value", "key") << ee;
-        out << se("echo") << attr("message", "Value: ") << attr("value", "value") << ee;
-    }
-    out << ee;
-    out << ee;
-}
-
-bool
-FreezeScript::SliceVisitor::visitClassDefStart(const Slice::ClassDefPtr& v)
-{
-    if(v->isInterface() || v->isLocal())
-    {
-        return false;
-    }
-
-    string scoped = v->scoped();
-    if(ignoreType(scoped))
-    {
-        return false;
-    }
-
-    _out.newline();
-    _out.newline();
-    _out << "<!-- class " << scoped << " -->";
-    _out << se("dump") << attr("type", scoped) << ee;
-
-    return false;
-}
-
-bool
-FreezeScript::SliceVisitor::visitStructStart(const Slice::StructPtr& v)
-{
-    if(v->isLocal())
-    {
-        return false;
-    }
-
-    string scoped = v->scoped();
-    if(ignoreType(scoped))
-    {
-        return false;
-    }
-
-    _out.newline();
-    _out.newline();
-    _out << "<!-- struct " << scoped << " -->";
-    _out << se("dump") << attr("type", scoped) << ee;
-
-    return false;
-}
-
-void
-FreezeScript::SliceVisitor::visitSequence(const Slice::SequencePtr& v)
-{
-    if(v->isLocal())
-    {
-        return;
-    }
-
-    string scoped = v->scoped();
-    if(ignoreType(scoped))
-    {
-        return;
-    }
-
-    _out.newline();
-    _out.newline();
-    _out << "<!-- sequence " << scoped << " -->";
-    _out << se("dump") << attr("type", scoped) << ee;
-}
-
-void
-FreezeScript::SliceVisitor::visitDictionary(const Slice::DictionaryPtr& v)
-{
-    if(v->isLocal())
-    {
-        return;
-    }
-
-    string scoped = v->scoped();
-    if(ignoreType(scoped))
-    {
-        return;
-    }
-
-    _out.newline();
-    _out.newline();
-    _out << "<!-- dictionary " << scoped << " -->";
-    _out << se("dump") << attr("type", scoped) << ee;
-}
-
-void
-FreezeScript::SliceVisitor::visitEnum(const Slice::EnumPtr& v)
-{
-    if(v->isLocal())
-    {
-        return;
-    }
-
-    string scoped = v->scoped();
-    if(ignoreType(scoped))
-    {
-        return;
-    }
-
-    _out.newline();
-    _out.newline();
-    _out << "<!-- enum " << scoped << " -->";
-    _out << se("dump") << attr("type", scoped) << ee;
-}
-
-//
-// DescriptorHandler
-//
-FreezeScript::DescriptorHandler::DescriptorHandler(const DataFactoryPtr& factory, const Slice::UnitPtr& unit,
-                                                   const ErrorReporterPtr& errorReporter,
-                                                   const FreezeScript::ObjectFactoryPtr& objectFactory) :
-    _factory(factory), _unit(unit), _errorReporter(errorReporter), _objectFactory(objectFactory)
-{
-}
-
-void
-FreezeScript::DescriptorHandler::startElement(const string& name, const IceXML::Attributes& attributes, int line,
-                                              int /*column*/)
-{
-    DescriptorPtr d;
-
-    if(name == "dumpdb")
-    {
-        if(_current)
-        {
-            _errorReporter->descriptorError("<dumpdb> must be the top-level element", line);
-        }
-
-        _descriptor = new DumpDBDescriptor(line, _factory, _errorReporter, attributes, _unit);
-        d = _descriptor;
-    }
-    else if(name == "database")
-    {
-        if(!_current)
-        {
-            _errorReporter->descriptorError("<database> must be a child of <dumpdb>", line);
-        }
-
-        d = new DatabaseDescriptor(_current, line, _factory, _errorReporter, attributes, _unit);
-    }
-    else if(name == "record")
-    {
-        if(!_current)
-        {
-            _errorReporter->descriptorError("<record> must be a child of <database>", line);
-        }
-
-        d = new RecordDescriptor(_current, line, _factory, _errorReporter, attributes, _unit, _objectFactory);
-    }
-    else if(name == "dump")
-    {
-        if(!_current)
-        {
-            _errorReporter->descriptorError("<dump> must be a child of <dumpdb>", line);
-        }
-
-        d = new DumpDescriptor(_current, line, _factory, _errorReporter, attributes, _unit);
-    }
-    else if(name == "set")
-    {
-        if(!_current)
-        {
-            _errorReporter->descriptorError("<set> cannot be a top-level element", line);
-        }
-
-        d = new SetDescriptor(_current, line, _factory, _errorReporter, attributes);
-    }
-    else if(name == "define")
-    {
-        if(!_current)
-        {
-            _errorReporter->descriptorError("<define> cannot be a top-level element", line);
-        }
-
-        d = new DefineDescriptor(_current, line, _factory, _errorReporter, attributes, _unit);
-    }
-    else if(name == "add")
-    {
-        if(!_current)
-        {
-            _errorReporter->descriptorError("<add> cannot be a top-level element", line);
-        }
-
-        d = new AddDescriptor(_current, line, _factory, _errorReporter, attributes);
-    }
-    else if(name == "remove")
-    {
-        if(!_current)
-        {
-            _errorReporter->descriptorError("<remove> cannot be a top-level element", line);
-        }
-
-        d = new RemoveDescriptor(_current, line, _factory, _errorReporter, attributes);
-    }
-    else if(name == "fail")
-    {
-        if(!_current)
-        {
-            _errorReporter->descriptorError("<fail> cannot be a top-level element", line);
-        }
-
-        d = new FailDescriptor(_current, line, _factory, _errorReporter, attributes);
-    }
-    else if(name == "echo")
-    {
-        if(!_current)
-        {
-            _errorReporter->descriptorError("<echo> cannot be a top-level element", line);
-        }
-
-        d = new EchoDescriptor(_current, line, _factory, _errorReporter, attributes, cout);
-    }
-    else if(name == "if")
-    {
-        if(!_current)
-        {
-            _errorReporter->descriptorError("<if> cannot be a top-level element", line);
-        }
-
-        d = new IfDescriptor(_current, line, _factory, _errorReporter, attributes);
-    }
-    else if(name == "iterate")
-    {
-        if(!_current)
-        {
-            _errorReporter->descriptorError("<iterate> cannot be a top-level element", line);
-        }
-
-        d = new IterateDescriptor(_current, line, _factory, _errorReporter, attributes);
-    }
-    else
-    {
-        _errorReporter->descriptorError("unknown descriptor `" + name + "'", line);
-    }
-
-    if(_current)
-    {
-        _current->addChild(d);
-    }
-    _current = d;
-}
-
-void
-FreezeScript::DescriptorHandler::endElement(const std::string&, int, int)
-{
-    assert(_current);
-    _current = _current->parent();
-}
-
-void
-FreezeScript::DescriptorHandler::characters(const std::string&, int, int)
-{
-}
-
-void
-FreezeScript::DescriptorHandler::error(const std::string& msg, int line, int)
-{
-    _errorReporter->descriptorError(msg, line);
-}
-
-FreezeScript::DumpDBDescriptorPtr
-FreezeScript::DescriptorHandler::descriptor() const
-{
-    return _descriptor;
-}
diff --git a/cpp/src/FreezeScript/DumpDB.rc b/cpp/src/FreezeScript/DumpDB.rc
deleted file mode 100644
index 219a374dbe3..00000000000
--- a/cpp/src/FreezeScript/DumpDB.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "Dump Freeze Database\0"
-            VALUE "FileVersion", "3.6.3\0"
-            VALUE "InternalName", "dumpdb\0"
-            VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
-            VALUE "OriginalFilename", "dumpdb.exe\0"
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
diff --git a/cpp/src/FreezeScript/DumpDescriptors.cpp b/cpp/src/FreezeScript/DumpDescriptors.cpp
deleted file mode 100644
index 8b193f80d36..00000000000
--- a/cpp/src/FreezeScript/DumpDescriptors.cpp
+++ /dev/null
@@ -1,1953 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/DumpDescriptors.h>
-#include <FreezeScript/AssignVisitor.h>
-#include <FreezeScript/Print.h>
-#include <FreezeScript/Functions.h>
-#include <FreezeScript/Exception.h>
-#include <FreezeScript/Util.h>
-#include <IceUtil/InputUtil.h>
-#include <db_cxx.h>
-#include <set>
-#include <climits>
-
-using namespace std;
-
-namespace FreezeScript
-{
-
-class SymbolTableI;
-typedef IceUtil::Handle<SymbolTableI> SymbolTableIPtr;
-
-class SymbolTableI : public SymbolTable
-{
-public:
-
-    SymbolTableI(const DataFactoryPtr&, const Slice::UnitPtr&, const ErrorReporterPtr&, ExecuteInfo*,
-                 const SymbolTablePtr& = SymbolTablePtr());
-
-    virtual void add(const string&, const DataPtr&);
-
-    virtual DataPtr getValue(const EntityNodePtr&) const;
-
-    virtual DataPtr getConstantValue(const string&) const;
-
-    virtual SymbolTablePtr createChild();
-
-    virtual Slice::TypePtr lookupType(const string&);
-
-    virtual DataPtr invokeFunction(const string&, const DataPtr&, const DataList&);
-
-private:
-
-    DataPtr findValue(const string&) const;
-
-    class EntityVisitor : public EntityNodeVisitor
-    {
-    public:
-
-        EntityVisitor(SymbolTableI*);
-
-        virtual void visitIdentifier(const string&);
-        virtual void visitElement(const NodePtr&);
-
-        DataPtr getCurrent() const;
-
-    private:
-
-        SymbolTableI* _table;
-        DataPtr _current;
-        bool _error;
-    };
-
-    friend class EntityVisitor;
-
-    DataFactoryPtr _factory;
-    Slice::UnitPtr _unit;
-    ErrorReporterPtr _errorReporter;
-    ExecuteInfo* _info;
-    SymbolTablePtr _parent;
-    typedef map<string, DataPtr> DataMap;
-    DataMap _dataMap;
-    DataMap _constantCache;
-};
-
-typedef map<string, DumpDescriptorPtr> DumpMap;
-
-struct ExecuteInfo
-{
-    Ice::CommunicatorPtr communicator;
-    Db* db;
-    DbTxn* txn;
-    string facet;
-    SymbolTablePtr symbolTable;
-    DumpMap dumpMap;
-    Slice::TypePtr keyType;
-    Slice::TypePtr valueType;
-};
-
-class DumpVisitor : public DataVisitor
-{
-public:
-
-    DumpVisitor(const DataFactoryPtr&, const Slice::UnitPtr&, const ErrorReporterPtr&, ExecuteInfo*);
-
-    virtual void visitBoolean(const BooleanDataPtr&);
-    virtual void visitInteger(const IntegerDataPtr&);
-    virtual void visitDouble(const DoubleDataPtr&);
-    virtual void visitString(const StringDataPtr&);
-    virtual void visitProxy(const ProxyDataPtr&);
-    virtual void visitStruct(const StructDataPtr&);
-    virtual void visitSequence(const SequenceDataPtr&);
-    virtual void visitEnum(const EnumDataPtr&);
-    virtual void visitDictionary(const DictionaryDataPtr&);
-    virtual void visitObject(const ObjectRefPtr&);
-
-private:
-
-    //
-    // Returns true if the contents of the data should be visited.
-    //
-    bool dump(const DataPtr&);
-
-    DataFactoryPtr _factory;
-    Slice::UnitPtr _unit;
-    ErrorReporterPtr _errorReporter;
-    ExecuteInfo* _info;
-    set<const ObjectData*> _objectHistory;
-};
-
-} // End of namespace FreezeScript
-
-//
-// Descriptor
-//
-FreezeScript::Descriptor::Descriptor(const DescriptorPtr& parent, int line, const DataFactoryPtr& factory,
-                                     const ErrorReporterPtr& errorReporter) :
-    _parent(parent), _line(line), _factory(factory), _errorReporter(errorReporter)
-{
-}
-
-FreezeScript::Descriptor::~Descriptor()
-{
-}
-
-FreezeScript::DescriptorPtr
-FreezeScript::Descriptor::parent() const
-{
-    return _parent;
-}
-
-FreezeScript::NodePtr
-FreezeScript::Descriptor::parse(const string& expr) const
-{
-    return parseExpression(expr, _factory, _errorReporter);
-}
-
-Slice::TypePtr
-FreezeScript::Descriptor::findType(const Slice::UnitPtr& u, const string& type)
-{
-    Slice::TypeList l;
-
-    l = u->lookupType(type, false);
-    if(l.empty())
-    {
-        _errorReporter->error("unknown type `" + type + "'");
-    }
-
-    return l.front();
-}
-
-//
-// SetDescriptor
-//
-FreezeScript::SetDescriptor::SetDescriptor(const DescriptorPtr& parent, int line, const DataFactoryPtr& factory,
-                                           const ErrorReporterPtr& errorReporter,
-                                           const IceXML::Attributes& attributes) :
-    Descriptor(parent, line, factory, errorReporter)
-{
-    DescriptorErrorContext ctx(_errorReporter, "set", _line);
-
-    IceXML::Attributes::const_iterator p;
-
-    p = attributes.find("target");
-    if(p == attributes.end())
-    {
-        _errorReporter->error("required attribute `target' is missing");
-    }
-    NodePtr node = parse(p->second);
-    _target = EntityNodePtr::dynamicCast(node);
-    if(!_target)
-    {
-        _errorReporter->error("`target' attribute is not an entity: `" + p->second + "'");
-    }
-
-    p = attributes.find("value");
-    if(p != attributes.end())
-    {
-        _valueStr = p->second;
-    }
-
-    p = attributes.find("length");
-    if(p != attributes.end())
-    {
-        _lengthStr = p->second;
-    }
-
-    p = attributes.find("convert");
-    if(p != attributes.end())
-    {
-        _convert = p->second == "true";
-    }
-
-    if(_valueStr.empty() && _lengthStr.empty())
-    {
-        _errorReporter->error("requires a value for attributes `value' or 'length'");
-    }
-
-    if(!_valueStr.empty())
-    {
-        _value = parse(_valueStr);
-    }
-
-    if(!_lengthStr.empty())
-    {
-        _length = parse(_lengthStr);
-    }
-}
-
-void
-FreezeScript::SetDescriptor::addChild(const DescriptorPtr&)
-{
-    DescriptorErrorContext ctx(_errorReporter, "set", _line);
-    _errorReporter->error("child elements are not supported");
-}
-
-void
-FreezeScript::SetDescriptor::validate()
-{
-}
-
-void
-FreezeScript::SetDescriptor::execute(const SymbolTablePtr& sym, ExecuteInfo*)
-{
-    DescriptorErrorContext ctx(_errorReporter, "set", _line);
-
-    DataPtr data = sym->getValue(_target);
-    if(data->readOnly())
-    {
-        ostringstream ostr;
-        ostr << _target;
-        _errorReporter->error("target `" + ostr.str() + "' cannot be modified");
-    }
-
-    DataPtr value;
-    if(_value)
-    {
-        try
-        {
-            value = _value->evaluate(sym);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _errorReporter->error("evaluation of value `" + _valueStr + "' failed:\n" + ex.reason());
-        }
-    }
-
-    DataPtr length;
-    if(_length)
-    {
-        SequenceDataPtr seq = SequenceDataPtr::dynamicCast(data);
-        if(!seq)
-        {
-            ostringstream ostr;
-            ostr << _target;
-            _errorReporter->error("value `" + ostr.str() + "' is not a sequence");
-        }
-
-        try
-        {
-            length = _length->evaluate(sym);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _errorReporter->error("evaluation of length `" + _lengthStr + "' failed:\n" + ex.reason());
-        }
-
-        DataList& elements = seq->getElements();
-        Ice::Long l = length->integerValue();
-        if(l < 0 || l > INT_MAX)
-        {
-            _errorReporter->error("sequence length " + length->toString() + " is out of range");
-        }
-
-        DataList::size_type len = static_cast<DataList::size_type>(l);
-        if(len < elements.size())
-        {
-            for(DataList::size_type i = len; i < elements.size(); ++i)
-            {
-                elements[i]->destroy();
-            }
-            elements.resize(len);
-        }
-        else if(len > elements.size())
-        {
-            Slice::SequencePtr seqType = Slice::SequencePtr::dynamicCast(seq->getType());
-            assert(seqType);
-            Slice::TypePtr elemType = seqType->type();
-            for(DataList::size_type i = elements.size(); i < len; ++i)
-            {
-                DataPtr v = _factory->create(elemType, false);
-                if(value)
-                {
-                    AssignVisitor visitor(value, _factory, _errorReporter, _convert);
-                    v->visit(visitor);
-                }
-                elements.push_back(v);
-            }
-        }
-    }
-    else
-    {
-        AssignVisitor visitor(value, _factory, _errorReporter, _convert);
-        data->visit(visitor);
-    }
-}
-
-//
-// DefineDescriptor
-//
-FreezeScript::DefineDescriptor::DefineDescriptor(const DescriptorPtr& parent, int line, const DataFactoryPtr& factory,
-                                                 const ErrorReporterPtr& errorReporter,
-                                                 const IceXML::Attributes& attributes, const Slice::UnitPtr& unit) :
-    Descriptor(parent, line, factory, errorReporter)
-{
-    DescriptorErrorContext ctx(_errorReporter, "define", _line);
-
-    IceXML::Attributes::const_iterator p;
-
-    p = attributes.find("name");
-    if(p == attributes.end())
-    {
-        _errorReporter->error("required attribute `name' is missing");
-    }
-    _name = p->second;
-
-    p = attributes.find("type");
-    if(p == attributes.end())
-    {
-        _errorReporter->error("required attribute `type' is missing");
-    }
-    _type = findType(unit, p->second);
-
-    p = attributes.find("value");
-    if(p != attributes.end())
-    {
-        _valueStr = p->second;
-    }
-
-    p = attributes.find("convert");
-    if(p != attributes.end())
-    {
-        _convert = p->second == "true";
-    }
-
-    if(!_valueStr.empty())
-    {
-        _value = parse(_valueStr);
-    }
-}
-
-void
-FreezeScript::DefineDescriptor::addChild(const DescriptorPtr&)
-{
-    DescriptorErrorContext ctx(_errorReporter, "define", _line);
-    _errorReporter->error("child elements are not supported");
-}
-
-void
-FreezeScript::DefineDescriptor::validate()
-{
-}
-
-void
-FreezeScript::DefineDescriptor::execute(const SymbolTablePtr& sym, ExecuteInfo*)
-{
-    DescriptorErrorContext ctx(_errorReporter, "define", _line);
-
-    DataPtr data = _factory->create(_type, false);
-
-    DataPtr value;
-    if(_value)
-    {
-        try
-        {
-            value = _value->evaluate(sym);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _errorReporter->error("evaluation of value `" + _valueStr + "' failed:\n" + ex.reason());
-        }
-    }
-
-    if(value)
-    {
-        AssignVisitor visitor(value, _factory, _errorReporter, _convert);
-        data->visit(visitor);
-    }
-
-    sym->add(_name, data);
-}
-
-//
-// AddDescriptor
-//
-FreezeScript::AddDescriptor::AddDescriptor(const DescriptorPtr& parent, int line, const DataFactoryPtr& factory,
-                                           const ErrorReporterPtr& errorReporter,
-                                           const IceXML::Attributes& attributes) :
-    Descriptor(parent, line, factory, errorReporter)
-{
-    DescriptorErrorContext ctx(_errorReporter, "add", _line);
-
-    IceXML::Attributes::const_iterator p;
-
-    string target;
-    p = attributes.find("target");
-    if(p == attributes.end())
-    {
-        _errorReporter->error("required attribute `target' is missing");
-    }
-    target = p->second;
-
-    p = attributes.find("key");
-    if(p != attributes.end())
-    {
-        _keyStr = p->second;
-    }
-
-    p = attributes.find("index");
-    if(p != attributes.end())
-    {
-        _indexStr = p->second;
-    }
-
-    p = attributes.find("value");
-    if(p != attributes.end())
-    {
-        _valueStr = p->second;
-    }
-
-    p = attributes.find("convert");
-    if(p != attributes.end())
-    {
-        _convert = p->second == "true";
-    }
-
-    NodePtr node = parse(target);
-    _target = EntityNodePtr::dynamicCast(node);
-    if(!_target)
-    {
-        _errorReporter->error("`target' attribute is not an entity: `" + target + "'");
-    }
-
-    if(!_keyStr.empty() && !_indexStr.empty())
-    {
-        _errorReporter->error("attributes `key' and `index' are mutually exclusive");
-    }
-
-    if(_keyStr.empty() && _indexStr.empty())
-    {
-        _errorReporter->error("one of attributes `key' or `index' is required");
-    }
-
-    if(!_keyStr.empty())
-    {
-        _key = parse(_keyStr);
-    }
-
-    if(!_indexStr.empty())
-    {
-        _index = parse(_indexStr);
-    }
-
-    if(!_valueStr.empty())
-    {
-        _value = parse(_valueStr);
-    }
-}
-
-void
-FreezeScript::AddDescriptor::addChild(const DescriptorPtr&)
-{
-    DescriptorErrorContext ctx(_errorReporter, "add", _line);
-    _errorReporter->error("child elements are not supported");
-}
-
-void
-FreezeScript::AddDescriptor::validate()
-{
-}
-
-void
-FreezeScript::AddDescriptor::execute(const SymbolTablePtr& sym, ExecuteInfo*)
-{
-    DescriptorErrorContext ctx(_errorReporter, "add", _line);
-
-    DataPtr data = sym->getValue(_target);
-    if(data->readOnly())
-    {
-        ostringstream ostr;
-        ostr << _target;
-        _errorReporter->error("target `" + ostr.str() + "' cannot be modified");
-    }
-
-    if(_key)
-    {
-        DictionaryDataPtr dict = DictionaryDataPtr::dynamicCast(data);
-        if(!dict)
-        {
-            ostringstream ostr;
-            ostr << _target;
-            _errorReporter->error("target `" + ostr.str() + "' is not a dictionary");
-        }
-
-        Slice::DictionaryPtr type = Slice::DictionaryPtr::dynamicCast(dict->getType());
-        assert(type);
-
-        DataPtr key;
-        Destroyer<DataPtr> keyDestroyer;
-        try
-        {
-            DataPtr v = _key->evaluate(sym);
-            key = _factory->create(type->keyType(), false);
-            keyDestroyer.set(key);
-            AssignVisitor visitor(v, _factory, _errorReporter, _convert);
-            key->visit(visitor);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _errorReporter->error("evaluation of key `" + _keyStr + "' failed:\n" + ex.reason());
-        }
-
-        if(dict->getElement(key))
-        {
-            ostringstream ostr;
-            printData(key, ostr);
-            _errorReporter->error("key " + ostr.str() + " already exists in dictionary");
-        }
-
-        DataPtr elem = _factory->create(type->valueType(), false);
-        Destroyer<DataPtr> elemDestroyer(elem);
-
-        DataPtr value;
-        if(_value)
-        {
-            try
-            {
-                value = _value->evaluate(sym);
-            }
-            catch(const EvaluateException& ex)
-            {
-                _errorReporter->error("evaluation of value `" + _valueStr + "' failed:\n" + ex.reason());
-            }
-        }
-
-        if(value)
-        {
-            AssignVisitor visitor(value, _factory, _errorReporter, _convert);
-            elem->visit(visitor);
-        }
-        DataMap& map = dict->getElements();
-        map.insert(DataMap::value_type(key, elem));
-        keyDestroyer.release();
-        elemDestroyer.release();
-    }
-    else
-    {
-        assert(_index);
-
-        SequenceDataPtr seq = SequenceDataPtr::dynamicCast(data);
-        if(!seq)
-        {
-            ostringstream ostr;
-            ostr << _target;
-            _errorReporter->error("target `" + ostr.str() + "' is not a sequence");
-        }
-
-        Slice::SequencePtr type = Slice::SequencePtr::dynamicCast(seq->getType());
-        assert(type);
-
-        DataPtr index;
-        Destroyer<DataPtr> indexDestroyer;
-        try
-        {
-            index = _index->evaluate(sym);
-            indexDestroyer.set(index);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _errorReporter->error("evaluation of index `" + _indexStr + "' failed:\n" + ex.reason());
-        }
-
-        DataList& elements = seq->getElements();
-        Ice::Long l = index->integerValue();
-        DataList::size_type i = static_cast<DataList::size_type>(l);
-        if(l < 0 || l > INT_MAX || i > elements.size())
-        {
-            _errorReporter->error("sequence index " + index->toString() + " is out of range");
-        }
-
-        DataPtr elem = _factory->create(type->type(), false);
-        Destroyer<DataPtr> elemDestroyer(elem);
-
-        DataPtr value;
-        if(_value)
-        {
-            try
-            {
-                value = _value->evaluate(sym);
-            }
-            catch(const EvaluateException& ex)
-            {
-                _errorReporter->error("evaluation of value `" + _valueStr + "' failed:\n" + ex.reason());
-            }
-        }
-
-        if(value)
-        {
-            AssignVisitor visitor(value, _factory, _errorReporter, _convert);
-            elem->visit(visitor);
-        }
-
-        elements.insert(elements.begin() + i, elem);
-        indexDestroyer.release();
-        elemDestroyer.release();
-    }
-}
-
-//
-// RemoveDescriptor
-//
-FreezeScript::RemoveDescriptor::RemoveDescriptor(const DescriptorPtr& parent, int line, const DataFactoryPtr& factory,
-                                                 const ErrorReporterPtr& errorReporter,
-                                                 const IceXML::Attributes& attributes) :
-    Descriptor(parent, line, factory, errorReporter)
-{
-    DescriptorErrorContext ctx(_errorReporter, "remove", _line);
-
-    IceXML::Attributes::const_iterator p;
-
-    string target;
-    p = attributes.find("target");
-    if(p == attributes.end())
-    {
-        _errorReporter->error("required attribute `target' is missing");
-    }
-    target = p->second;
-
-    p = attributes.find("key");
-    if(p != attributes.end())
-    {
-        _keyStr = p->second;
-    }
-
-    p = attributes.find("index");
-    if(p != attributes.end())
-    {
-        _indexStr = p->second;
-    }
-
-    if(!_keyStr.empty() && !_indexStr.empty())
-    {
-        _errorReporter->error("attributes `key' and `index' are mutually exclusive");
-    }
-
-    if(_keyStr.empty() && _indexStr.empty())
-    {
-        _errorReporter->error("one of attributes `key' or `index' is required");
-    }
-
-    NodePtr node = parse(target);
-    _target = EntityNodePtr::dynamicCast(node);
-    if(!_target)
-    {
-        _errorReporter->error("`target' attribute is not an entity: `" + target + "'");
-    }
-
-    if(!_keyStr.empty())
-    {
-        _key = parse(_keyStr);
-    }
-
-    if(!_indexStr.empty())
-    {
-        _index = parse(_indexStr);
-    }
-}
-
-void
-FreezeScript::RemoveDescriptor::addChild(const DescriptorPtr&)
-{
-    DescriptorErrorContext ctx(_errorReporter, "remove", _line);
-    _errorReporter->error("child elements are not supported");
-}
-
-void
-FreezeScript::RemoveDescriptor::validate()
-{
-}
-
-void
-FreezeScript::RemoveDescriptor::execute(const SymbolTablePtr& sym, ExecuteInfo*)
-{
-    DescriptorErrorContext ctx(_errorReporter, "remove", _line);
-
-    DataPtr data = sym->getValue(_target);
-    if(data->readOnly())
-    {
-        ostringstream ostr;
-        ostr << _target;
-        _errorReporter->error("target `" + ostr.str() + "' cannot be modified");
-    }
-
-    if(_key)
-    {
-        DataPtr key;
-        try
-        {
-            key = _key->evaluate(sym);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _errorReporter->error("evaluation of key `" + _keyStr + "' failed:\n" + ex.reason());
-        }
-
-        DictionaryDataPtr dict = DictionaryDataPtr::dynamicCast(data);
-        if(!dict)
-        {
-            ostringstream ostr;
-            ostr << _target;
-            _errorReporter->error("target `" + ostr.str() + "' is not a dictionary");
-        }
-
-        DataMap& map = dict->getElements();
-        DataMap::iterator p = map.find(key);
-        if(p != map.end())
-        {
-            p->first->destroy();
-            p->second->destroy();
-            map.erase(p);
-        }
-    }
-    else
-    {
-        assert(_index);
-
-        DataPtr index;
-        try
-        {
-            index = _index->evaluate(sym);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _errorReporter->error("evaluation of index `" + _indexStr + "' failed:\n" + ex.reason());
-        }
-
-        SequenceDataPtr seq = SequenceDataPtr::dynamicCast(data);
-        if(!seq)
-        {
-            ostringstream ostr;
-            ostr << _target;
-            _errorReporter->error("target `" + ostr.str() + "' is not a sequence");
-        }
-
-        DataList& elements = seq->getElements();
-        Ice::Long l = index->integerValue();
-        DataList::size_type i = static_cast<DataList::size_type>(l);
-        if(l < 0 || l > INT_MAX || i >= elements.size())
-        {
-            _errorReporter->error("sequence index " + index->toString() + " is out of range");
-        }
-
-        elements[i]->destroy();
-        elements.erase(elements.begin() + i);
-    }
-}
-
-//
-// FailDescriptor
-//
-FreezeScript::FailDescriptor::FailDescriptor(const DescriptorPtr& parent, int line, const DataFactoryPtr& factory,
-                                             const ErrorReporterPtr& errorReporter,
-                                             const IceXML::Attributes& attributes) :
-    Descriptor(parent, line, factory, errorReporter)
-{
-    IceXML::Attributes::const_iterator p;
-
-    p = attributes.find("test");
-    if(p != attributes.end())
-    {
-        _testStr = p->second;
-    }
-
-    p = attributes.find("message");
-    if(p != attributes.end())
-    {
-        _message = p->second;
-    }
-
-    if(!_testStr.empty())
-    {
-        _test = parse(_testStr);
-    }
-
-    if(_message.empty())
-    {
-        ostringstream ostr;
-        ostr << "<fail> executed at line " << line << endl;
-        _message = ostr.str();
-    }
-}
-
-void
-FreezeScript::FailDescriptor::addChild(const DescriptorPtr&)
-{
-    DescriptorErrorContext ctx(_errorReporter, "fail", _line);
-    _errorReporter->error("child elements are not supported");
-}
-
-void
-FreezeScript::FailDescriptor::validate()
-{
-}
-
-void
-FreezeScript::FailDescriptor::execute(const SymbolTablePtr& sym, ExecuteInfo*)
-{
-    DescriptorErrorContext ctx(_errorReporter, "fail", _line);
-
-    if(_test)
-    {
-        try
-        {
-            DataPtr b = _test->evaluate(sym);
-            BooleanDataPtr bd = BooleanDataPtr::dynamicCast(b);
-            if(!bd)
-            {
-                _errorReporter->error("expression `" + _testStr + "' does not evaluate to a boolean");
-            }
-            if(!bd->booleanValue())
-            {
-                return;
-            }
-        }
-        catch(const EvaluateException& ex)
-        {
-            _errorReporter->error("evaluation of expression `" + _testStr + "' failed:\n" + ex.reason());
-        }
-    }
-
-    throw FailureException(__FILE__, __LINE__, _message);
-}
-
-//
-// EchoDescriptor
-//
-FreezeScript::EchoDescriptor::EchoDescriptor(const DescriptorPtr& parent, int line, const DataFactoryPtr& factory,
-                                             const ErrorReporterPtr& errorReporter,
-                                             const IceXML::Attributes& attributes,
-                                             ostream& os) :
-    Descriptor(parent, line, factory, errorReporter), _os(os)
-{
-    IceXML::Attributes::const_iterator p;
-
-    p = attributes.find("message");
-    if(p != attributes.end())
-    {
-        _message = p->second;
-    }
-
-    p = attributes.find("value");
-    if(p != attributes.end())
-    {
-        _valueStr = p->second;
-    }
-
-    if(!_valueStr.empty())
-    {
-        _value = parse(_valueStr);
-    }
-}
-
-void
-FreezeScript::EchoDescriptor::addChild(const DescriptorPtr&)
-{
-    DescriptorErrorContext ctx(_errorReporter, "echo", _line);
-    _errorReporter->error("child elements are not supported");
-}
-
-void
-FreezeScript::EchoDescriptor::validate()
-{
-}
-
-void
-FreezeScript::EchoDescriptor::execute(const SymbolTablePtr& sym, ExecuteInfo*)
-{
-    DescriptorErrorContext ctx(_errorReporter, "echo", _line);
-
-    if(!_message.empty())
-    {
-        _os << _message;
-    }
-
-    if(_value)
-    {
-        DataPtr v;
-        try
-        {
-            v = _value->evaluate(sym);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _errorReporter->error("evaluation of value `" + _valueStr + "' failed:\n" + ex.reason());
-        }
-        printData(v, _os);
-    }
-
-    _os << endl;
-}
-
-//
-// ExecutableContainerDescriptor
-//
-FreezeScript::ExecutableContainerDescriptor::ExecutableContainerDescriptor(const DescriptorPtr& parent, int line,
-                                                                           const DataFactoryPtr& factory,
-                                                                           const ErrorReporterPtr& errorReporter,
-                                                                           const IceXML::Attributes&,
-                                                                           const string& name) :
-    Descriptor(parent, line, factory, errorReporter), _name(name)
-{
-}
-
-void
-FreezeScript::ExecutableContainerDescriptor::addChild(const DescriptorPtr& child)
-{
-    _children.push_back(child);
-}
-
-void
-FreezeScript::ExecutableContainerDescriptor::validate()
-{
-    for(vector<DescriptorPtr>::iterator p = _children.begin(); p != _children.end(); ++p)
-    {
-        (*p)->validate();
-    }
-}
-
-void
-FreezeScript::ExecutableContainerDescriptor::execute(const SymbolTablePtr& sym, ExecuteInfo* info)
-{
-    for(vector<DescriptorPtr>::iterator p = _children.begin(); p != _children.end(); ++p)
-    {
-        (*p)->execute(sym, info);
-    }
-}
-
-//
-// IfDescriptor
-//
-FreezeScript::IfDescriptor::IfDescriptor(const DescriptorPtr& parent, int line, const DataFactoryPtr& factory,
-                                         const ErrorReporterPtr& errorReporter,
-                                         const IceXML::Attributes& attributes) :
-    Descriptor(parent, line, factory, errorReporter),
-    ExecutableContainerDescriptor(parent, line, factory, errorReporter, attributes, "if")
-   
-{
-    DescriptorErrorContext ctx(_errorReporter, "if", _line);
-
-    IceXML::Attributes::const_iterator p = attributes.find("test");
-    if(p == attributes.end())
-    {
-        _errorReporter->error("required attribute `test' is missing");
-    }
-    _testStr = p->second;
-
-    _test = parse(_testStr);
-}
-
-void
-FreezeScript::IfDescriptor::execute(const SymbolTablePtr& sym, ExecuteInfo* info)
-{
-    DescriptorErrorContext ctx(_errorReporter, "if", _line);
-
-    try
-    {
-        DataPtr b = _test->evaluate(sym);
-        BooleanDataPtr bd = BooleanDataPtr::dynamicCast(b);
-        if(!bd)
-        {
-            _errorReporter->error("expression `" + _testStr + "' does not evaluate to a boolean");
-        }
-        if(bd->booleanValue())
-        {
-            ExecutableContainerDescriptor::execute(sym, info);
-        }
-    }
-    catch(const EvaluateException& ex)
-    {
-        _errorReporter->error("evaluation of conditional expression `" + _testStr + "' failed:\n" + ex.reason());
-    }
-}
-
-//
-// IterateDescriptor
-//
-FreezeScript::IterateDescriptor::IterateDescriptor(const DescriptorPtr& parent, int line,
-                                                   const DataFactoryPtr& factory,
-                                                   const ErrorReporterPtr& errorReporter,
-                                                   const IceXML::Attributes& attributes) :
-    Descriptor(parent, line, factory, errorReporter),
-    ExecutableContainerDescriptor(parent, line, factory, errorReporter, attributes, "iterate")
-  
-{
-    DescriptorErrorContext ctx(_errorReporter, "iterate", _line);
-
-    IceXML::Attributes::const_iterator p;
-    string target;
-
-    p = attributes.find("target");
-    if(p == attributes.end())
-    {
-        _errorReporter->error("required attribute `target' is missing");
-    }
-    target = p->second;
-
-    p = attributes.find("key");
-    if(p != attributes.end())
-    {
-        _key = p->second;
-    }
-
-    p = attributes.find("value");
-    if(p != attributes.end())
-    {
-        _value = p->second;
-    }
-
-    p = attributes.find("element");
-    if(p != attributes.end())
-    {
-        _element = p->second;
-    }
-
-    p = attributes.find("index");
-    if(p != attributes.end())
-    {
-        _index = p->second;
-    }
-
-    NodePtr node = parse(target);
-    _target = EntityNodePtr::dynamicCast(node);
-    if(!_target)
-    {
-        _errorReporter->error("`target' attribute is not an entity: `" + target + "'");
-    }
-}
-
-void
-FreezeScript::IterateDescriptor::execute(const SymbolTablePtr& sym, ExecuteInfo* info)
-{
-    DescriptorErrorContext ctx(_errorReporter, "iterate", _line);
-
-    DataPtr data = sym->getValue(_target);
-
-    DictionaryDataPtr dict = DictionaryDataPtr::dynamicCast(data);
-    SequenceDataPtr seq = SequenceDataPtr::dynamicCast(data);
-    if(!dict && !seq)
-    {
-        ostringstream ostr;
-        ostr << _target;
-        _errorReporter->error("target `" + ostr.str() + "' is not a dictionary or sequence");
-    }
-
-    if(dict)
-    {
-        if(!_element.empty())
-        {
-            _errorReporter->error("attribute `element' specified for dictionary target");
-        }
-        if(!_index.empty())
-        {
-            _errorReporter->error("attribute `index' specified for dictionary target");
-        }
-
-        string key = _key;
-        if(key.empty())
-        {
-            key = "key";
-        }
-
-        string value = _value;
-        if(value.empty())
-        {
-            value = "value";
-        }
-
-        DataMap& map = dict->getElements();
-        for(DataMap::iterator p = map.begin(); p != map.end(); ++p)
-        {
-            SymbolTablePtr elemSym = sym->createChild();
-            elemSym->add(key, p->first);
-            elemSym->add(value, p->second);
-            ExecutableContainerDescriptor::execute(elemSym, info);
-        }
-    }
-    else
-    {
-        if(!_key.empty())
-        {
-            _errorReporter->error("attribute `key' specified for sequence target");
-        }
-        if(!_value.empty())
-        {
-            _errorReporter->error("attribute `value' specified for sequence target");
-        }
-
-        string element = _element;
-        if(element.empty())
-        {
-            element = "elem";
-        }
-
-        string index = _index;
-        if(index.empty())
-        {
-            index = "i";
-        }
-
-        //
-        // NOTE: Don't use iterator to traverse vector because child descriptors might remove elements.
-        //
-        DataList& l = seq->getElements();
-        DataList::size_type i = 0;
-        while(i < l.size())
-        {
-            SymbolTablePtr elemSym = sym->createChild();
-            elemSym->add(element, l[i]);
-            elemSym->add(index, _factory->createInteger(i, true));
-            ExecutableContainerDescriptor::execute(elemSym, info);
-            ++i;
-        }
-    }
-}
-
-//
-// DumpDescriptor
-//
-FreezeScript::DumpDescriptor::DumpDescriptor(const DescriptorPtr& parent, int line,
-                                             const DataFactoryPtr& factory,
-                                             const ErrorReporterPtr& errorReporter,
-                                             const IceXML::Attributes& attributes,
-                                             const Slice::UnitPtr& unit) :
-    Descriptor(parent, line, factory, errorReporter),
-    ExecutableContainerDescriptor(parent, line, factory, errorReporter, attributes, "dump"),
-    _base(true), 
-    _contents(true)
-{
-    DescriptorErrorContext ctx(_errorReporter, "dump", _line);
-
-    for(IceXML::Attributes::const_iterator p = attributes.begin(); p != attributes.end(); ++p)
-    {
-        if(p->first == "type")
-        {
-            if(_type)
-            {
-                _errorReporter->error("duplicate attribute `type'");
-            }
-            _type = findType(unit, p->second);
-        }
-        else if(p->first == "base")
-        {
-            if(p->second == "false")
-            {
-                _base = false;
-            }
-            else if(p->second != "true")
-            {
-                _errorReporter->error("invalid value `" + p->second + "' for attribute `base'");
-            }
-        }
-        else if(p->first == "contents")
-        {
-            if(p->second == "false")
-            {
-                _contents = false;
-            }
-            else if(p->second != "true")
-            {
-                _errorReporter->error("invalid value `" + p->second + "' for attribute `contents'");
-            }
-        }
-        else
-        {
-            _errorReporter->error("unknown attribute `" + p->first + "'");
-        }
-    }
-
-    if(!_type)
-    {
-        _errorReporter->error("required attribute `type' is missing");
-    }
-}
-
-Slice::TypePtr
-FreezeScript::DumpDescriptor::type() const
-{
-    return _type;
-}
-
-string
-FreezeScript::DumpDescriptor::typeName() const
-{
-    return typeToString(_type);
-}
-
-bool
-FreezeScript::DumpDescriptor::base() const
-{
-    return _base;
-}
-
-bool
-FreezeScript::DumpDescriptor::contents() const
-{
-    return _contents;
-}
-
-//
-// RecordDescriptor
-//
-FreezeScript::RecordDescriptor::RecordDescriptor(const DescriptorPtr& parent, int line,
-                                                 const DataFactoryPtr& factory,
-                                                 const ErrorReporterPtr& errorReporter,
-                                                 const IceXML::Attributes& attributes,
-                                                 const Slice::UnitPtr& unit,
-                                                 const FreezeScript::ObjectFactoryPtr& objectFactory) :
-    Descriptor(parent, line, factory, errorReporter), 
-    ExecutableContainerDescriptor(parent, line, factory, errorReporter, attributes, "record"),
-    _unit(unit),
-    _objectFactory(objectFactory)
-{
-}
-
-void
-FreezeScript::RecordDescriptor::execute(const SymbolTablePtr& /*sym*/, ExecuteInfo* info)
-{
-    //
-    // Temporarily add an object factory.
-    //
-    _objectFactory->activate(_factory, _unit);
-
-    //
-    // Iterate over the database.
-    //
-    Dbc* dbc = 0;
-    info->db->cursor(info->txn, &dbc, 0);
-    try
-    {
-        Dbt dbKey, dbValue;
-        while(dbc->get(&dbKey, &dbValue, DB_NEXT) == 0)
-        {
-            Ice::ByteSeq keyBytes;
-            keyBytes.resize(dbKey.get_size());
-            memcpy(&keyBytes[0], dbKey.get_data(), dbKey.get_size());
-            Ice::InputStreamPtr inKey = Ice::wrapInputStream(info->communicator, keyBytes);
-
-            Ice::ByteSeq valueBytes;
-            valueBytes.resize(dbValue.get_size());
-            memcpy(&valueBytes[0], dbValue.get_data(), dbValue.get_size());
-            Ice::InputStreamPtr inValue = Ice::wrapInputStream(info->communicator, valueBytes);
-            inValue->startEncapsulation();
-
-            //
-            // Create data representations of the key and value types.
-            //
-            DataPtr keyData = _factory->create(info->keyType, true);
-            Destroyer<DataPtr> keyDataDestroyer(keyData);
-            DataPtr valueData = _factory->create(info->valueType, true);
-            Destroyer<DataPtr> valueDataDestroyer(valueData);
-            DataPtr facetData = _factory->createString(info->facet, true);
-            Destroyer<DataPtr> facetDataDestroyer(facetData);
-
-            //
-            // Unmarshal the key and value.
-            //
-            keyData->unmarshal(inKey);
-            valueData->unmarshal(inValue);
-            if(info->valueType->usesClasses())
-            {
-                inValue->readPendingObjects();
-            }
-
-            //
-            // Visit the key and value.
-            //
-            DumpVisitor visitor(_factory, _unit, _errorReporter, info);
-            keyData->visit(visitor);
-            valueData->visit(visitor);
-
-            if(!_children.empty())
-            {
-                //
-                // Execute the child descriptors.
-                //
-                SymbolTablePtr st = new SymbolTableI(_factory, _unit, _errorReporter, info, info->symbolTable);
-                st->add("key", keyData);
-                st->add("value", valueData);
-                st->add("facet", facetData);
-                ExecutableContainerDescriptor::execute(st, info);
-            }
-        }
-    }
-    catch(...)
-    {
-        if(dbc)
-        {
-            dbc->close();
-        }
-        _objectFactory->deactivate();
-        throw;
-    }
-
-    if(dbc)
-    {
-        dbc->close();
-    }
-    _objectFactory->deactivate();
-}
-
-//
-// DatabaseDescriptor
-//
-FreezeScript::DatabaseDescriptor::DatabaseDescriptor(const DescriptorPtr& parent, int line,
-                                                     const DataFactoryPtr& factory,
-                                                     const ErrorReporterPtr& errorReporter,
-                                                     const IceXML::Attributes& attributes,
-                                                     const Slice::UnitPtr& unit) :
-    Descriptor(parent, line, factory, errorReporter), 
-    ExecutableContainerDescriptor(parent, line, factory, errorReporter, attributes, "database"),
-    _unit(unit)
-{
-    DescriptorErrorContext ctx(_errorReporter, "database", _line);
-
-    IceXML::Attributes::const_iterator p = attributes.find("key");
-    if(p == attributes.end())
-    {
-        _errorReporter->error("required attribute `key' is missing");
-    }
-    _key = findType(unit, p->second);
-
-    p = attributes.find("value");
-    if(p == attributes.end())
-    {
-        _errorReporter->error("required attribute `value' is missing");
-    }
-    _value = findType(unit, p->second);
-}
-
-void
-FreezeScript::DatabaseDescriptor::addChild(const DescriptorPtr& child)
-{
-    DescriptorErrorContext ctx(_errorReporter, "database", _line);
-
-    RecordDescriptorPtr rec = RecordDescriptorPtr::dynamicCast(child);
-    if(rec)
-    {
-        if(_record)
-        {
-            _errorReporter->error("only one <record> element can be specified");
-        }
-        _record = rec;
-    }
-
-    ExecutableContainerDescriptor::addChild(child);
-}
-
-void
-FreezeScript::DatabaseDescriptor::execute(const SymbolTablePtr&, ExecuteInfo* info)
-{
-    //
-    // Store the key and value types.
-    //
-    info->keyType = _key;
-    info->valueType = _value;
-
-    ExecutableContainerDescriptor::execute(info->symbolTable, info);
-}
-
-//
-// DumpDBDescriptor
-//
-FreezeScript::DumpDBDescriptor::DumpDBDescriptor(int line, const DataFactoryPtr& factory,
-                                                 const ErrorReporterPtr& errorReporter,
-                                                 const IceXML::Attributes& /*attributes*/, const Slice::UnitPtr& unit) :
-    Descriptor(0, line, factory, errorReporter), _unit(unit), _info(new ExecuteInfo)
-{
-    _info->symbolTable = new SymbolTableI(factory, unit, errorReporter, _info);
-}
-
-FreezeScript::DumpDBDescriptor::~DumpDBDescriptor()
-{
-    delete _info;
-}
-
-void
-FreezeScript::DumpDBDescriptor::addChild(const DescriptorPtr& child)
-{
-    DescriptorErrorContext ctx(_errorReporter, "dumpdb", _line);
-
-    DatabaseDescriptorPtr db = DatabaseDescriptorPtr::dynamicCast(child);
-    DumpDescriptorPtr dump = DumpDescriptorPtr::dynamicCast(child);
-
-    if(db)
-    {
-        if(_database)
-        {
-            _errorReporter->error("only one <database> element can be specified");
-        }
-        else
-        {
-            _database = db;
-            _children.push_back(db);
-        }
-    }
-    else if(dump)
-    {
-        string name = dump->typeName();
-        DumpMap::iterator p = _info->dumpMap.find(name);
-        if(p != _info->dumpMap.end())
-        {
-            _errorReporter->error("<dump> descriptor for `" + name + "' specified more than once");
-        }
-        _info->dumpMap.insert(DumpMap::value_type(name, dump));
-
-        _children.push_back(dump);
-    }
-    else
-    {
-        _errorReporter->error("invalid child element");
-    }
-}
-
-void
-FreezeScript::DumpDBDescriptor::validate()
-{
-    DescriptorErrorContext ctx(_errorReporter, "dumpdb", _line);
-
-    if(!_database)
-    {
-        _errorReporter->error("no <database> element specified");
-    }
-
-    for(vector<DescriptorPtr>::iterator p = _children.begin(); p != _children.end(); ++p)
-    {
-        (*p)->validate();
-    }
-}
-
-void
-FreezeScript::DumpDBDescriptor::execute(const SymbolTablePtr&, ExecuteInfo*)
-{
-    assert(false);
-}
-
-void
-FreezeScript::DumpDBDescriptor::dump(const Ice::CommunicatorPtr& communicator, Db* db, DbTxn* txn, const string& facet)
-{
-    _info->communicator = communicator;
-    _info->db = db;
-    _info->txn = txn;
-    _info->facet = facet;
-
-    try
-    {
-        _database->execute(0, _info);
-    }
-    catch(...)
-    {
-        _info->communicator = 0;
-        _info->db = 0;
-        _info->txn = 0;
-        throw;
-    }
-
-    _info->communicator = 0;
-    _info->db = 0;
-    _info->txn = 0;
-}
-
-//
-// SymbolTableI
-//
-FreezeScript::SymbolTableI::SymbolTableI(const DataFactoryPtr& factory, const Slice::UnitPtr& unit,
-                                         const ErrorReporterPtr& errorReporter, ExecuteInfo* info,
-                                         const SymbolTablePtr& parent) :
-    _factory(factory), _unit(unit), _errorReporter(errorReporter), _info(info), _parent(parent)
-{
-}
-
-void
-FreezeScript::SymbolTableI::add(const string& name, const DataPtr& data)
-{
-    DataMap::const_iterator p = _dataMap.find(name);
-    if(p != _dataMap.end())
-    {
-        _errorReporter->error("`" + name + "' is already defined");
-    }
-
-    _dataMap.insert(DataMap::value_type(name, data));
-}
-
-FreezeScript::DataPtr
-FreezeScript::SymbolTableI::getValue(const EntityNodePtr& entity) const
-{
-    EntityVisitor visitor(const_cast<SymbolTableI*>(this));
-    entity->visit(visitor);
-    DataPtr result = visitor.getCurrent();
-    if(!result)
-    {
-        ostringstream ostr;
-        ostr << "invalid entity `" << entity << "'";
-        _errorReporter->error(ostr.str());
-    }
-
-    return result;
-}
-
-FreezeScript::DataPtr
-FreezeScript::SymbolTableI::getConstantValue(const string& name) const
-{
-    DataMap::const_iterator p = _constantCache.find(name);
-    if(p != _constantCache.end())
-    {
-        return p->second;
-    }
-
-    if(_parent)
-    {
-        return _parent->getConstantValue(name);
-    }
-
-    Slice::ContainedList l = _unit->findContents(name);
-    if(l.empty())
-    {
-        _errorReporter->error("unknown constant `" + name + "'");
-    }
-
-    Slice::EnumeratorPtr e = Slice::EnumeratorPtr::dynamicCast(l.front());
-    Slice::ConstPtr c = Slice::ConstPtr::dynamicCast(l.front());
-    if(!e && !c)
-    {
-        _errorReporter->error("`" + name + "' does not refer to a Slice constant or enumerator");
-    }
-
-    DataPtr result;
-
-    if(c)
-    {
-        Slice::TypePtr type = c->type();
-        string value = c->value();
-        Slice::BuiltinPtr b = Slice::BuiltinPtr::dynamicCast(type);
-        if(b)
-        {
-            switch(b->kind())
-            {
-            case Slice::Builtin::KindByte:
-            case Slice::Builtin::KindShort:
-            case Slice::Builtin::KindInt:
-            case Slice::Builtin::KindLong:
-            {
-                Ice::Long n;
-                if(!IceUtilInternal::stringToInt64(value, n))
-                {
-                    assert(false);
-                }
-                result = _factory->createInteger(n, true);
-                break;
-            }
-
-            case Slice::Builtin::KindBool:
-            {
-                result = _factory->createBoolean(value == "true", true);
-                break;
-            }
-
-            case Slice::Builtin::KindFloat:
-            case Slice::Builtin::KindDouble:
-            {
-                double v = strtod(value.c_str(), 0);
-                result = _factory->createDouble(v, true);
-                break;
-            }
-
-            case Slice::Builtin::KindString:
-            {
-                result = _factory->createString(value, true);
-                break;
-            }
-
-            case Slice::Builtin::KindObject:
-            case Slice::Builtin::KindObjectProxy:
-            case Slice::Builtin::KindLocalObject:
-                assert(false);
-            }
-        }
-        else
-        {
-            Slice::EnumPtr en = Slice::EnumPtr::dynamicCast(type);
-            assert(en);
-            Slice::EnumeratorList el = en->getEnumerators();
-            for(Slice::EnumeratorList::iterator q = el.begin(); q != el.end(); ++q)
-            {
-                if((*q)->name() == value)
-                {
-                    e = *q;
-                    break;
-                }
-            }
-            assert(e);
-        }
-    }
-
-    if(!result)
-    {
-        assert(e);
-        result = _factory->create(e->type(), true);
-        EnumDataPtr ed = EnumDataPtr::dynamicCast(result);
-        assert(ed);
-        ed->setValueAsString(e->name());
-    }
-
-    //
-    // Cache the value.
-    //
-    const_cast<DataMap&>(_constantCache).insert(DataMap::value_type(name, result));
-
-    return result;
-}
-
-FreezeScript::SymbolTablePtr
-FreezeScript::SymbolTableI::createChild()
-{
-    return new SymbolTableI(_factory, _unit, _errorReporter, _info, this);
-}
-
-Slice::TypePtr
-FreezeScript::SymbolTableI::lookupType(const string& name)
-{
-    Slice::TypeList l = _unit->lookupType(name, false);
-    Slice::TypePtr result;
-    if(!l.empty())
-    {
-        result = l.front();
-    }
-    return result;
-}
-
-FreezeScript::DataPtr
-FreezeScript::SymbolTableI::invokeFunction(const string& name, const DataPtr& target, const DataList& args)
-{
-    if(target)
-    {
-        DictionaryDataPtr targetDict = DictionaryDataPtr::dynamicCast(target);
-        if(targetDict && name == "containsKey")
-        {
-            if(args.size() != 1)
-            {
-                _errorReporter->error("containsKey() requires one argument");
-            }
-            Slice::DictionaryPtr dictType = Slice::DictionaryPtr::dynamicCast(targetDict->getType());
-            assert(dictType);
-            DataPtr key = _factory->create(dictType->keyType(), false);
-            AssignVisitor visitor(args[0], _factory, _errorReporter, false);
-            key->visit(visitor);
-            DataPtr value = targetDict->getElement(key);
-            return _factory->createBoolean(value ? true : false, false);
-        }
-
-        DataPtr result;
-        if(invokeMemberFunction(name, target, args, result, _factory, _errorReporter))
-        {
-            return result;
-        }
-
-        _errorReporter->error("unknown function `" + name + "' invoked on type " + typeToString(target->getType()));
-    }
-    else
-    {
-        //
-        // Global function.
-        //
-        DataPtr result;
-        if(invokeGlobalFunction(_info->communicator, name, args, result, _factory, _errorReporter))
-        {
-            return result;
-        }
-        else
-        {
-            _errorReporter->error("unknown global function `" + name + "'");
-        }
-    }
-
-    return 0;
-}
-
-FreezeScript::DataPtr
-FreezeScript::SymbolTableI::findValue(const string& name) const
-{
-    DataMap::const_iterator p = _dataMap.find(name);
-    if(p != _dataMap.end())
-    {
-        return p->second;
-    }
-
-    if(_parent)
-    {
-        SymbolTableIPtr parentI = SymbolTableIPtr::dynamicCast(_parent);
-        assert(parentI);
-        return parentI->findValue(name);
-    }
-
-    return 0;
-}
-
-FreezeScript::SymbolTableI::EntityVisitor::EntityVisitor(SymbolTableI* table) :
-    _table(table), _error(false)
-{
-}
-
-void
-FreezeScript::SymbolTableI::EntityVisitor::visitIdentifier(const string& name)
-{
-    if(!_error)
-    {
-        if(!_current)
-        {
-            _current = _table->findValue(name);
-        }
-        else
-        {
-            _current = _current->getMember(name);
-        }
-
-        if(!_current)
-        {
-            _error = true;
-        }
-    }
-}
-
-void
-FreezeScript::SymbolTableI::EntityVisitor::visitElement(const NodePtr& value)
-{
-    if(!_error)
-    {
-        assert(_current);
-
-        DataPtr val = value->evaluate(_table);
-        _current = _current->getElement(val);
-
-        if(!_current)
-        {
-            _error = true;
-        }
-    }
-}
-
-FreezeScript::DataPtr
-FreezeScript::SymbolTableI::EntityVisitor::getCurrent() const
-{
-    return _current;
-}
-
-//
-// DumpVisitor
-//
-FreezeScript::DumpVisitor::DumpVisitor(const DataFactoryPtr& factory, const Slice::UnitPtr& unit,
-                                       const ErrorReporterPtr& errorReporter, ExecuteInfo* info) :
-    _factory(factory), _unit(unit), _errorReporter(errorReporter), _info(info)
-{
-}
-
-void
-FreezeScript::DumpVisitor::visitBoolean(const BooleanDataPtr& data)
-{
-    dump(data);
-}
-
-void
-FreezeScript::DumpVisitor::visitInteger(const IntegerDataPtr& data)
-{
-    dump(data);
-}
-
-void
-FreezeScript::DumpVisitor::visitDouble(const DoubleDataPtr& data)
-{
-    dump(data);
-}
-
-void
-FreezeScript::DumpVisitor::visitString(const StringDataPtr& data)
-{
-    dump(data);
-}
-
-void
-FreezeScript::DumpVisitor::visitProxy(const ProxyDataPtr& data)
-{
-    dump(data);
-}
-
-void
-FreezeScript::DumpVisitor::visitStruct(const StructDataPtr& data)
-{
-    if(dump(data))
-    {
-        DataMemberMap& members = data->getMembers();
-        for(DataMemberMap::iterator p = members.begin(); p != members.end(); ++p)
-        {
-            p->second->visit(*this);
-        }
-    }
-}
-
-void
-FreezeScript::DumpVisitor::visitSequence(const SequenceDataPtr& data)
-{
-    if(dump(data))
-    {
-        DataList& elements = data->getElements();
-        for(DataList::iterator p = elements.begin(); p != elements.end(); ++p)
-        {
-            (*p)->visit(*this);
-        }
-    }
-}
-
-void
-FreezeScript::DumpVisitor::visitEnum(const EnumDataPtr& data)
-{
-    dump(data);
-}
-
-void
-FreezeScript::DumpVisitor::visitDictionary(const DictionaryDataPtr& data)
-{
-    if(dump(data))
-    {
-        DataMap& elements = data->getElements();
-        for(DataMap::iterator p = elements.begin(); p != elements.end(); ++p)
-        {
-            p->first->visit(*this);
-            p->second->visit(*this);
-        }
-    }
-}
-
-void
-FreezeScript::DumpVisitor::visitObject(const ObjectRefPtr& data)
-{
-    if(dump(data))
-    {
-        ObjectDataPtr value = data->getValue();
-        if(value)
-        {
-            set<const ObjectData*>::iterator p = _objectHistory.find(value.get());
-            if(p == _objectHistory.end())
-            {
-                _objectHistory.insert(value.get());
-                DataMemberMap& members = value->getMembers();
-                for(DataMemberMap::iterator q = members.begin(); q != members.end(); ++q)
-                {
-                    q->second->visit(*this);
-                }
-            }
-        }
-    }
-}
-
-bool
-FreezeScript::DumpVisitor::dump(const DataPtr& data)
-{
-    bool result = true;
-    ObjectRefPtr obj = ObjectRefPtr::dynamicCast(data);
-    if(obj && obj->getValue())
-    {
-        //
-        // When the value is an object, attempt to find a <dump> descriptor for the
-        // object's actual type. If no descriptor is found, attempt to find a
-        // descriptor for the object's base types (including Ice::Object).
-        //
-        ObjectDataPtr objData = obj->getValue();
-        Slice::TypePtr cls = objData->getType(); // Actual type
-        bool checkContents = true;
-        while(cls)
-        {
-            string type = typeToString(cls);
-            bool base = true;
-            DumpMap::const_iterator p = _info->dumpMap.find(type);
-            if(p != _info->dumpMap.end())
-            {
-                SymbolTablePtr sym = new SymbolTableI(_factory, _unit, _errorReporter, _info, _info->symbolTable);
-                sym->add("value", objData);
-                p->second->execute(sym, _info);
-                base = p->second->base();
-                if(checkContents)
-                {
-                    result = p->second->contents();
-                    checkContents = false;
-                }
-            }
-            Slice::ClassDeclPtr decl = Slice::ClassDeclPtr::dynamicCast(cls);
-            cls = 0;
-            if(base && decl)
-            {
-                Slice::ClassDefPtr def = decl->definition();
-                assert(def);
-                Slice::ClassList bases = def->bases();
-                if(!bases.empty() && !bases.front()->isInterface())
-                {
-                    cls = bases.front()->declaration();
-                }
-                else
-                {
-                    cls = _unit->builtin(Slice::Builtin::KindObject);
-                }
-            }
-        }
-    }
-    else
-    {
-        string typeName = typeToString(data->getType());
-        DumpMap::iterator p = _info->dumpMap.find(typeName);
-        if(p != _info->dumpMap.end())
-        {
-            SymbolTablePtr st = new SymbolTableI(_factory, _unit, _errorReporter, _info, _info->symbolTable);
-            st->add("value", data);
-            p->second->execute(st, _info);
-            result = p->second->contents();
-        }
-
-    }
-
-    return result;
-}
diff --git a/cpp/src/FreezeScript/DumpDescriptors.h b/cpp/src/FreezeScript/DumpDescriptors.h
deleted file mode 100644
index f01465d2169..00000000000
--- a/cpp/src/FreezeScript/DumpDescriptors.h
+++ /dev/null
@@ -1,306 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_SCRIPT_DUMP_DESCRIPTORS_H
-#define FREEZE_SCRIPT_DUMP_DESCRIPTORS_H
-
-#include <FreezeScript/Parser.h>
-#include <IceXML/Parser.h>
-
-class Db;
-class DbTxn;
-
-namespace FreezeScript
-{
-
-class Descriptor;
-typedef IceUtil::Handle<Descriptor> DescriptorPtr;
-
-struct ExecuteInfo;
-
-class Descriptor : virtual public IceUtil::SimpleShared
-{
-public:
-
-    virtual ~Descriptor();
-
-    virtual DescriptorPtr parent() const;
-    virtual void addChild(const DescriptorPtr&) = 0;
-    virtual void validate() = 0;
-    virtual void execute(const SymbolTablePtr&, ExecuteInfo*) = 0;
-
-protected:
-
-    Descriptor(const DescriptorPtr&, int, const DataFactoryPtr&, const ErrorReporterPtr&);
-
-    NodePtr parse(const std::string&) const;
-
-    Slice::TypePtr findType(const Slice::UnitPtr&, const std::string&);
-
-    DescriptorPtr _parent;
-    int _line;
-    DataFactoryPtr _factory;
-    ErrorReporterPtr _errorReporter;
-};
-
-class SetDescriptor : public Descriptor
-{
-public:
-
-    SetDescriptor(const DescriptorPtr&, int, const DataFactoryPtr&, const ErrorReporterPtr&,
-                  const IceXML::Attributes&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&, ExecuteInfo*);
-
-private:
-
-    EntityNodePtr _target;
-    NodePtr _value;
-    std::string _valueStr;
-    NodePtr _length;
-    std::string _lengthStr;
-    bool _convert;
-};
-
-class DefineDescriptor : public Descriptor
-{
-public:
-
-    DefineDescriptor(const DescriptorPtr&, int, const DataFactoryPtr&, const ErrorReporterPtr&,
-                     const IceXML::Attributes&, const Slice::UnitPtr&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&, ExecuteInfo*);
-
-private:
-
-    std::string _name;
-    Slice::TypePtr _type;
-    NodePtr _value;
-    std::string _valueStr;
-    bool _convert;
-};
-
-class AddDescriptor : public Descriptor
-{
-public:
-
-    AddDescriptor(const DescriptorPtr&, int, const DataFactoryPtr&, const ErrorReporterPtr&,
-                  const IceXML::Attributes&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&, ExecuteInfo*);
-
-private:
-
-    EntityNodePtr _target;
-    NodePtr _key;
-    std::string _keyStr;
-    NodePtr _index;
-    std::string _indexStr;
-    NodePtr _value;
-    std::string _valueStr;
-    bool _convert;
-};
-
-class RemoveDescriptor : public Descriptor
-{
-public:
-
-    RemoveDescriptor(const DescriptorPtr&, int, const DataFactoryPtr&, const ErrorReporterPtr&,
-                     const IceXML::Attributes&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&, ExecuteInfo*);
-
-private:
-
-    EntityNodePtr _target;
-    NodePtr _key;
-    std::string _keyStr;
-    NodePtr _index;
-    std::string _indexStr;
-};
-
-class FailDescriptor : public Descriptor
-{
-public:
-
-    FailDescriptor(const DescriptorPtr&, int, const DataFactoryPtr&, const ErrorReporterPtr&,
-                   const IceXML::Attributes&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&, ExecuteInfo*);
-
-private:
-
-    NodePtr _test;
-    std::string _testStr;
-    std::string _message;
-};
-
-class EchoDescriptor : public Descriptor
-{
-public:
-
-    EchoDescriptor(const DescriptorPtr&, int, const DataFactoryPtr&, const ErrorReporterPtr&,
-                   const IceXML::Attributes&, std::ostream&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&, ExecuteInfo*);
-
-private:
-
-    std::ostream& _os;
-    std::string _message;
-    NodePtr _value;
-    std::string _valueStr;
-};
-
-class ExecutableContainerDescriptor : virtual public Descriptor
-{
-public:
-
-    ExecutableContainerDescriptor(const DescriptorPtr&, int, const DataFactoryPtr&, const ErrorReporterPtr&,
-                                  const IceXML::Attributes&, const std::string&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&, ExecuteInfo*);
-
-protected:
-
-    std::vector<DescriptorPtr> _children;
-
-private:
-
-    std::string _name;
-};
-
-class IfDescriptor : public ExecutableContainerDescriptor
-{
-public:
-
-    IfDescriptor(const DescriptorPtr&, int, const DataFactoryPtr&, const ErrorReporterPtr&, const IceXML::Attributes&);
-
-    virtual void execute(const SymbolTablePtr&, ExecuteInfo*);
-
-private:
-
-    NodePtr _test;
-    std::string _testStr;
-};
-
-class IterateDescriptor : public ExecutableContainerDescriptor
-{
-public:
-
-    IterateDescriptor(const DescriptorPtr&, int, const DataFactoryPtr&, const ErrorReporterPtr&,
-                      const IceXML::Attributes&);
-
-    virtual void execute(const SymbolTablePtr&, ExecuteInfo*);
-
-private:
-
-    EntityNodePtr _target;
-    std::string _key;
-    std::string _value;
-    std::string _element;
-    std::string _index;
-};
-
-class DumpDescriptor : public ExecutableContainerDescriptor
-{
-public:
-
-    DumpDescriptor(const DescriptorPtr&, int, const DataFactoryPtr&, const ErrorReporterPtr&,
-                   const IceXML::Attributes&, const Slice::UnitPtr&);
-
-    Slice::TypePtr type() const;
-    std::string typeName() const;
-    bool base() const;
-    bool contents() const;
-
-private:
-
-    Slice::TypePtr _type;
-    bool _base;
-    bool _contents;
-};
-typedef IceUtil::Handle<DumpDescriptor> DumpDescriptorPtr;
-
-class RecordDescriptor : public ExecutableContainerDescriptor
-{
-public:
-
-    RecordDescriptor(const DescriptorPtr&, int, const DataFactoryPtr&, const ErrorReporterPtr&,
-                     const IceXML::Attributes&, const Slice::UnitPtr&, 
-                     const FreezeScript::ObjectFactoryPtr&);
-
-    virtual void execute(const SymbolTablePtr&, ExecuteInfo*);
-
-private:
-
-    Slice::UnitPtr _unit;
-    FreezeScript::ObjectFactoryPtr _objectFactory;
-};
-typedef IceUtil::Handle<RecordDescriptor> RecordDescriptorPtr;
-
-class DatabaseDescriptor : public ExecutableContainerDescriptor
-{
-public:
-
-    DatabaseDescriptor(const DescriptorPtr&, int, const DataFactoryPtr&, const ErrorReporterPtr&,
-                       const IceXML::Attributes&, const Slice::UnitPtr&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void execute(const SymbolTablePtr&, ExecuteInfo*);
-
-private:
-
-    Slice::UnitPtr _unit;
-    Slice::TypePtr _key;
-    Slice::TypePtr _value;
-    RecordDescriptorPtr _record;
-};
-typedef IceUtil::Handle<DatabaseDescriptor> DatabaseDescriptorPtr;
-
-class DumpDBDescriptor : public Descriptor
-{
-public:
-
-    DumpDBDescriptor(int, const DataFactoryPtr&, const ErrorReporterPtr&, const IceXML::Attributes&,
-                     const Slice::UnitPtr&);
-    ~DumpDBDescriptor();
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&, ExecuteInfo*);
-
-    void dump(const Ice::CommunicatorPtr&, Db*, DbTxn*, const std::string&);
-
-private:
-
-    Slice::UnitPtr _unit;
-    DatabaseDescriptorPtr _database;
-    std::vector<DescriptorPtr> _children;
-    ExecuteInfo* _info;
-};
-typedef IceUtil::Handle<DumpDBDescriptor> DumpDBDescriptorPtr;
-
-} // End of namespace FreezeScript
-
-#endif
diff --git a/cpp/src/FreezeScript/Error.cpp b/cpp/src/FreezeScript/Error.cpp
deleted file mode 100644
index 05519ac5aba..00000000000
--- a/cpp/src/FreezeScript/Error.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/Error.h>
-#include <FreezeScript/Exception.h>
-#include <FreezeScript/Util.h>
-
-using namespace std;
-
-//
-// ErrorReporter
-//
-FreezeScript::ErrorReporter::ErrorReporter(ostream& out, bool suppress) :
-    _out(out), _suppress(suppress)
-{
-}
-
-ostream&
-FreezeScript::ErrorReporter::stream() const
-{
-    return _out;
-}
-
-void
-FreezeScript::ErrorReporter::warning(const string& msg)
-{
-    ostringstream ostr;
-    if(!_descName.empty())
-    {
-        ostr << "warning in <" << _descName << "> descriptor, line " << _descLine << ": " << msg << endl;
-    }
-    else
-    {
-        ostr << "warning: " << msg << endl;
-    }
-    string warn = ostr.str();
-    if(_suppress)
-    {
-        map<string, bool>::iterator p = _warningHistory.find(warn);
-        if(p != _warningHistory.end())
-        {
-            return;
-        }
-        _warningHistory.insert(map<string, bool>::value_type(warn, true));
-    }
-    _out << warn;
-}
-
-void
-FreezeScript::ErrorReporter::error(const string& msg)
-{
-    ostringstream ostr;
-    if(!_descName.empty())
-    {
-        ostr << "error in <" << _descName << "> descriptor, line " << _descLine << ": " << msg << endl;
-    }
-    else
-    {
-        ostr << "error: " << msg << endl;
-    }
-    throw FailureException(__FILE__, __LINE__, ostr.str());
-}
-
-void
-FreezeScript::ErrorReporter::typeMismatchError(const Slice::TypePtr& expected, const Slice::TypePtr& received,
-                                               bool fatal)
-{
-    ostringstream ostr;
-    ostr << "type mismatch: expected " << typeToString(expected) << " but received " << typeToString(received);
-
-    if(fatal)
-    {
-        error(ostr.str());
-    }
-    else
-    {
-        warning(ostr.str());
-    }
-}
-
-void
-FreezeScript::ErrorReporter::conversionError(const string& value, const Slice::TypePtr& type, bool fatal)
-{
-    ostringstream ostr;
-    ostr << "unable to convert `" << value << "' to " << typeToString(type);
-
-    if(fatal)
-    {
-        error(ostr.str());
-    }
-    else
-    {
-        warning(ostr.str());
-    }
-}
-
-void
-FreezeScript::ErrorReporter::rangeError(const string& value, const Slice::TypePtr& type, bool fatal)
-{
-    ostringstream ostr;
-    ostr << "value `" << value << "' is out of range for type " << typeToString(type);
-
-    if(fatal)
-    {
-        error(ostr.str());
-    }
-    else
-    {
-        warning(ostr.str());
-    }
-}
-
-void
-FreezeScript::ErrorReporter::expressionSyntaxError(const string& msg)
-{
-    assert(!_expression.empty());
-    ostringstream ostr;
-    ostr << "syntax error in expression `" << _expression << "': " << msg;
-    error(ostr.str());
-}
-
-void
-FreezeScript::ErrorReporter::descriptorError(const string& msg, int line)
-{
-    ostringstream ostr;
-    ostr << "XML error on line " << line << ":" << endl << msg;
-    error(ostr.str());
-}
-
-void
-FreezeScript::ErrorReporter::setDescriptor(const string& name, int line)
-{
-    _descName = name;
-    _descLine = line;
-}
-
-void
-FreezeScript::ErrorReporter::getDescriptor(string& name, int& line)
-{
-    name = _descName;
-    line = _descLine;
-}
-
-void
-FreezeScript::ErrorReporter::clearDescriptor()
-{
-    _descName.clear();
-}
-
-void
-FreezeScript::ErrorReporter::setExpression(const string& expr)
-{
-    _expression = expr;
-}
-
-void
-FreezeScript::ErrorReporter::clearExpression()
-{
-    _expression.clear();
-}
-
-//
-// DescriptorErrorContext
-//
-FreezeScript::DescriptorErrorContext::DescriptorErrorContext(const ErrorReporterPtr& errorReporter, const string& name,
-                                                             int line) :
-    _errorReporter(errorReporter)
-{
-    //
-    // Save the existing descriptor information before changing it.
-    //
-    _errorReporter->getDescriptor(_name, _line);
-    _errorReporter->setDescriptor(name, line);
-}
-
-FreezeScript::DescriptorErrorContext::~DescriptorErrorContext()
-{
-    //
-    // Restore the original descriptor information.
-    //
-    _errorReporter->setDescriptor(_name, _line);
-}
diff --git a/cpp/src/FreezeScript/Error.h b/cpp/src/FreezeScript/Error.h
deleted file mode 100644
index 7cc134462fa..00000000000
--- a/cpp/src/FreezeScript/Error.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_SCRIPT_ERROR_H
-#define FREEZE_SCRIPT_ERROR_H
-
-#include <Slice/Parser.h>
-
-namespace FreezeScript
-{
-
-class ErrorReporter : public IceUtil::SimpleShared
-{
-public:
-
-    ErrorReporter(std::ostream&, bool);
-
-    std::ostream& stream() const;
-
-    void warning(const std::string&);
-    void error(const std::string&);
-    void typeMismatchError(const Slice::TypePtr&, const Slice::TypePtr&, bool);
-    void conversionError(const std::string&, const Slice::TypePtr&, bool);
-    void rangeError(const std::string&, const Slice::TypePtr&, bool);
-    void expressionSyntaxError(const std::string&);
-    void descriptorError(const std::string&, int);
-
-    void setDescriptor(const std::string&, int);
-    void getDescriptor(std::string&, int&);
-    void clearDescriptor();
-
-    void setExpression(const std::string&);
-    void clearExpression();
-
-private:
-
-    std::ostream& _out;
-    bool _suppress;
-    std::map<std::string, bool> _warningHistory;
-    std::string _descName;
-    int _descLine;
-    std::string _expression;
-};
-typedef IceUtil::Handle<ErrorReporter> ErrorReporterPtr;
-
-class DescriptorErrorContext
-{
-public:
-
-    DescriptorErrorContext(const ErrorReporterPtr&, const std::string&, int);
-    ~DescriptorErrorContext();
-
-private:
-
-    ErrorReporterPtr _errorReporter;
-    std::string _name;
-    int _line;
-};
-
-} // End of namespace FreezeScript
-
-#endif
diff --git a/cpp/src/FreezeScript/Exception.cpp b/cpp/src/FreezeScript/Exception.cpp
deleted file mode 100644
index 7b268c17de5..00000000000
--- a/cpp/src/FreezeScript/Exception.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/Exception.h>
-
-using namespace std;
-
-//
-// FailureException
-//
-FreezeScript::FailureException::FailureException(const char* file, int line, const string& reason) :
-    IceUtil::Exception(file, line), _reason(reason)
-{
-}
-
-FreezeScript::FailureException::~FailureException() throw()
-{
-}
-
-const char* FreezeScript::FailureException::_name = "FreezeScript::FailureException";
-
-string
-FreezeScript::FailureException::ice_name() const
-{
-    return _name;
-}
-
-void
-FreezeScript::FailureException::ice_print(ostream& out) const
-{
-    ::IceUtil::Exception::ice_print(out);
-    out << ":\nerror occurred during transformation"; // TODO
-    if(!_reason.empty())
-    {
-        out << ":\n" << _reason;
-    }
-}
-
-FreezeScript::FailureException*
-FreezeScript::FailureException::ice_clone() const
-{
-    return new FailureException(ice_file(), ice_line(), _reason);
-}
-
-void
-FreezeScript::FailureException::ice_throw() const
-{
-    throw *this;
-}
-
-string
-FreezeScript::FailureException::reason() const
-{
-    return _reason;
-}
diff --git a/cpp/src/FreezeScript/Exception.h b/cpp/src/FreezeScript/Exception.h
deleted file mode 100644
index 835f6bd20ee..00000000000
--- a/cpp/src/FreezeScript/Exception.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_SCRIPT_EXCEPTION_H
-#define FREEZE_SCRIPT_EXCEPTION_H
-
-#include <IceUtil/Exception.h>
-
-namespace FreezeScript
-{
-
-class FailureException : public IceUtil::Exception
-{
-public:
-    
-    FailureException(const char*, int, const std::string&);
-    virtual ~FailureException() throw();
-    virtual std::string ice_name() const;
-    virtual void ice_print(std::ostream&) const;
-    virtual FailureException* ice_clone() const;
-    virtual void ice_throw() const;
-
-    std::string reason() const;
-
-private:
-
-    std::string _reason;
-    static const char* _name;
-};
-
-} // End of namespace FreezeScript
-
-#endif
diff --git a/cpp/src/FreezeScript/Functions.cpp b/cpp/src/FreezeScript/Functions.cpp
deleted file mode 100644
index 34e08107d9e..00000000000
--- a/cpp/src/FreezeScript/Functions.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/Functions.h>
-#include <FreezeScript/Util.h>
-#include <IceUtil/UUID.h>
-#include <IceUtil/StringUtil.h>
-
-using namespace std;
-
-bool
-FreezeScript::invokeGlobalFunction(const Ice::CommunicatorPtr& communicator, const string& name, const DataList& args,
-                                   DataPtr& result, const DataFactoryPtr& factory, 
-                                   const ErrorReporterPtr& errorReporter)
-{
-    //
-    // Global function.
-    //
-    if(name == "typeOf")
-    {
-        if(args.size() != 1)
-        {
-            errorReporter->error("typeOf() requires one argument");
-        }
-        result = factory->createString(typeToString(args.front()->getType()), false);
-        return true;
-    }
-    else if(name == "generateUUID")
-    {
-        if(args.size() != 0)
-        {
-            errorReporter->error("generateUUID() accepts no arguments");
-        }
-        result = factory->createString(IceUtil::generateUUID(), false);
-        return true;
-    }
-    else if(name == "stringToIdentity")
-    {
-        StringDataPtr str;
-        if(args.size() > 0)
-        {
-            str = StringDataPtr::dynamicCast(args.front());
-        }
-        if(args.size() != 1 || !str)
-        {
-            errorReporter->error("stringToIdentity() requires a string argument");
-        }
-
-        //
-        // Parse the identity string.
-        //
-        string idstr = str->stringValue();
-        Ice::Identity id;
-        try
-        {
-            id = communicator->stringToIdentity(idstr);
-        }
-        catch(const Ice::IdentityParseException& ex)
-        {
-            errorReporter->error("error in stringToIdentity():\n" + ex.str);
-        }
-
-        //
-        // Create a data representation of Ice::Identity.
-        //
-        Slice::UnitPtr unit = str->getType()->unit();
-        Slice::TypeList l = unit->lookupType("::Ice::Identity", false);
-        assert(!l.empty());
-        DataPtr identity = factory->create(l.front(), false);
-        StringDataPtr member;
-        member = StringDataPtr::dynamicCast(identity->getMember("name"));
-        assert(member);
-        member->setValue(id.name);
-        member = StringDataPtr::dynamicCast(identity->getMember("category"));
-        assert(member);
-        member->setValue(id.category);
-        result = identity;
-        return true;
-    }
-    else if(name == "identityToString")
-    {
-        StructDataPtr identity;
-        if(args.size() > 0)
-        {
-            identity = StructDataPtr::dynamicCast(args.front());
-        }
-        if(identity)
-        {
-            Slice::TypePtr argType = identity->getType();
-            Slice::StructPtr st = Slice::StructPtr::dynamicCast(argType);
-            if(!st || st->scoped() != "::Ice::Identity")
-            {
-                identity = 0;
-            }
-        }
-        if(args.size() != 1 || !identity)
-        {
-            errorReporter->error("identityToString() requires a argument of type ::Ice::Identity");
-        }
-
-        //
-        // Compose the identity.
-        //
-        Ice::Identity id;
-        StringDataPtr member;
-        member = StringDataPtr::dynamicCast(identity->getMember("name"));
-        assert(member);
-        id.name = member->stringValue();
-        member = StringDataPtr::dynamicCast(identity->getMember("category"));
-        assert(member);
-        id.category = member->stringValue();
-
-        result = factory->createString(communicator->identityToString(id), false);
-        return true;
-    }
-    else if(name == "stringToProxy")
-    {
-        StringDataPtr str;
-        if(args.size() > 0)
-        {
-            str = StringDataPtr::dynamicCast(args.front());
-        }
-        if(args.size() != 1 || !str)
-        {
-            errorReporter->error("stringToProxy() requires a string argument");
-        }
-
-        //
-        // Parse the proxy;
-        //
-        string sprx = str->stringValue();
-        Ice::ObjectPrx prx;
-        try
-        {
-            prx = factory->getCommunicator()->stringToProxy(sprx);
-        }
-        catch(const Ice::ProxyParseException& ex)
-        {
-            errorReporter->error("error in stringToProxy():\n" + ex.str);
-        }
-
-        Slice::UnitPtr unit = str->getType()->unit();
-        ProxyDataPtr p =
-            ProxyDataPtr::dynamicCast(factory->create(unit->builtin(Slice::Builtin::KindObjectProxy), false));
-        p->setValue(prx);
-        result = p;
-        return true;
-    }
-    else if(name == "proxyToString")
-    {
-        ProxyDataPtr prx;
-        if(args.size() > 0)
-        {
-            prx = ProxyDataPtr::dynamicCast(args.front());
-        }
-        if(args.size() != 1 || !prx)
-        {
-            errorReporter->error("proxyToString() requires a proxy argument");
-        }
-
-        result = factory->createString(prx->toString(), false);
-        return true;
-    }
-    else if(name == "lowercase")
-    {
-        StringDataPtr str;
-        if(args.size() > 0)
-        {
-            str = StringDataPtr::dynamicCast(args.front());
-        }
-        if(args.size() != 1 || !str)
-        {
-            errorReporter->error("lowercase() requires a string argument");
-        }
-        string val = IceUtilInternal::toLower(str->stringValue());
-        result = factory->createString(val, false);
-        return true;
-    }
-
-    return false;
-}
-
-bool
-FreezeScript::invokeMemberFunction(const string& name, const DataPtr& target, const DataList& args, DataPtr& result,
-                                   const DataFactoryPtr& factory, const ErrorReporterPtr& errorReporter)
-{
-    //
-    // string
-    //
-    StringDataPtr targetStr = StringDataPtr::dynamicCast(target);
-    if(targetStr)
-    {
-        if(name == "find")
-        {
-            StringDataPtr argData;
-            IntegerDataPtr startData;
-            if(args.size() > 0)
-            {
-                argData = StringDataPtr::dynamicCast(args[0]);
-            }
-            if(args.size() > 1)
-            {
-                startData = IntegerDataPtr::dynamicCast(args[1]);
-            }
-            if(args.size() == 0 || args.size() > 2 || !argData || (args.size() == 2 && !startData))
-            {
-                errorReporter->error("invalid arguments to find(string str[, int len])");
-            }
-            string targ = targetStr->stringValue();
-            string arg = argData->stringValue();
-            string::size_type pos;
-            if(startData)
-            {
-                string::size_type start = static_cast<string::size_type>(startData->integerValue());
-                pos = targ.find(arg, start);
-            }
-            else
-            {
-                pos = targ.find(arg);
-            }
-            result = factory->createInteger(pos == string::npos ? -1 : static_cast<Ice::Long>(pos), false);
-            return true;
-        }
-        else if(name == "substr")
-        {
-            IntegerDataPtr startData;
-            IntegerDataPtr lenData;
-            if(args.size() > 0)
-            {
-                startData = IntegerDataPtr::dynamicCast(args[0]);
-            }
-            if(args.size() > 1)
-            {
-                lenData = IntegerDataPtr::dynamicCast(args[1]);
-            }
-            if(args.size() == 0 || args.size() > 2 || !startData || (args.size() == 2 && !lenData))
-            {
-                errorReporter->error("invalid arguments to substr(int start[, int len])");
-            }
-            string targ = targetStr->stringValue();
-            string::size_type start = static_cast<string::size_type>(startData->integerValue());
-            string::size_type len = string::npos;
-            if(lenData)
-            {
-                len = static_cast<string::size_type>(lenData->integerValue());
-            }
-            if(start > targ.size())
-            {
-                ostringstream ostr;
-                ostr << "substr() starting position (" << start << ") is greater than string length ("
-                     << targ.size() << ")";
-                errorReporter->error(ostr.str());
-            }
-            result = factory->createString(targ.substr(start, len), false);
-            return true;
-        }
-        else if(name == "replace")
-        {
-            IntegerDataPtr startData;
-            IntegerDataPtr lenData;
-            StringDataPtr strData;
-            if(args.size() == 3)
-            {
-                startData = IntegerDataPtr::dynamicCast(args[0]);
-                lenData = IntegerDataPtr::dynamicCast(args[1]);
-                strData = StringDataPtr::dynamicCast(args[2]);
-            }
-            if(args.size() != 3 || !startData || !lenData || !strData)
-            {
-                errorReporter->error("invalid arguments to replace(int start, int len, string val)");
-            }
-            string targ = targetStr->stringValue();
-            string::size_type start = static_cast<string::size_type>(startData->integerValue());
-            string::size_type len = static_cast<string::size_type>(lenData->integerValue());
-            string str = strData->stringValue();
-            if(start > targ.size())
-            {
-                ostringstream ostr;
-                ostr << "replace() starting position (" << start << ") is greater than string length ("
-                     << targ.size() << ")";
-                errorReporter->error(ostr.str());
-            }
-            result = factory->createString(targ.replace(start, len, str), false);
-            return true;
-        }
-
-        return false;
-    }
-
-    //
-    // Object
-    //
-    ObjectRefPtr targetObj = ObjectRefPtr::dynamicCast(target);
-    if(targetObj)
-    {
-        if(name == "ice_isA")
-        {
-            ObjectDataPtr value = targetObj->getValue();
-            if(!value)
-            {
-                errorReporter->error("ice_isA() invoked on nil object");
-            }
-            StringDataPtr str;
-            if(args.size() > 0)
-            {
-                str = StringDataPtr::dynamicCast(args.front());
-            }
-            if(args.size() != 1 || !str)
-            {
-                errorReporter->error("invalid arguments to ice_isA(string id)");
-            }
-
-            string id = str->stringValue();
-            if(id == "::Ice::Object")
-            {
-                result = factory->createBoolean(true, false);
-                return true;
-            }
-
-            Slice::ClassDeclPtr decl = Slice::ClassDeclPtr::dynamicCast(value->getType());
-            if(!decl)
-            {
-                //
-                // Ice::Object
-                //
-                result = factory->createBoolean(false, false);
-                return true;
-            }
-
-            Slice::ClassDefPtr def = decl->definition();
-            assert(def);
-            result = factory->createBoolean(def->isA(id), false);
-            return true;
-        }
-
-        return false;
-    }
-
-    return false;
-}
diff --git a/cpp/src/FreezeScript/Functions.h b/cpp/src/FreezeScript/Functions.h
deleted file mode 100644
index 43a5775dead..00000000000
--- a/cpp/src/FreezeScript/Functions.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_SCRIPT_FUNCTIONS_H
-#define FREEZE_SCRIPT_FUNCTIONS_H
-
-#include <FreezeScript/Data.h>
-
-namespace FreezeScript
-{
-
-bool invokeGlobalFunction(const Ice::CommunicatorPtr&, const std::string&, const DataList&, DataPtr&,
-                          const DataFactoryPtr&, const ErrorReporterPtr&);
-
-bool invokeMemberFunction(const std::string&, const DataPtr&, const DataList&, DataPtr&, const DataFactoryPtr&,
-                          const ErrorReporterPtr&);
-
-}
-
-#endif
diff --git a/cpp/src/FreezeScript/Grammar.cpp b/cpp/src/FreezeScript/Grammar.cpp
deleted file mode 100644
index ec143bda411..00000000000
--- a/cpp/src/FreezeScript/Grammar.cpp
+++ /dev/null
@@ -1,2051 +0,0 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-/* C LALR(1) parser skeleton written by Richard Stallman, by
-   simplifying the original so-called "semantic" parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-/* Identify Bison output.  */
-#define YYBISON 1
-
-/* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers.  */
-#define YYPURE 1
-
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
-/* Using locations.  */
-#define YYLSP_NEEDED 0
-
-/* Substitute the variable and function names.  */
-#define yyparse         freeze_script_parse
-#define yylex           freeze_script_lex
-#define yyerror         freeze_script_error
-#define yylval          freeze_script_lval
-#define yychar          freeze_script_char
-#define yydebug         freeze_script_debug
-#define yynerrs         freeze_script_nerrs
-
-
-/* Copy the first part of user declarations.  */
-
-/* Line 189 of yacc.c  */
-#line 1 "../FreezeScript/Grammar.y"
-
-
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/GrammarUtil.h>
-
-#ifdef _MSC_VER
-// I get these warnings from some bison versions:
-// warning C4102: 'yyoverflowlab' : unreferenced label
-#   pragma warning( disable : 4102 )
-// warning C4065: switch statement contains 'default' but no 'case' labels
-#   pragma warning( disable : 4065 )
-#endif
-
-//
-// Avoid old style cast warnings in generated grammar
-//
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-
-using namespace std;
-using namespace FreezeScript;
-
-void
-freeze_script_error(const char* s)
-{
-    // yacc and recent versions of Bison use "syntax error" instead
-    // of "parse error".
-
-    if(strcmp(s, "parse error") == 0)
-    {
-        parseErrorReporter->expressionSyntaxError("syntax error");
-    }
-    else
-    {
-        parseErrorReporter->expressionSyntaxError(s);
-    }
-}
-
-
-
-/* Line 189 of yacc.c  */
-#line 131 "Grammar.tab.c"
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     TOK_AND = 258,
-     TOK_OR = 259,
-     TOK_NOT = 260,
-     TOK_ADD = 261,
-     TOK_SUB = 262,
-     TOK_MUL = 263,
-     TOK_DIV = 264,
-     TOK_MOD = 265,
-     TOK_LPAREN = 266,
-     TOK_RPAREN = 267,
-     TOK_LBRACKET = 268,
-     TOK_RBRACKET = 269,
-     TOK_LESS_THAN = 270,
-     TOK_GREATER_THAN = 271,
-     TOK_LESS_EQUAL = 272,
-     TOK_GREATER_EQUAL = 273,
-     TOK_EQUAL = 274,
-     TOK_NEQ = 275,
-     TOK_TRUE = 276,
-     TOK_FALSE = 277,
-     TOK_NIL = 278,
-     TOK_SCOPE_DELIMITER = 279,
-     TOK_IDENTIFIER = 280,
-     TOK_STRING_LITERAL = 281,
-     TOK_INTEGER_LITERAL = 282,
-     TOK_FLOATING_POINT_LITERAL = 283,
-     UNARY_OP = 284
-   };
-#endif
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef int YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-
-/* Copy the second part of user declarations.  */
-
-
-/* Line 264 of yacc.c  */
-#line 202 "Grammar.tab.c"
-
-#ifdef short
-# undef short
-#endif
-
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
-#else
-typedef short int yytype_int8;
-#endif
-
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short int yytype_uint16;
-#endif
-
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
-
-#ifndef YYSIZE_T
-# ifdef __SIZE_TYPE__
-#  define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-#  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# else
-#  define YYSIZE_T unsigned int
-# endif
-#endif
-
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-
-#ifndef YY_
-# if YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
-#  endif
-# endif
-# ifndef YY_
-#  define YY_(msgid) msgid
-# endif
-#endif
-
-/* Suppress unused-variable warnings by "using" E.  */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
-#else
-# define YYUSE(e) /* empty */
-#endif
-
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(n) (n)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
-    int yyi;
-#endif
-{
-  return yyi;
-}
-#endif
-
-#if ! defined yyoverflow || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   elif defined __BUILTIN_VA_ARG_INCR
-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#   elif defined _AIX
-#    define YYSTACK_ALLOC __alloca
-#   elif defined _MSC_VER
-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#    define alloca _alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
-#     endif
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-#  endif
-# else
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
-       && ! ((defined YYMALLOC || defined malloc) \
-	     && (defined YYFREE || defined free)))
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
-#   endif
-#  endif
-#  ifndef YYMALLOC
-#   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifndef YYFREE
-#   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-# endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
-
-#if (! defined yyoverflow \
-     && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-};
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
-      + YYSTACK_GAP_MAXIMUM)
-
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (YYID (0))
-
-#endif
-
-/* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  24
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   111
-
-/* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  32
-/* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  9
-/* YYNRULES -- Number of rules.  */
-#define YYNRULES  39
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  65
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   284
-
-#define YYTRANSLATE(YYX)						\
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const yytype_uint8 yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,    31,     2,    30,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29
-};
-
-#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint8 yyprhs[] =
-{
-       0,     0,     3,     5,     7,    11,    15,    19,    23,    27,
-      31,    35,    39,    43,    47,    51,    55,    59,    61,    65,
-      68,    71,    73,    75,    77,    79,    81,    83,    85,    89,
-      91,    93,    98,   102,   104,   109,   113,   115,   116,   120
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      33,     0,    -1,    34,    -1,    35,    -1,    35,    15,    35,
-      -1,    35,    16,    35,    -1,    35,    17,    35,    -1,    35,
-      18,    35,    -1,    35,    19,    35,    -1,    35,    20,    35,
-      -1,    35,     4,    35,    -1,    35,     3,    35,    -1,    35,
-       8,    35,    -1,    35,     9,    35,    -1,    35,    10,    35,
-      -1,    35,     6,    35,    -1,    35,     7,    35,    -1,    36,
-      -1,    11,    34,    12,    -1,     7,    36,    -1,     5,    36,
-      -1,    27,    -1,    28,    -1,    26,    -1,    21,    -1,    22,
-      -1,    23,    -1,    37,    -1,    37,    30,    38,    -1,    38,
-      -1,    40,    -1,    37,    13,    34,    14,    -1,    37,    30,
-      25,    -1,    25,    -1,    25,    11,    39,    12,    -1,    39,
-      31,    34,    -1,    34,    -1,    -1,    40,    24,    25,    -1,
-      24,    25,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline[] =
-{
-       0,    91,    91,   100,   109,   113,   117,   121,   125,   129,
-     133,   137,   141,   145,   149,   153,   157,   161,   170,   174,
-     178,   182,   188,   194,   200,   204,   208,   212,   216,   225,
-     229,   240,   247,   256,   267,   280,   287,   294,   302,   311
-};
-#endif
-
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-static const char *const yytname[] =
-{
-  "$end", "error", "$undefined", "TOK_AND", "TOK_OR", "TOK_NOT",
-  "TOK_ADD", "TOK_SUB", "TOK_MUL", "TOK_DIV", "TOK_MOD", "TOK_LPAREN",
-  "TOK_RPAREN", "TOK_LBRACKET", "TOK_RBRACKET", "TOK_LESS_THAN",
-  "TOK_GREATER_THAN", "TOK_LESS_EQUAL", "TOK_GREATER_EQUAL", "TOK_EQUAL",
-  "TOK_NEQ", "TOK_TRUE", "TOK_FALSE", "TOK_NIL", "TOK_SCOPE_DELIMITER",
-  "TOK_IDENTIFIER", "TOK_STRING_LITERAL", "TOK_INTEGER_LITERAL",
-  "TOK_FLOATING_POINT_LITERAL", "UNARY_OP", "'.'", "','", "$accept",
-  "start", "expr", "binary", "unary", "entity", "function", "arg_list",
-  "constant", 0
-};
-#endif
-
-# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
-static const yytype_uint16 yytoknum[] =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-      46,    44
-};
-# endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    32,    33,    34,    35,    35,    35,    35,    35,    35,
-      35,    35,    35,    35,    35,    35,    35,    35,    36,    36,
-      36,    36,    36,    36,    36,    36,    36,    36,    36,    36,
-      36,    37,    37,    37,    38,    39,    39,    39,    40,    40
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     1,     1,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     1,     3,     2,
-       2,     1,     1,     1,     1,     1,     1,     1,     3,     1,
-       1,     4,     3,     1,     4,     3,     1,     0,     3,     2
-};
-
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const yytype_uint8 yydefact[] =
-{
-       0,     0,     0,     0,    24,    25,    26,     0,    33,    23,
-      21,    22,     0,     2,     3,    17,    27,    29,    30,    20,
-      19,     0,    39,    37,     1,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    18,    36,     0,    11,    10,    15,    16,    12,    13,
-      14,     4,     5,     6,     7,     8,     9,     0,    32,    28,
-      38,    34,     0,    31,    35
-};
-
-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int8 yydefgoto[] =
-{
-      -1,    12,    13,    14,    15,    16,    17,    43,    18
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -20
-static const yytype_int8 yypact[] =
-{
-       0,     0,     0,     0,   -20,   -20,   -20,   -19,     1,   -20,
-     -20,   -20,    13,   -20,    30,   -20,   -12,   -20,   -10,   -20,
-     -20,     3,   -20,     0,   -20,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    -9,
-      -8,   -20,   -20,    -2,    63,    48,    -6,    -6,   -20,   -20,
-     -20,    78,    78,    78,    78,    78,    78,     5,     1,   -20,
-     -20,   -20,     0,   -20,   -20
-};
-
-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int8 yypgoto[] =
-{
-     -20,   -20,    -3,    74,     7,   -20,    -7,   -20,   -20
-};
-
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -1
-static const yytype_int8 yytable[] =
-{
-      21,    38,    29,    30,    31,     1,    22,     2,    19,    20,
-      61,     3,    23,    24,    40,    41,    58,    60,    39,    63,
-      42,     4,     5,     6,     7,     8,     9,    10,    11,    62,
-       0,     0,    59,    25,    26,    57,    27,    28,    29,    30,
-      31,     0,     0,     0,     0,    32,    33,    34,    35,    36,
-      37,    25,     0,     0,    27,    28,    29,    30,    31,    64,
-       0,     0,     0,    32,    33,    34,    35,    36,    37,    27,
-      28,    29,    30,    31,     0,     0,     0,     0,    32,    33,
-      34,    35,    36,    37,    27,    28,    29,    30,    31,     0,
-       0,     0,     0,    -1,    -1,    -1,    -1,    -1,    -1,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56
-};
-
-static const yytype_int8 yycheck[] =
-{
-       3,    13,     8,     9,    10,     5,    25,     7,     1,     2,
-      12,    11,    11,     0,    24,    12,    25,    25,    30,    14,
-      23,    21,    22,    23,    24,    25,    26,    27,    28,    31,
-      -1,    -1,    39,     3,     4,    38,     6,     7,     8,     9,
-      10,    -1,    -1,    -1,    -1,    15,    16,    17,    18,    19,
-      20,     3,    -1,    -1,     6,     7,     8,     9,    10,    62,
-      -1,    -1,    -1,    15,    16,    17,    18,    19,    20,     6,
-       7,     8,     9,    10,    -1,    -1,    -1,    -1,    15,    16,
-      17,    18,    19,    20,     6,     7,     8,     9,    10,    -1,
-      -1,    -1,    -1,    15,    16,    17,    18,    19,    20,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37
-};
-
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] =
-{
-       0,     5,     7,    11,    21,    22,    23,    24,    25,    26,
-      27,    28,    33,    34,    35,    36,    37,    38,    40,    36,
-      36,    34,    25,    11,     0,     3,     4,     6,     7,     8,
-       9,    10,    15,    16,    17,    18,    19,    20,    13,    30,
-      24,    12,    34,    39,    35,    35,    35,    35,    35,    35,
-      35,    35,    35,    35,    35,    35,    35,    34,    25,    38,
-      25,    12,    31,    14,    34
-};
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-
-#define YYFAIL		goto yyerrlab
-
-#define YYRECOVERING()  (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK (1);						\
-      goto yybackup;						\
-    }								\
-  else								\
-    {								\
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;							\
-    }								\
-while (YYID (0))
-
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
-    do									\
-      if (YYID (N))                                                    \
-	{								\
-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
-      else								\
-	{								\
-	  (Current).first_line   = (Current).last_line   =		\
-	    YYRHSLOC (Rhs, 0).last_line;				\
-	  (Current).first_column = (Current).last_column =		\
-	    YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
-    while (YYID (0))
-#endif
-
-
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
-
-#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval)
-#endif
-
-/* Enable debugging if requested.  */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (YYID (0))
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-do {									  \
-  if (yydebug)								  \
-    {									  \
-      YYFPRINTF (stderr, "%s ", Title);					  \
-      yy_symbol_print (stderr,						  \
-		  Type, Value); \
-      YYFPRINTF (stderr, "\n");						  \
-    }									  \
-} while (YYID (0))
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
-{
-  if (!yyvaluep)
-    return;
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
-# endif
-  switch (yytype)
-    {
-      default:
-	break;
-    }
-}
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
-{
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
-  YYFPRINTF (yyoutput, ")");
-}
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
-#endif
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
-  YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
-{
-  int yynrhs = yyr2[yyrule];
-  int yyi;
-  unsigned long int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	     yyrule - 1, yylno);
-  /* The symbols being reduced.  */
-  for (yyi = 0; yyi < yynrhs; yyi++)
-    {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       );
-      YYFPRINTF (stderr, "\n");
-    }
-}
-
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
-
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-
-
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static YYSIZE_T
-yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif
-{
-  YYSIZE_T yylen;
-  for (yylen = 0; yystr[yylen]; yylen++)
-    continue;
-  return yylen;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
-{
-  char *yyd = yydest;
-  const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-    {
-      YYSIZE_T yyn = 0;
-      char const *yyp = yystr;
-
-      for (;;)
-	switch (*++yyp)
-	  {
-	  case '\'':
-	  case ',':
-	    goto do_not_strip_quotes;
-
-	  case '\\':
-	    if (*++yyp != '\\')
-	      goto do_not_strip_quotes;
-	    /* Fall through.  */
-	  default:
-	    if (yyres)
-	      yyres[yyn] = *yyp;
-	    yyn++;
-	    break;
-
-	  case '"':
-	    if (yyres)
-	      yyres[yyn] = '\0';
-	    return yyn;
-	  }
-    do_not_strip_quotes: ;
-    }
-
-  if (! yyres)
-    return yystrlen (yystr);
-
-  return yystpcpy (yyres, yystr) - yyres;
-}
-# endif
-
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypact[yystate];
-
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
-    {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	      }
-	    yyarg[yycount++] = yytname[yyx];
-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
-
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
-
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
-
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyarg[yyi++]);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
-    }
-}
-#endif /* YYERROR_VERBOSE */
-
-
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
-{
-  YYUSE (yyvaluep);
-
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-  switch (yytype)
-    {
-
-      default:
-	break;
-    }
-}
-
-/* Prevent warnings from -Wmissing-prototypes.  */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
-
-
-
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
-
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
-{
-/* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
-
-    /* Number of syntax errors so far.  */
-    int yynerrs;
-
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-
-       Refer to the stacks thru separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    YYSIZE_T yystacksize;
-
-  int yyn;
-  int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
-
-  /* The number of symbols on the RHS of the reduced rule.
-     Keep to zero when no symbol should be popped.  */
-  int yylen = 0;
-
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
-  YYDPRINTF ((stderr, "Starting parse\n"));
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-  yyssp = yyss;
-  yyvsp = yyvs;
-
-  goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed.  So pushing a state here evens the stacks.  */
-  yyssp++;
-
- yysetstate:
-  *yyssp = yystate;
-
-  if (yyss + yystacksize - 1 <= yyssp)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      {
-	/* Give user a chance to reallocate the stack.  Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	yytype_int16 *yyss1 = yyss;
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow (YY_("memory exhausted"),
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
-      }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
-      /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
-      yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
-
-      {
-	yytype_int16 *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-#  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
-      }
-# endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
-
-      if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
-    }
-
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
-  goto yybackup;
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-
-  /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-  yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
-    }
-
-  if (yychar <= YYEOF)
-    {
-      yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-    }
-
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-    goto yydefault;
-  yyn = yytable[yyn];
-  if (yyn <= 0)
-    {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  /* Shift the lookahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
-
-  yystate = yyn;
-  *++yyvsp = yylval;
-
-  goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
-
-  /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-
-
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
-    {
-        case 2:
-
-/* Line 1455 of yacc.c  */
-#line 92 "../FreezeScript/Grammar.y"
-    {
-    parseResult = (yyvsp[(1) - (1)]);
-;}
-    break;
-
-  case 3:
-
-/* Line 1455 of yacc.c  */
-#line 101 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = (yyvsp[(1) - (1)]);
-;}
-    break;
-
-  case 4:
-
-/* Line 1455 of yacc.c  */
-#line 110 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new BinaryNode(BinOpLess, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
-;}
-    break;
-
-  case 5:
-
-/* Line 1455 of yacc.c  */
-#line 114 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new BinaryNode(BinOpGreater, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
-;}
-    break;
-
-  case 6:
-
-/* Line 1455 of yacc.c  */
-#line 118 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new BinaryNode(BinOpLessEq, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
-;}
-    break;
-
-  case 7:
-
-/* Line 1455 of yacc.c  */
-#line 122 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new BinaryNode(BinOpGrEq, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
-;}
-    break;
-
-  case 8:
-
-/* Line 1455 of yacc.c  */
-#line 126 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new BinaryNode(BinOpEq, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
-;}
-    break;
-
-  case 9:
-
-/* Line 1455 of yacc.c  */
-#line 130 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new BinaryNode(BinOpNotEq, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
-;}
-    break;
-
-  case 10:
-
-/* Line 1455 of yacc.c  */
-#line 134 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new BinaryNode(BinOpOr, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
-;}
-    break;
-
-  case 11:
-
-/* Line 1455 of yacc.c  */
-#line 138 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new BinaryNode(BinOpAnd, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
-;}
-    break;
-
-  case 12:
-
-/* Line 1455 of yacc.c  */
-#line 142 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new BinaryNode(BinOpMul, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
-;}
-    break;
-
-  case 13:
-
-/* Line 1455 of yacc.c  */
-#line 146 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new BinaryNode(BinOpDiv, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
-;}
-    break;
-
-  case 14:
-
-/* Line 1455 of yacc.c  */
-#line 150 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new BinaryNode(BinOpMod, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
-;}
-    break;
-
-  case 15:
-
-/* Line 1455 of yacc.c  */
-#line 154 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new BinaryNode(BinOpAdd, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
-;}
-    break;
-
-  case 16:
-
-/* Line 1455 of yacc.c  */
-#line 158 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new BinaryNode(BinOpSub, parseDataFactory, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
-;}
-    break;
-
-  case 17:
-
-/* Line 1455 of yacc.c  */
-#line 162 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = (yyvsp[(1) - (1)]);
-;}
-    break;
-
-  case 18:
-
-/* Line 1455 of yacc.c  */
-#line 171 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = (yyvsp[(2) - (3)]);
-;}
-    break;
-
-  case 19:
-
-/* Line 1455 of yacc.c  */
-#line 175 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new UnaryNode(UnaryOpNeg, parseDataFactory, (yyvsp[(2) - (2)]));
-;}
-    break;
-
-  case 20:
-
-/* Line 1455 of yacc.c  */
-#line 179 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new UnaryNode(UnaryOpNot, parseDataFactory, (yyvsp[(2) - (2)]));
-;}
-    break;
-
-  case 21:
-
-/* Line 1455 of yacc.c  */
-#line 183 "../FreezeScript/Grammar.y"
-    {
-    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[(1) - (1)]));
-    assert(intVal);
-    (yyval) = new DataNode(parseDataFactory->createInteger(intVal->v, true));
-;}
-    break;
-
-  case 22:
-
-/* Line 1455 of yacc.c  */
-#line 189 "../FreezeScript/Grammar.y"
-    {
-    FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[(1) - (1)]));
-    assert(floatVal);
-    (yyval) = new DataNode(parseDataFactory->createDouble(floatVal->v, true));
-;}
-    break;
-
-  case 23:
-
-/* Line 1455 of yacc.c  */
-#line 195 "../FreezeScript/Grammar.y"
-    {
-    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
-    assert(stringVal);
-    (yyval) = new DataNode(parseDataFactory->createString(stringVal->v, true));
-;}
-    break;
-
-  case 24:
-
-/* Line 1455 of yacc.c  */
-#line 201 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new DataNode(parseDataFactory->createBoolean(true, true));
-;}
-    break;
-
-  case 25:
-
-/* Line 1455 of yacc.c  */
-#line 205 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new DataNode(parseDataFactory->createBoolean(false, true));
-;}
-    break;
-
-  case 26:
-
-/* Line 1455 of yacc.c  */
-#line 209 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new DataNode(parseDataFactory->createNil(true));
-;}
-    break;
-
-  case 27:
-
-/* Line 1455 of yacc.c  */
-#line 213 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = (yyvsp[(1) - (1)]);
-;}
-    break;
-
-  case 28:
-
-/* Line 1455 of yacc.c  */
-#line 217 "../FreezeScript/Grammar.y"
-    {
-    EntityNodePtr entity = EntityNodePtr::dynamicCast((yyvsp[(1) - (3)]));
-    assert(entity);
-    FunctionNodePtr func = FunctionNodePtr::dynamicCast((yyvsp[(3) - (3)]));
-    assert(func);
-    func->setTarget(entity);
-    (yyval) = (yyvsp[(3) - (3)]);
-;}
-    break;
-
-  case 29:
-
-/* Line 1455 of yacc.c  */
-#line 226 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = (yyvsp[(1) - (1)]);
-;}
-    break;
-
-  case 30:
-
-/* Line 1455 of yacc.c  */
-#line 230 "../FreezeScript/Grammar.y"
-    {
-    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
-    assert(stringVal);
-    (yyval) = new ConstantNode(stringVal->v);
-;}
-    break;
-
-  case 31:
-
-/* Line 1455 of yacc.c  */
-#line 241 "../FreezeScript/Grammar.y"
-    {
-    EntityNodePtr entity = EntityNodePtr::dynamicCast((yyvsp[(1) - (4)]));
-    assert(entity);
-    entity->append(new ElementNode((yyvsp[(3) - (4)])));
-    (yyval) = (yyvsp[(1) - (4)]);
-;}
-    break;
-
-  case 32:
-
-/* Line 1455 of yacc.c  */
-#line 248 "../FreezeScript/Grammar.y"
-    {
-    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]));
-    assert(stringVal);
-    EntityNodePtr entity = EntityNodePtr::dynamicCast((yyvsp[(1) - (3)]));
-    assert(entity);
-    entity->append(new IdentNode(stringVal->v));
-    (yyval) = (yyvsp[(1) - (3)]);
-;}
-    break;
-
-  case 33:
-
-/* Line 1455 of yacc.c  */
-#line 257 "../FreezeScript/Grammar.y"
-    {
-    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
-    assert(stringVal);
-    (yyval) = new IdentNode(stringVal->v);
-;}
-    break;
-
-  case 34:
-
-/* Line 1455 of yacc.c  */
-#line 268 "../FreezeScript/Grammar.y"
-    {
-    StringTokPtr func = StringTokPtr::dynamicCast((yyvsp[(1) - (4)]));
-    assert(func);
-    NodeListTokPtr args = NodeListTokPtr::dynamicCast((yyvsp[(3) - (4)]));
-    assert(args);
-    (yyval) = new FunctionNode(func->v, args->v);
-;}
-    break;
-
-  case 35:
-
-/* Line 1455 of yacc.c  */
-#line 281 "../FreezeScript/Grammar.y"
-    {
-    NodeListTokPtr l = NodeListTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    assert(l);
-    l->v.push_back((yyvsp[(3) - (3)]));
-    (yyval) = (yyvsp[(1) - (3)]);
-;}
-    break;
-
-  case 36:
-
-/* Line 1455 of yacc.c  */
-#line 288 "../FreezeScript/Grammar.y"
-    {
-    NodeListTokPtr result = new NodeListTok;
-    result->v.push_back((yyvsp[(1) - (1)]));
-    (yyval) = result;
-;}
-    break;
-
-  case 37:
-
-/* Line 1455 of yacc.c  */
-#line 294 "../FreezeScript/Grammar.y"
-    {
-    (yyval) = new NodeListTok;
-;}
-    break;
-
-  case 38:
-
-/* Line 1455 of yacc.c  */
-#line 303 "../FreezeScript/Grammar.y"
-    {
-    StringTokPtr stringVal = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    assert(stringVal);
-    StringTokPtr idVal = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]));
-    assert(idVal);
-    stringVal->v.append("::" + idVal->v);
-    (yyval) = (yyvsp[(1) - (3)]);
-;}
-    break;
-
-  case 39:
-
-/* Line 1455 of yacc.c  */
-#line 312 "../FreezeScript/Grammar.y"
-    {
-    StringTokPtr idVal = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
-    assert(idVal);
-    StringTokPtr stringVal = new StringTok;
-    stringVal->v.append("::" + idVal->v);
-    (yyval) = stringVal;
-;}
-    break;
-
-
-
-/* Line 1455 of yacc.c  */
-#line 1838 "Grammar.tab.c"
-      default: break;
-    }
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-
-  *++yyvsp = yyval;
-
-  /* Now `shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTOKENS];
-
-  goto yynewstate;
-
-
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-#if ! YYERROR_VERBOSE
-      yyerror (YY_("syntax error"));
-#else
-      {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
-	      YYSTACK_FREE (yymsg);
-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (yymsg);
-	  }
-	else
-	  {
-	    yyerror (YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
-      }
-#endif
-    }
-
-
-
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
-
-      if (yychar <= YYEOF)
-	{
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
-	}
-      else
-	{
-	  yydestruct ("Error: discarding",
-		      yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
-    }
-
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-  goto yyerrlab1;
-
-
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
-
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
-     goto yyerrorlab;
-
-  /* Do not reclaim the symbols of the rule which action triggered
-     this YYERROR.  */
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-  yystate = *yyssp;
-  goto yyerrlab1;
-
-
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
-
-  for (;;)
-    {
-      yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
-
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-	YYABORT;
-
-
-      yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp);
-      YYPOPSTACK (1);
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
-    }
-
-  *++yyvsp = yylval;
-
-
-  /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-#if !defined(yyoverflow) || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
-  yyresult = 2;
-  /* Fall through.  */
-#endif
-
-yyreturn:
-  if (yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
-  /* Do not reclaim the symbols of the rule which action triggered
-     this YYABORT or YYACCEPT.  */
-  YYPOPSTACK (yylen);
-  YY_STACK_PRINT (yyss, yyssp);
-  while (yyssp != yyss)
-    {
-      yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
-      YYPOPSTACK (1);
-    }
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-#if YYERROR_VERBOSE
-  if (yymsg != yymsgbuf)
-    YYSTACK_FREE (yymsg);
-#endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
-}
-
-
-
-/* Line 1675 of yacc.c  */
-#line 321 "../FreezeScript/Grammar.y"
-
-
diff --git a/cpp/src/FreezeScript/Grammar.h b/cpp/src/FreezeScript/Grammar.h
deleted file mode 100644
index ae561a72f12..00000000000
--- a/cpp/src/FreezeScript/Grammar.h
+++ /dev/null
@@ -1,83 +0,0 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Skeleton interface for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     TOK_AND = 258,
-     TOK_OR = 259,
-     TOK_NOT = 260,
-     TOK_ADD = 261,
-     TOK_SUB = 262,
-     TOK_MUL = 263,
-     TOK_DIV = 264,
-     TOK_MOD = 265,
-     TOK_LPAREN = 266,
-     TOK_RPAREN = 267,
-     TOK_LBRACKET = 268,
-     TOK_RBRACKET = 269,
-     TOK_LESS_THAN = 270,
-     TOK_GREATER_THAN = 271,
-     TOK_LESS_EQUAL = 272,
-     TOK_GREATER_EQUAL = 273,
-     TOK_EQUAL = 274,
-     TOK_NEQ = 275,
-     TOK_TRUE = 276,
-     TOK_FALSE = 277,
-     TOK_NIL = 278,
-     TOK_SCOPE_DELIMITER = 279,
-     TOK_IDENTIFIER = 280,
-     TOK_STRING_LITERAL = 281,
-     TOK_INTEGER_LITERAL = 282,
-     TOK_FLOATING_POINT_LITERAL = 283,
-     UNARY_OP = 284
-   };
-#endif
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef int YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-
-
-
diff --git a/cpp/src/FreezeScript/Grammar.y b/cpp/src/FreezeScript/Grammar.y
deleted file mode 100644
index 7c2abd82b52..00000000000
--- a/cpp/src/FreezeScript/Grammar.y
+++ /dev/null
@@ -1,321 +0,0 @@
-%{
-
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/GrammarUtil.h>
-
-#ifdef _MSC_VER
-// I get these warnings from some bison versions:
-// warning C4102: 'yyoverflowlab' : unreferenced label
-#   pragma warning( disable : 4102 )
-// warning C4065: switch statement contains 'default' but no 'case' labels
-#   pragma warning( disable : 4065 )
-#endif
-
-//
-// Avoid old style cast warnings in generated grammar
-//
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-
-using namespace std;
-using namespace FreezeScript;
-
-void
-freeze_script_error(const char* s)
-{
-    // yacc and recent versions of Bison use "syntax error" instead
-    // of "parse error".
-
-    if(strcmp(s, "parse error") == 0)
-    {
-        parseErrorReporter->expressionSyntaxError("syntax error");
-    }
-    else
-    {
-        parseErrorReporter->expressionSyntaxError(s);
-    }
-}
-
-%}
-
-%pure_parser
-
-%token TOK_AND
-%token TOK_OR
-%token TOK_NOT
-%token TOK_ADD
-%token TOK_SUB
-%token TOK_MUL
-%token TOK_DIV
-%token TOK_MOD
-%token TOK_LPAREN
-%token TOK_RPAREN
-%token TOK_LBRACKET
-%token TOK_RBRACKET
-%token TOK_LESS_THAN
-%token TOK_GREATER_THAN
-%token TOK_LESS_EQUAL
-%token TOK_GREATER_EQUAL
-%token TOK_EQUAL
-%token TOK_NEQ
-%token TOK_TRUE
-%token TOK_FALSE
-%token TOK_NIL
-%token TOK_SCOPE_DELIMITER
-%token TOK_IDENTIFIER
-%token TOK_STRING_LITERAL
-%token TOK_INTEGER_LITERAL
-%token TOK_FLOATING_POINT_LITERAL
-
-%left TOK_OR
-%left TOK_AND
-%nonassoc TOK_LESS_THAN TOK_GREATER_THAN TOK_LESS_EQUAL TOK_GREATER_EQUAL TOK_EQUAL TOK_NEQ
-%left TOK_ADD TOK_SUB
-%left TOK_MUL TOK_DIV TOK_MOD
-%right UNARY_OP
-
-%%
-
-// ----------------------------------------------------------------------
-start
-// ----------------------------------------------------------------------
-: expr
-{
-    parseResult = $1;
-}
-;
-
-// ----------------------------------------------------------------------
-expr
-// ----------------------------------------------------------------------
-: binary
-{
-    $$ = $1;
-}
-;
-
-// ----------------------------------------------------------------------
-binary
-// ----------------------------------------------------------------------
-: binary TOK_LESS_THAN binary
-{
-    $$ = new BinaryNode(BinOpLess, parseDataFactory, $1, $3);
-}
-| binary TOK_GREATER_THAN binary
-{
-    $$ = new BinaryNode(BinOpGreater, parseDataFactory, $1, $3);
-}
-| binary TOK_LESS_EQUAL binary
-{
-    $$ = new BinaryNode(BinOpLessEq, parseDataFactory, $1, $3);
-}
-| binary TOK_GREATER_EQUAL binary
-{
-    $$ = new BinaryNode(BinOpGrEq, parseDataFactory, $1, $3);
-}
-| binary TOK_EQUAL binary
-{
-    $$ = new BinaryNode(BinOpEq, parseDataFactory, $1, $3);
-}
-| binary TOK_NEQ binary
-{
-    $$ = new BinaryNode(BinOpNotEq, parseDataFactory, $1, $3);
-}
-| binary TOK_OR binary
-{
-    $$ = new BinaryNode(BinOpOr, parseDataFactory, $1, $3);
-}
-| binary TOK_AND binary
-{
-    $$ = new BinaryNode(BinOpAnd, parseDataFactory, $1, $3);
-}
-| binary TOK_MUL binary
-{
-    $$ = new BinaryNode(BinOpMul, parseDataFactory, $1, $3);
-}
-| binary TOK_DIV binary
-{
-    $$ = new BinaryNode(BinOpDiv, parseDataFactory, $1, $3);
-}
-| binary TOK_MOD binary
-{
-    $$ = new BinaryNode(BinOpMod, parseDataFactory, $1, $3);
-}
-| binary TOK_ADD binary
-{
-    $$ = new BinaryNode(BinOpAdd, parseDataFactory, $1, $3);
-}
-| binary TOK_SUB binary
-{
-    $$ = new BinaryNode(BinOpSub, parseDataFactory, $1, $3);
-}
-| unary
-{
-    $$ = $1;
-}
-;
-
-// ----------------------------------------------------------------------
-unary
-// ----------------------------------------------------------------------
-: TOK_LPAREN expr TOK_RPAREN
-{
-    $$ = $2;
-}
-| TOK_SUB unary       %prec UNARY_OP
-{
-    $$ = new UnaryNode(UnaryOpNeg, parseDataFactory, $2);
-}
-| TOK_NOT unary       %prec UNARY_OP
-{
-    $$ = new UnaryNode(UnaryOpNot, parseDataFactory, $2);
-}
-| TOK_INTEGER_LITERAL
-{
-    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast($1);
-    assert(intVal);
-    $$ = new DataNode(parseDataFactory->createInteger(intVal->v, true));
-}
-| TOK_FLOATING_POINT_LITERAL
-{
-    FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast($1);
-    assert(floatVal);
-    $$ = new DataNode(parseDataFactory->createDouble(floatVal->v, true));
-}
-| TOK_STRING_LITERAL
-{
-    StringTokPtr stringVal = StringTokPtr::dynamicCast($1);
-    assert(stringVal);
-    $$ = new DataNode(parseDataFactory->createString(stringVal->v, true));
-}
-| TOK_TRUE
-{
-    $$ = new DataNode(parseDataFactory->createBoolean(true, true));
-}
-| TOK_FALSE
-{
-    $$ = new DataNode(parseDataFactory->createBoolean(false, true));
-}
-| TOK_NIL
-{
-    $$ = new DataNode(parseDataFactory->createNil(true));
-}
-| entity
-{
-    $$ = $1;
-}
-| entity '.' function
-{
-    EntityNodePtr entity = EntityNodePtr::dynamicCast($1);
-    assert(entity);
-    FunctionNodePtr func = FunctionNodePtr::dynamicCast($3);
-    assert(func);
-    func->setTarget(entity);
-    $$ = $3;
-}
-| function
-{
-    $$ = $1;
-}
-| constant
-{
-    StringTokPtr stringVal = StringTokPtr::dynamicCast($1);
-    assert(stringVal);
-    $$ = new ConstantNode(stringVal->v);
-}
-;
-
-// ----------------------------------------------------------------------
-entity
-// ----------------------------------------------------------------------
-: entity TOK_LBRACKET expr TOK_RBRACKET
-{
-    EntityNodePtr entity = EntityNodePtr::dynamicCast($1);
-    assert(entity);
-    entity->append(new ElementNode($3));
-    $$ = $1;
-}
-| entity '.' TOK_IDENTIFIER
-{
-    StringTokPtr stringVal = StringTokPtr::dynamicCast($3);
-    assert(stringVal);
-    EntityNodePtr entity = EntityNodePtr::dynamicCast($1);
-    assert(entity);
-    entity->append(new IdentNode(stringVal->v));
-    $$ = $1;
-}
-| TOK_IDENTIFIER
-{
-    StringTokPtr stringVal = StringTokPtr::dynamicCast($1);
-    assert(stringVal);
-    $$ = new IdentNode(stringVal->v);
-}
-;
-
-// ----------------------------------------------------------------------
-function
-// ----------------------------------------------------------------------
-: TOK_IDENTIFIER TOK_LPAREN arg_list TOK_RPAREN
-{
-    StringTokPtr func = StringTokPtr::dynamicCast($1);
-    assert(func);
-    NodeListTokPtr args = NodeListTokPtr::dynamicCast($3);
-    assert(args);
-    $$ = new FunctionNode(func->v, args->v);
-}
-;
-
-// ----------------------------------------------------------------------
-arg_list
-// ----------------------------------------------------------------------
-: arg_list ',' expr
-{
-    NodeListTokPtr l = NodeListTokPtr::dynamicCast($1);
-    assert(l);
-    l->v.push_back($3);
-    $$ = $1;
-}
-| expr
-{
-    NodeListTokPtr result = new NodeListTok;
-    result->v.push_back($1);
-    $$ = result;
-}
-|
-{
-    $$ = new NodeListTok;
-}
-;
-
-// ----------------------------------------------------------------------
-constant
-// ----------------------------------------------------------------------
-: constant TOK_SCOPE_DELIMITER TOK_IDENTIFIER
-{
-    StringTokPtr stringVal = StringTokPtr::dynamicCast($1);
-    assert(stringVal);
-    StringTokPtr idVal = StringTokPtr::dynamicCast($3);
-    assert(idVal);
-    stringVal->v.append("::" + idVal->v);
-    $$ = $1;
-}
-| TOK_SCOPE_DELIMITER TOK_IDENTIFIER
-{
-    StringTokPtr idVal = StringTokPtr::dynamicCast($2);
-    assert(idVal);
-    StringTokPtr stringVal = new StringTok;
-    stringVal->v.append("::" + idVal->v);
-    $$ = stringVal;
-}
-;
-
-%%
diff --git a/cpp/src/FreezeScript/GrammarUtil.h b/cpp/src/FreezeScript/GrammarUtil.h
deleted file mode 100644
index 43792e35104..00000000000
--- a/cpp/src/FreezeScript/GrammarUtil.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_SCRIPT_GRAMMAR_UTIL_H
-#define FREEZE_SCRIPT_GRAMMAR_UTIL_H
-
-#include <FreezeScript/Parser.h>
-
-namespace FreezeScript
-{
-
-extern DataFactoryPtr parseDataFactory;
-extern ErrorReporterPtr parseErrorReporter;
-extern NodePtr parseResult;
-extern int parseLine;
-
-int getInput(char*, int);
-
-class StringTok;
-class IdentifierTok;
-class BoolTok;
-class IntegerTok;
-class FloatingTok;
-class NodeListTok;
-
-typedef ::IceUtil::Handle<StringTok> StringTokPtr;
-typedef ::IceUtil::Handle<IdentifierTok> IdentifierTokPtr;
-typedef ::IceUtil::Handle<BoolTok> BoolTokPtr;
-typedef ::IceUtil::Handle<IntegerTok> IntegerTokPtr;
-typedef ::IceUtil::Handle<FloatingTok> FloatingTokPtr;
-typedef ::IceUtil::Handle<NodeListTok> NodeListTokPtr;
-
-// ----------------------------------------------------------------------
-// Token
-// ----------------------------------------------------------------------
-
-class Token : public Node
-{
-public:
-
-    Token() { }
-    virtual DataPtr evaluate(const SymbolTablePtr&) { return 0; }
-    virtual void print(std::ostream&) const {}
-};
-
-// ----------------------------------------------------------------------
-// StringTok
-// ----------------------------------------------------------------------
-
-class StringTok : public Token
-{
-public:
-
-    StringTok() { }
-
-    std::string v;
-};
-
-// ----------------------------------------------------------------------
-// BoolTok
-// ----------------------------------------------------------------------
-
-class BoolTok : public Token
-{
-public:
-
-    BoolTok() { }
-    bool v;
-};
-
-// ----------------------------------------------------------------------
-// IntegerTok
-// ----------------------------------------------------------------------
-
-class IntegerTok : public Token
-{
-public:
-
-    IntegerTok() { }
-    IceUtil::Int64 v;
-};
-
-// ----------------------------------------------------------------------
-// FloatingTok
-// ----------------------------------------------------------------------
-
-class FloatingTok : public Token
-{
-public:
-
-    FloatingTok() { }
-    double v;
-};
-
-class NodeListTok : public Token
-{
-public:
-
-    NodeListTok() { }
-    NodeList v;
-};
-
-} // End of namespace FreezeScript
-
-//
-// Stuff for flex and bison
-//
-
-#define YYSTYPE FreezeScript::NodePtr
-#define YY_DECL int freeze_script_lex(YYSTYPE* yylvalp)
-YY_DECL;
-int freeze_script_parse();
-
-//
-// I must set the initial stack depth to the maximum stack depth to
-// disable bison stack resizing. The bison stack resizing routines use
-// simple malloc/alloc/memcpy calls, which do not work for the
-// YYSTYPE, since YYSTYPE is a C++ type, with constructor, destructor,
-// assignment operator, etc.
-//
-#define YYMAXDEPTH  10000
-#define YYINITDEPTH YYMAXDEPTH // Initial depth is set to max depth, for the reasons described above.
-
-//
-// Newer bison versions allow to disable stack resizing by defining
-// yyoverflow.
-//
-#define yyoverflow(a, b, c, d, e, f) freeze_script_error(a)
-
-#endif
diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile
deleted file mode 100644
index 0e473539e0a..00000000000
--- a/cpp/src/FreezeScript/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-TRANSFORMDB	= $(bindir)/transformdb
-DUMPDB		= $(bindir)/dumpdb
-
-TARGETS		= $(TRANSFORMDB) $(DUMPDB)
-
-COMMON_OBJS	= AssignVisitor.o \
-		  Data.o \
-		  Error.o \
-		  Exception.o \
-		  Functions.o \
-		  Parser.o \
-		  Print.o \
-		  Scanner.o \
-		  Util.o \
-		  Grammar.o
-
-TRANSFORM_OBJS 	= TransformAnalyzer.o \
-		  TransformVisitor.o \
-		  Transformer.o \
-		  transformdb.o
-
-DUMP_OBJS	= DumpDescriptors.o \
-		  DumpDB.o
-
-OBJS		= $(COMMON_OBJS) $(TRANSFORM_OBJS) $(DUMP_OBJS)
-
-HDIR		= $(headerdir)/FreezeScript
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I.. $(CPPFLAGS) $(DB_FLAGS)
-BISONFLAGS	:= --name-prefix "freeze_script_" $(BISONFLAGS)
-
-$(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(TRANSFORM_OBJS) $(COMMON_OBJS) -lSlice $(EXPAT_RPATH_LINK) -lIceXML $(DB_RPATH_LINK) -lFreeze $(LIBS) $(DB_LIBS)
-
-$(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(DUMP_OBJS) $(COMMON_OBJS) -lSlice $(EXPAT_RPATH_LINK) -lIceXML $(DB_RPATH_LINK) -lFreeze $(LIBS) $(DB_LIBS)
-
-install:: all
-	$(call installprogram,$(TRANSFORMDB),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/transformdb.1,$(DESTDIR)$(install_mandir))
-	$(call installprogram,$(DUMPDB),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/dumpdb.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak
deleted file mode 100644
index 96010b08987..00000000000
--- a/cpp/src/FreezeScript/Makefile.mak
+++ /dev/null
@@ -1,90 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-TRANSFORMDB	= $(top_srcdir)\bin\transformdb.exe
-DUMPDB		= $(top_srcdir)\bin\dumpdb.exe
-
-TARGETS		= $(TRANSFORMDB) $(DUMPDB)
-
-BISON_FLEX_OBJS = .\Grammar.obj \
-                  .\Scanner.obj
-
-COMMON_OBJS	= .\AssignVisitor.obj \
-		  .\Data.obj \
-		  .\Error.obj \
-		  .\Functions.obj \
-		  .\Exception.obj \
-		  .\Parser.obj \
-		  .\Print.obj \
-		  .\Util.obj \
-                  $(BISON_FLEX_OBJS)
-
-TRANSFORM_OBJS =  .\TransformAnalyzer.obj \
-		  .\TransformVisitor.obj \
-		  .\Transformer.obj \
-		  .\transformdb.obj
-
-DUMP_OBJS	= .\DumpDescriptors.obj \
-		  .\DumpDB.obj
-
-OBJS		= $(COMMON_OBJS) $(TRANSFORM_OBJS) $(DUMP_OBJS)
-
-HDIR		= $(headerdir)\FreezeScript
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-$(OBJS)		: $(DB_NUPKG)
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN $(DB_CPPFLAGS)
-BISONFLAGS	= --name-prefix "freeze_script_" $(BISONFLAGS)
-
-LINKWITH	= $(LIBS) $(DB_LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-TPDBFLAGS        = /pdb:$(TRANSFORMDB:.exe=.pdb)
-DPDBFLAGS        = /pdb:$(DUMPDB:.exe=.pdb)
-!endif
-
-TRES_FILE        = TransformDB.res
-DRES_FILE        = DumpDB.res
-
-$(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS) TransformDB.res
-	$(LINK) $(LD_EXEFLAGS) $(DB_LDFLAGS) $(TPDBFLAGS) $(TRANSFORM_OBJS) $(COMMON_OBJS) $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)$(LINKWITH) $(TRES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-    @if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-$(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS) DumpDB.res
-	$(LINK) $(LD_EXEFLAGS) $(DB_LDFLAGS) $(DPDBFLAGS) $(DUMP_OBJS) $(COMMON_OBJS) $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)$(LINKWITH) $(DRES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-    @if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	-del /q $(TRANSFORMDB:.exe=.*)
-	-del /q $(DUMPDB:.exe=.*)
-	-del /q TransformDB.res DumpDB.res
-
-install:: all
-	copy $(TRANSFORMDB) "$(install_bindir)"
-	copy $(DUMPDB) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(TRANSFORMDB:.exe=.pdb) "$(install_bindir)"
-	copy $(DUMPDB:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/FreezeScript/Parser.cpp b/cpp/src/FreezeScript/Parser.cpp
deleted file mode 100644
index 3d58654f201..00000000000
--- a/cpp/src/FreezeScript/Parser.cpp
+++ /dev/null
@@ -1,728 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/Parser.h>
-#include <FreezeScript/GrammarUtil.h>
-#include <IceUtil/Mutex.h>
-#include <IceUtil/MutexPtrLock.h>
-
-using namespace std;
-
-namespace FreezeScript
-{
-
-class EntityNodePrinter : public EntityNodeVisitor
-{
-public:
-
-    EntityNodePrinter(ostream& os) :
-        _os(os), _first(true)
-    {
-    }
-
-    virtual void
-    visitIdentifier(const std::string& name)
-    {
-        if(_first)
-        {
-            _first = false;
-        }
-        else
-        {
-            _os << '.';
-        }
-        _os << name;
-    }
-
-    virtual void
-    visitElement(const NodePtr& value)
-    {
-        assert(!_first);
-        _os << '[';
-        value->print(_os);
-        _os << ']';
-    }
-
-private:
-
-    ostream& _os;
-    bool _first;
-};
-
-} // End of namespace FreezeScript
-
-//
-// Globals required by the Bison grammar.
-//
-FreezeScript::DataFactoryPtr FreezeScript::parseDataFactory;
-FreezeScript::ErrorReporterPtr FreezeScript::parseErrorReporter;
-FreezeScript::NodePtr FreezeScript::parseResult;
-int FreezeScript::parseLine;
-
-namespace
-{
-
-string _input;
-string::size_type _pos;
-
-IceUtil::Mutex* _parserMutex = 0;
-
-class Init
-{
-public:
-
-    Init()
-    {
-        _parserMutex = new IceUtil::Mutex;
-    }
-
-    ~Init()
-    {
-        delete _parserMutex;
-        _parserMutex = 0;
-    }
-};
-
-Init init;
-
-}
-
-//
-// parseExpression
-//
-FreezeScript::NodePtr
-FreezeScript::parseExpression(const string& expr, const DataFactoryPtr& factory, const ErrorReporterPtr& errorReporter)
-{
-    //
-    // The bison grammar is not thread-safe.
-    //
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(_parserMutex);
-
-    parseDataFactory = factory;
-    parseErrorReporter = errorReporter;
-    parseLine = 1;
-
-    parseErrorReporter->setExpression(expr);
-
-    _input = expr;
-    _pos = 0;
-
-    int status = freeze_script_parse();
-    if(status != 0)
-    {
-        parseResult = 0;
-    }
-
-    parseErrorReporter->clearExpression();
-    parseErrorReporter = 0;
-
-    return parseResult;
-}
-
-//
-// getInput supplies characters to the lexical scanner.
-//
-int
-FreezeScript::getInput(char* buf, int /*maxSize*/)
-{
-    if(_pos < _input.length())
-    {
-        buf[0] = _input[_pos];
-        _pos++;
-        return 1;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-//
-// EvaluateException
-//
-FreezeScript::EvaluateException::EvaluateException(const char* file, int line, const string& reason) :
-    IceUtil::Exception(file, line), _reason(reason)
-{
-}
-
-FreezeScript::EvaluateException::~EvaluateException() throw()
-{
-}
-
-const char* FreezeScript::EvaluateException::_name = "FreezeScript::EvaluateException";
-
-string
-FreezeScript::EvaluateException::ice_name() const
-{
-    return _name;
-}
-
-void
-FreezeScript::EvaluateException::ice_print(ostream& out) const
-{
-    Ice::Exception::ice_print(out);
-    out << ":\nerror occurred while evaluating expression";
-    if(!_reason.empty())
-    {
-        out << ":\n" << _reason;
-    }
-}
-
-FreezeScript::EvaluateException*
-FreezeScript::EvaluateException::ice_clone() const
-{
-    return new EvaluateException(ice_file(), ice_line(), _reason);
-}
-
-void
-FreezeScript::EvaluateException::ice_throw() const
-{
-    throw *this;
-}
-
-string
-FreezeScript::EvaluateException::reason() const
-{
-    return _reason;
-}
-
-//
-// SymbolTable
-//
-FreezeScript::SymbolTable::~SymbolTable()
-{
-}
-
-//
-// Node
-//
-FreezeScript::Node::~Node()
-{
-}
-
-//
-// BinaryNode
-//
-FreezeScript::BinaryNode::BinaryNode(BinaryOperator op, const DataFactoryPtr& factory, const NodePtr& left,
-                                  const NodePtr& right) :
-    _op(op), _factory(factory), _left(left), _right(right)
-{
-}
-
-FreezeScript::DataPtr
-FreezeScript::BinaryNode::evaluate(const SymbolTablePtr& st)
-{
-    DataPtr result;
-
-    switch(_op)
-    {
-    case BinOpOr:
-    {
-        DataPtr leftValue = _left->evaluate(st);
-        if(leftValue->booleanValue())
-        {
-            result = leftValue;
-        }
-        else
-        {
-            result = _right->evaluate(st);
-        }
-        break;
-    }
-
-    case BinOpAnd:
-    {
-        DataPtr leftValue = _left->evaluate(st);
-        if(!leftValue->booleanValue())
-        {
-            result = leftValue;
-        }
-        else
-        {
-            result = _right->evaluate(st);
-        }
-        break;
-    }
-
-    case BinOpMul:
-    {
-        DataPtr leftValue = _left->evaluate(st);
-        DataPtr rightValue = _right->evaluate(st);
-        IntegerDataPtr ileft = IntegerDataPtr::dynamicCast(leftValue);
-        IntegerDataPtr iright = IntegerDataPtr::dynamicCast(rightValue);
-        if(ileft && iright)
-        {
-            result = _factory->createInteger(leftValue->integerValue() * rightValue->integerValue(), true);
-        }
-        else
-        {
-            result = _factory->createDouble(leftValue->doubleValue(true) * rightValue->doubleValue(true), true);
-        }
-        break;
-    }
-
-    case BinOpDiv:
-    {
-        DataPtr leftValue = _left->evaluate(st);
-        DataPtr rightValue = _right->evaluate(st);
-        IntegerDataPtr ileft = IntegerDataPtr::dynamicCast(leftValue);
-        IntegerDataPtr iright = IntegerDataPtr::dynamicCast(rightValue);
-        if(ileft && iright)
-        {
-            result = _factory->createInteger(leftValue->integerValue() / rightValue->integerValue(), true);
-        }
-        else
-        {
-            result = _factory->createDouble(leftValue->doubleValue(true) / rightValue->doubleValue(true), true);
-        }
-        break;
-    }
-
-    case BinOpMod:
-    {
-        DataPtr leftValue = _left->evaluate(st);
-        DataPtr rightValue = _right->evaluate(st);
-        result = _factory->createInteger(leftValue->integerValue() % rightValue->integerValue(), true);
-        break;
-    }
-
-    case BinOpAdd:
-    {
-        DataPtr leftValue = _left->evaluate(st);
-        DataPtr rightValue = _right->evaluate(st);
-        StringDataPtr sleft = StringDataPtr::dynamicCast(leftValue);
-        StringDataPtr sright = StringDataPtr::dynamicCast(rightValue);
-        IntegerDataPtr ileft = IntegerDataPtr::dynamicCast(leftValue);
-        IntegerDataPtr iright = IntegerDataPtr::dynamicCast(rightValue);
-        if(sleft || sright)
-        {
-            if(sleft && sright)
-            {
-                result = _factory->createString(leftValue->stringValue() + rightValue->stringValue(), true);
-            }
-            else
-            {
-                _factory->getErrorReporter()->error("string concatenation requires two string arguments");
-            }
-        }
-        else if(ileft && iright)
-        {
-            result = _factory->createInteger(leftValue->integerValue() + rightValue->integerValue(), true);
-        }
-        else
-        {
-            result = _factory->createDouble(leftValue->doubleValue(true) + rightValue->doubleValue(true), true);
-        }
-        break;
-    }
-
-    case BinOpSub:
-    {
-        DataPtr leftValue = _left->evaluate(st);
-        DataPtr rightValue = _right->evaluate(st);
-        IntegerDataPtr ileft = IntegerDataPtr::dynamicCast(leftValue);
-        IntegerDataPtr iright = IntegerDataPtr::dynamicCast(rightValue);
-        if(ileft && iright)
-        {
-            result = _factory->createInteger(leftValue->integerValue() - rightValue->integerValue(), true);
-        }
-        else
-        {
-            result = _factory->createDouble(leftValue->doubleValue(true) - rightValue->doubleValue(true), true);
-        }
-        break;
-    }
-
-    case BinOpLess:
-    {
-        DataPtr leftValue = _left->evaluate(st);
-        DataPtr rightValue = _right->evaluate(st);
-        bool b = leftValue < rightValue;
-        result = _factory->createBoolean(b, true);
-        break;
-    }
-
-    case BinOpGreater:
-    {
-        DataPtr leftValue = _left->evaluate(st);
-        DataPtr rightValue = _right->evaluate(st);
-        bool b = (leftValue < rightValue) || (leftValue == rightValue);
-        result = _factory->createBoolean(!b, true);
-        break;
-    }
-
-    case BinOpLessEq:
-    {
-        DataPtr leftValue = _left->evaluate(st);
-        DataPtr rightValue = _right->evaluate(st);
-        bool b = (leftValue < rightValue) || (leftValue == rightValue);
-        result = _factory->createBoolean(b, true);
-        break;
-    }
-
-    case BinOpGrEq:
-    {
-        DataPtr leftValue = _left->evaluate(st);
-        DataPtr rightValue = _right->evaluate(st);
-        bool b = leftValue < rightValue;
-        result = _factory->createBoolean(!b, true);
-        break;
-    }
-
-    case BinOpEq:
-    {
-        DataPtr leftValue = _left->evaluate(st);
-        DataPtr rightValue = _right->evaluate(st);
-        bool b = leftValue == rightValue;
-        result = _factory->createBoolean(b, true);
-        break;
-    }
-
-    case BinOpNotEq:
-    {
-        DataPtr leftValue = _left->evaluate(st);
-        DataPtr rightValue = _right->evaluate(st);
-        bool b = leftValue == rightValue;
-        result = _factory->createBoolean(!b, true);
-        break;
-    }
-    }
-
-    if(!result)
-    {
-        throw EvaluateException(__FILE__, __LINE__, "invalid operands to operator " + opToString(_op));
-    }
-
-    return result;
-}
-
-void
-FreezeScript::BinaryNode::print(ostream& os) const
-{
-    os << opToString(_op) << ": left=";
-    _left->print(os);
-    os << ", right=";
-    _right->print(os);
-}
-
-string
-FreezeScript::BinaryNode::opToString(BinaryOperator op)
-{
-    switch(op)
-    {
-    case BinOpOr:
-        return "OR";
-
-    case BinOpAnd:
-        return "AND";
-
-    case BinOpMul:
-        return "*";
-
-    case BinOpDiv:
-        return "/";
-
-    case BinOpMod:
-        return "%";
-
-    case BinOpAdd:
-        return "+";
-
-    case BinOpSub:
-        return "-";
-
-    case BinOpLess:
-        return "<";
-
-    case BinOpGreater:
-        return ">";
-
-    case BinOpLessEq:
-        return "<=";
-
-    case BinOpGrEq:
-        return ">=";
-
-    case BinOpEq:
-        return "==";
-
-    case BinOpNotEq:
-        return "!=";
-    }
-
-    assert(false);
-    return string();
-}
-
-//
-// UnaryNode
-//
-FreezeScript::UnaryNode::UnaryNode(UnaryOperator op, const DataFactoryPtr& factory, const NodePtr& right) :
-    _op(op), _factory(factory), _right(right)
-{
-}
-
-FreezeScript::DataPtr
-FreezeScript::UnaryNode::evaluate(const SymbolTablePtr& st)
-{
-    DataPtr result;
-
-    switch(_op)
-    {
-    case UnaryOpNeg:
-    {
-        DataPtr rightValue = _right->evaluate(st);
-        IntegerDataPtr iright = IntegerDataPtr::dynamicCast(rightValue);
-        if(iright)
-        {
-            result = _factory->createInteger(-rightValue->integerValue(), true);
-        }
-        else
-        {
-            result = _factory->createDouble(-rightValue->doubleValue(), true);
-        }
-        break;
-    }
-
-    case UnaryOpNot:
-    {
-        DataPtr rightValue = _right->evaluate(st);
-        result = _factory->createBoolean(!rightValue->booleanValue(), true);
-        break;
-    }
-    }
-
-    if(!result)
-    {
-        throw EvaluateException(__FILE__, __LINE__, "invalid operand to operator " + opToString(_op));
-    }
-
-    return result;
-}
-
-void
-FreezeScript::UnaryNode::print(ostream& os) const
-{
-    os << opToString(_op) << ": right=";
-    _right->print(os);
-}
-
-string
-FreezeScript::UnaryNode::opToString(UnaryOperator op)
-{
-    switch(op)
-    {
-    case UnaryOpNeg:
-        return "-";
-
-    case UnaryOpNot:
-        return "!";
-    }
-
-    assert(false);
-    return string();
-}
-
-//
-// DataNode
-//
-FreezeScript::DataNode::DataNode(const DataPtr& data) :
-    _data(data)
-{
-}
-
-FreezeScript::DataPtr
-FreezeScript::DataNode::evaluate(const SymbolTablePtr&)
-{
-    return _data;
-}
-
-void
-FreezeScript::DataNode::print(ostream& /*os*/) const
-{
-    // TODO
-    //_data->print(os);
-}
-
-//
-// EntityNodeVisitor
-//
-FreezeScript::EntityNodeVisitor::~EntityNodeVisitor()
-{
-}
-
-//
-// EntityNode
-//
-FreezeScript::DataPtr
-FreezeScript::EntityNode::evaluate(const SymbolTablePtr& st)
-{
-    DataPtr result = st->getValue(this);
-    if(!result)
-    {
-        ostringstream ostr;
-        print(ostr);
-        throw EvaluateException(__FILE__, __LINE__, "unknown entity `" + ostr.str() + "'");
-    }
-    return result;
-}
-
-void
-FreezeScript::EntityNode::print(ostream& os) const
-{
-    EntityNodePrinter printer(os);
-    visit(printer);
-}
-
-void
-FreezeScript::EntityNode::append(const EntityNodePtr& next)
-{
-    if(_next)
-    {
-        _next->append(next);
-    }
-    else
-    {
-        _next = next;
-    }
-}
-
-//
-// IdentNode
-//
-FreezeScript::IdentNode::IdentNode(const string& value) :
-    _value(value)
-{
-}
-
-string
-FreezeScript::IdentNode::getValue() const
-{
-    return _value;
-}
-
-void
-FreezeScript::IdentNode::visit(EntityNodeVisitor& visitor) const
-{
-    visitor.visitIdentifier(_value);
-    if(_next)
-    {
-        _next->visit(visitor);
-    }
-}
-
-//
-// ElementNode
-//
-FreezeScript::ElementNode::ElementNode(const NodePtr& value) :
-    _value(value)
-{
-}
-
-FreezeScript::NodePtr
-FreezeScript::ElementNode::getValue() const
-{
-    return _value;
-}
-
-void
-FreezeScript::ElementNode::visit(EntityNodeVisitor& visitor) const
-{
-    visitor.visitElement(_value);
-    if(_next)
-    {
-        _next->visit(visitor);
-    }
-}
-
-//
-// FunctionNode
-//
-FreezeScript::FunctionNode::FunctionNode(const string& name, const NodeList& args) :
-    _name(name), _args(args)
-{
-}
-
-FreezeScript::DataPtr
-FreezeScript::FunctionNode::evaluate(const SymbolTablePtr& st)
-{
-    DataPtr target;
-    if(_target)
-    {
-        target = _target->evaluate(st);
-    }
-    DataList args;
-    for(NodeList::iterator p = _args.begin(); p != _args.end(); ++p)
-    {
-        args.push_back((*p)->evaluate(st));
-    }
-    return st->invokeFunction(_name, target, args);
-}
-
-void
-FreezeScript::FunctionNode::print(ostream& os) const
-{
-    if(_target)
-    {
-        _target->print(os);
-        os << '.';
-    }
-    os << _name << '(';
-    for(NodeList::const_iterator p = _args.begin(); p != _args.end(); ++p)
-    {
-        if(p != _args.begin())
-        {
-            os << ", ";
-        }
-        (*p)->print(os);
-    }
-    os << ')';
-}
-
-void
-FreezeScript::FunctionNode::setTarget(const EntityNodePtr& target)
-{
-    _target = target;
-}
-
-//
-// ConstantNode
-//
-FreezeScript::ConstantNode::ConstantNode(const string& value) :
-    _value(value)
-{
-}
-
-FreezeScript::DataPtr
-FreezeScript::ConstantNode::evaluate(const SymbolTablePtr& st)
-{
-    DataPtr result = st->getConstantValue(_value);
-    if(!result)
-    {
-        throw EvaluateException(__FILE__, __LINE__, "unknown constant `" + _value + "'");
-    }
-    return result;
-}
-
-void
-FreezeScript::ConstantNode::print(ostream& os) const
-{
-    os << _value;
-}
-
-//
-// Stream insertion for an entity node.
-//
-ostream&
-operator<<(ostream& os, const FreezeScript::EntityNodePtr& entity)
-{
-    FreezeScript::EntityNodePrinter printer(os);
-    entity->visit(printer);
-    return os;
-}
diff --git a/cpp/src/FreezeScript/Parser.h b/cpp/src/FreezeScript/Parser.h
deleted file mode 100644
index 0e9babb8696..00000000000
--- a/cpp/src/FreezeScript/Parser.h
+++ /dev/null
@@ -1,251 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_SCRIPT_PARSER_H
-#define FREEZE_SCRIPT_PARSER_H
-
-#include <FreezeScript/Data.h>
-
-namespace FreezeScript
-{
-
-class SymbolTable;
-typedef IceUtil::Handle<SymbolTable> SymbolTablePtr;
-
-class Node;
-typedef IceUtil::Handle<Node> NodePtr;
-
-typedef std::vector<NodePtr> NodeList;
-
-class EntityNode;
-typedef IceUtil::Handle<EntityNode> EntityNodePtr;
-
-//
-// parseExpression parses the given expression and returns the root node of the parse tree.
-//
-NodePtr parseExpression(const std::string&, const DataFactoryPtr&, const ErrorReporterPtr&);
-
-//
-// EvaluateException is raised by Node::evaluate().
-//
-class EvaluateException : public IceUtil::Exception
-{
-public:
-    
-    EvaluateException(const char*, int, const std::string&);
-    virtual ~EvaluateException() throw();
-    virtual std::string ice_name() const;
-    virtual void ice_print(std::ostream&) const;
-    virtual EvaluateException* ice_clone() const;
-    virtual void ice_throw() const;
-
-    std::string reason() const;
-
-private:
-
-    std::string _reason;
-    static const char* _name;
-};
-
-//
-// SymbolTable is an interface for the lookup operations required by node evaluation.
-//
-class SymbolTable : public IceUtil::SimpleShared
-{
-public:
-
-    virtual ~SymbolTable();
-
-    virtual void add(const std::string&, const DataPtr&) = 0;
-
-    virtual DataPtr getValue(const EntityNodePtr&) const = 0;
-
-    virtual DataPtr getConstantValue(const std::string&) const = 0;
-
-    virtual SymbolTablePtr createChild() = 0;
-
-    virtual Slice::TypePtr lookupType(const std::string&) = 0;
-
-    virtual DataPtr invokeFunction(const std::string&, const DataPtr&, const DataList&) = 0;
-};
-
-class Node : public IceUtil::SimpleShared
-{
-public:
-
-    virtual ~Node();
-
-    virtual DataPtr evaluate(const SymbolTablePtr&) = 0;
-
-    virtual void print(std::ostream&) const = 0;
-};
-
-enum BinaryOperator
-{
-    BinOpOr, BinOpAnd,
-    BinOpMul, BinOpDiv, BinOpMod,
-    BinOpAdd, BinOpSub,
-    BinOpLess, BinOpGreater, BinOpLessEq, BinOpGrEq, BinOpEq, BinOpNotEq
-};
-
-class BinaryNode : public Node
-{
-public:
-
-    BinaryNode(BinaryOperator, const DataFactoryPtr&, const NodePtr&, const NodePtr&);
-
-    virtual DataPtr evaluate(const SymbolTablePtr&);
-
-    virtual void print(std::ostream&) const;
-
-private:
-
-    static std::string opToString(BinaryOperator);
-
-    BinaryOperator _op;
-    DataFactoryPtr _factory;
-    NodePtr _left;
-    NodePtr _right;
-};
-
-enum UnaryOperator { UnaryOpNeg, UnaryOpNot };
-
-class UnaryNode : public Node
-{
-public:
-
-    UnaryNode(UnaryOperator, const DataFactoryPtr&, const NodePtr&);
-
-    virtual DataPtr evaluate(const SymbolTablePtr&);
-
-    virtual void print(std::ostream&) const;
-
-private:
-
-    static std::string opToString(UnaryOperator);
-
-    UnaryOperator _op;
-    DataFactoryPtr _factory;
-    NodePtr _right;
-};
-
-class DataNode : public Node
-{
-public:
-
-    DataNode(const DataPtr&);
-
-    virtual DataPtr evaluate(const SymbolTablePtr&);
-
-    virtual void print(std::ostream&) const;
-
-private:
-
-    DataPtr _data;
-};
-
-class EntityNodeVisitor
-{
-public:
-
-    virtual ~EntityNodeVisitor();
-
-    virtual void visitIdentifier(const std::string&) = 0;
-    virtual void visitElement(const NodePtr&) = 0;
-};
-
-class EntityNode : public Node
-{
-public:
-
-    virtual DataPtr evaluate(const SymbolTablePtr&);
-
-    virtual void print(std::ostream&) const;
-
-    virtual void visit(EntityNodeVisitor&) const = 0;
-
-    void append(const EntityNodePtr&);
-
-protected:
-
-    EntityNodePtr _next;
-};
-
-class IdentNode : public EntityNode
-{
-public:
-
-    IdentNode(const std::string&);
-
-    virtual void visit(EntityNodeVisitor&) const;
-
-    std::string getValue() const;
-
-private:
-
-    std::string _value;
-};
-typedef IceUtil::Handle<IdentNode> IdentNodePtr;
-
-class ElementNode : public EntityNode
-{
-public:
-
-    ElementNode(const NodePtr&);
-
-    virtual void visit(EntityNodeVisitor&) const;
-
-    NodePtr getValue() const;
-
-private:
-
-    NodePtr _value;
-};
-typedef IceUtil::Handle<ElementNode> ElementNodePtr;
-
-class FunctionNode : public Node
-{
-public:
-
-    FunctionNode(const std::string&, const NodeList&);
-
-    virtual DataPtr evaluate(const SymbolTablePtr&);
-
-    virtual void print(std::ostream&) const;
-
-    void setTarget(const EntityNodePtr&);
-
-private:
-
-    std::string _name;
-    NodeList _args;
-    EntityNodePtr _target;
-};
-typedef IceUtil::Handle<FunctionNode> FunctionNodePtr;
-
-class ConstantNode : public Node
-{
-public:
-
-    ConstantNode(const std::string&);
-
-    virtual DataPtr evaluate(const SymbolTablePtr&);
-
-    virtual void print(std::ostream&) const;
-
-private:
-
-    std::string _value;
-};
-
-} // End of namespace FreezeScript
-
-std::ostream& operator<<(std::ostream&, const FreezeScript::EntityNodePtr&);
-
-#endif
diff --git a/cpp/src/FreezeScript/Print.cpp b/cpp/src/FreezeScript/Print.cpp
deleted file mode 100644
index 894b4d2c1e6..00000000000
--- a/cpp/src/FreezeScript/Print.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/Print.h>
-#include <FreezeScript/Util.h>
-#include <IceUtil/OutputUtil.h>
-
-using namespace std;
-using namespace IceUtil;
-using namespace IceUtilInternal;
-
-namespace FreezeScript
-{
-
-class PrintVisitor : public DataVisitor
-{
-public:
-
-    PrintVisitor(ostream&);
-    ~PrintVisitor();
-
-    virtual void visitBoolean(const BooleanDataPtr&);
-    virtual void visitInteger(const IntegerDataPtr&);
-    virtual void visitDouble(const DoubleDataPtr&);
-    virtual void visitString(const StringDataPtr&);
-    virtual void visitProxy(const ProxyDataPtr&);
-    virtual void visitStruct(const StructDataPtr&);
-    virtual void visitSequence(const SequenceDataPtr&);
-    virtual void visitEnum(const EnumDataPtr&);
-    virtual void visitDictionary(const DictionaryDataPtr&);
-    virtual void visitObject(const ObjectRefPtr&);
-
-private:
-
-    void printObjectMembers(const Slice::ClassDefPtr&, const DataMemberMap&);
-
-    IceUtilInternal::Output _out;
-    typedef map<const ObjectData*, int> ObjectHistoryMap;
-    ObjectHistoryMap _objectHistory;
-    int _objectCount;
-};
-
-} // End of namespace FreezeScript
-
-//
-// printData
-//
-void
-FreezeScript::printData(const DataPtr& data, ostream& os)
-{
-    PrintVisitor visitor(os);
-    data->visit(visitor);
-}
-
-//
-// PrintVisitor
-//
-FreezeScript::PrintVisitor::PrintVisitor(ostream& os) :
-    _out(os), _objectCount(0)
-{
-}
-
-FreezeScript::PrintVisitor::~PrintVisitor()
-{
-}
-
-void
-FreezeScript::PrintVisitor::visitBoolean(const BooleanDataPtr& data)
-{
-    _out << "bool(" << data->toString() << ")";
-}
-
-void
-FreezeScript::PrintVisitor::visitInteger(const IntegerDataPtr& data)
-{
-    _out << typeToString(data->getType()) << "(" << data->toString() << ")";
-}
-
-void
-FreezeScript::PrintVisitor::visitDouble(const DoubleDataPtr& data)
-{
-    _out << typeToString(data->getType()) << "(" << data->toString() << ")";
-}
-
-void
-FreezeScript::PrintVisitor::visitString(const StringDataPtr& data)
-{
-    _out << "'" << data->toString() << "'";
-}
-
-void
-FreezeScript::PrintVisitor::visitProxy(const ProxyDataPtr& data)
-{
-    string str = data->toString();
-    _out << typeToString(data->getType()) << '(' << (str.empty() ? string("nil") : str) << ')';
-}
-
-void
-FreezeScript::PrintVisitor::visitStruct(const StructDataPtr& data)
-{
-    Slice::StructPtr type = Slice::StructPtr::dynamicCast(data->getType());
-    assert(type);
-    _out << "struct " << typeToString(type);
-    _out << sb;
-    //
-    // Print members in order of declaration.
-    //
-    Slice::DataMemberList l = type->dataMembers();
-    DataMemberMap members = data->getMembers();
-    for(Slice::DataMemberList::const_iterator p = l.begin(); p != l.end(); ++p)
-    {
-        DataMemberMap::const_iterator q = members.find((*p)->name());
-        assert(q != members.end());
-        _out << nl;
-        _out << q->first << " = ";
-        q->second->visit(*this);
-    }
-    _out << eb;
-}
-
-void
-FreezeScript::PrintVisitor::visitSequence(const SequenceDataPtr& data)
-{
-    DataList& elements = data->getElements();
-    _out << "sequence " << typeToString(data->getType()) << " (size = " << elements.size() << ")";
-    _out << sb;
-    Ice::Int i = 0;
-    for(DataList::const_iterator p = elements.begin(); p != elements.end(); ++p, ++i)
-    {
-        _out << nl << "[" << i << "] = ";
-        (*p)->visit(*this);
-    }
-    _out << eb;
-}
-
-void
-FreezeScript::PrintVisitor::visitEnum(const EnumDataPtr& data)
-{
-    _out << typeToString(data->getType()) << "(" << data->toString() << ")";
-}
-
-void
-FreezeScript::PrintVisitor::visitDictionary(const DictionaryDataPtr& data)
-{
-    DataMap& map = data->getElements();
-    _out << "dictionary " << typeToString(data->getType()) << " (size = " << map.size() << ")";
-    _out << sb;
-    for(DataMap::const_iterator p = map.begin(); p != map.end(); ++p)
-    {
-        _out << nl;
-        p->first->visit(*this);
-        _out << " => ";
-        p->second->visit(*this);
-    }
-    _out << eb;
-}
-
-void
-FreezeScript::PrintVisitor::visitObject(const ObjectRefPtr& data)
-{
-    ObjectDataPtr value = data->getValue();
-    if(!value)
-    {
-        _out << typeToString(data->getType()) << "(nil)";
-    }
-    else
-    {
-        Slice::TypePtr type = value->getType();
-        Slice::ClassDeclPtr decl = Slice::ClassDeclPtr::dynamicCast(type); // May be nil for Ice::Object
-
-        _out << "class " << typeToString(type);
-        ObjectHistoryMap::iterator p = _objectHistory.find(value.get());
-        if(p != _objectHistory.end())
-        {
-            ostringstream ostr;
-            ostr << " (object #" << p->second << ")";
-            _out << ostr.str();
-        }
-        else
-        {
-            _objectHistory.insert(ObjectHistoryMap::value_type(value.get(), _objectCount));
-            ostringstream ostr;
-            ostr << " (object #" << _objectCount << ")";
-            _out << ostr.str();
-            _objectCount++;
-            _out << sb;
-
-            DataMemberMap members = value->getMembers();
-
-            //
-            // If Ice::Object had any members, this is where we would print them.
-            //
-
-            if(decl)
-            {
-                Slice::ClassDefPtr def = decl->definition();
-                assert(def);
-                printObjectMembers(def, members);
-            }
-
-            _out << eb;
-        }
-    }
-}
-
-void
-FreezeScript::PrintVisitor::printObjectMembers(const Slice::ClassDefPtr& type, const DataMemberMap& members)
-{
-    Slice::ClassList bases = type->bases();
-    if(!bases.empty() && !bases.front()->isAbstract())
-    {
-        printObjectMembers(bases.front(), members);
-    }
-
-    //
-    // Print members in order of declaration.
-    //
-    Slice::DataMemberList l = type->dataMembers();
-    for(Slice::DataMemberList::const_iterator p = l.begin(); p != l.end(); ++p)
-    {
-        DataMemberMap::const_iterator q = members.find((*p)->name());
-        assert(q != members.end());
-        _out << nl;
-        _out << q->first << " = ";
-        q->second->visit(*this);
-    }
-}
diff --git a/cpp/src/FreezeScript/Scanner.cpp b/cpp/src/FreezeScript/Scanner.cpp
deleted file mode 100644
index 4add24fc933..00000000000
--- a/cpp/src/FreezeScript/Scanner.cpp
+++ /dev/null
@@ -1,2253 +0,0 @@
-#include <IceUtil/ScannerConfig.h>
-#line 2 "lex.yy.c"
-
-#line 4 "lex.yy.c"
-
-#define  YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
-
-#define yy_create_buffer freeze_script__create_buffer
-#define yy_delete_buffer freeze_script__delete_buffer
-#define yy_flex_debug freeze_script__flex_debug
-#define yy_init_buffer freeze_script__init_buffer
-#define yy_flush_buffer freeze_script__flush_buffer
-#define yy_load_buffer_state freeze_script__load_buffer_state
-#define yy_switch_to_buffer freeze_script__switch_to_buffer
-#define yyin freeze_script_in
-#define yyleng freeze_script_leng
-#define yylex freeze_script_lex
-#define yylineno freeze_script_lineno
-#define yyout freeze_script_out
-#define yyrestart freeze_script_restart
-#define yytext freeze_script_text
-#define yywrap freeze_script_wrap
-#define yyalloc freeze_script_alloc
-#define yyrealloc freeze_script_realloc
-#define yyfree freeze_script_free
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
-#endif
-
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN (yy_start) = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START (((yy_start) - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE freeze_script_restart(freeze_script_in  )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#define YY_BUF_SIZE 16384
-#endif
-
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-extern int freeze_script_leng;
-
-extern FILE *freeze_script_in, *freeze_script_out;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-    #define YY_LESS_LINENO(n)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up freeze_script_text. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
-		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up freeze_script_text again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, (yytext_ptr)  )
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via freeze_script_restart()), so that the user can continue scanning by
-	 * just pointing freeze_script_in at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-
-	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
-
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
-
-/* yy_hold_char holds the character lost when freeze_script_text is formed. */
-static char yy_hold_char;
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-int freeze_script_leng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow freeze_script_wrap()'s to do buffer switches
- * instead of setting up a fresh freeze_script_in.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void freeze_script_restart (FILE *input_file  );
-void freeze_script__switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE freeze_script__create_buffer (FILE *file,int size  );
-void freeze_script__delete_buffer (YY_BUFFER_STATE b  );
-void freeze_script__flush_buffer (YY_BUFFER_STATE b  );
-void freeze_script_push_buffer_state (YY_BUFFER_STATE new_buffer  );
-void freeze_script_pop_buffer_state (void );
-
-static void freeze_script_ensure_buffer_stack (void );
-static void freeze_script__load_buffer_state (void );
-static void freeze_script__init_buffer (YY_BUFFER_STATE b,FILE *file  );
-
-#define YY_FLUSH_BUFFER freeze_script__flush_buffer(YY_CURRENT_BUFFER )
-
-YY_BUFFER_STATE freeze_script__scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE freeze_script__scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE freeze_script__scan_bytes (yyconst char *bytes,int len  );
-
-void *freeze_script_alloc (yy_size_t  );
-void *freeze_script_realloc (void *,yy_size_t  );
-void freeze_script_free (void *  );
-
-#define yy_new_buffer freeze_script__create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        freeze_script_ensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            freeze_script__create_buffer(freeze_script_in,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        freeze_script_ensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            freeze_script__create_buffer(freeze_script_in,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-
-/* Begin user sect3 */
-
-#define freeze_script_wrap(n) 1
-#define YY_SKIP_YYWRAP
-
-typedef unsigned char YY_CHAR;
-
-FILE *freeze_script_in = (FILE *) 0, *freeze_script_out = (FILE *) 0;
-
-typedef int yy_state_type;
-
-extern int freeze_script_lineno;
-
-int freeze_script_lineno = 1;
-
-extern char *freeze_script_text;
-#define yytext_ptr freeze_script_text
-
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[]  );
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up freeze_script_text.
- */
-#define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-	freeze_script_leng = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
-	*yy_cp = '\0'; \
-	(yy_c_buf_p) = yy_cp;
-
-#define YY_NUM_RULES 26
-#define YY_END_OF_BUFFER 27
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_accept[51] =
-    {   0,
-        0,    0,   27,   25,    8,    8,   25,    4,   19,    5,
-       20,   21,   17,   15,   16,   25,   18,    6,    6,   25,
-        9,   25,   10,    3,   22,   23,   14,    0,    6,    6,
-        7,    2,    1,    7,    6,    0,    0,   24,   11,   13,
-       12,    3,    0,    7,    0,    7,    6,    0,    7,    0
-    } ;
-
-static yyconst flex_int32_t yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        2,    2,    2,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    4,    5,    1,    1,    6,    1,    7,    8,
-        9,   10,   11,    1,   12,   13,   14,   15,   16,   16,
-       16,   16,   16,   16,   16,   17,   17,   18,    1,   19,
-       20,   21,    1,    1,   22,   22,   22,   22,   23,   24,
-       25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-       25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-       26,    1,   27,    1,   25,    1,   22,   22,   22,   22,
-
-       28,   24,   25,   25,   25,   25,   25,   25,   25,   25,
-       25,   25,   25,   25,   25,   25,   25,   25,   25,   29,
-       25,   25,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst flex_int32_t yy_meta[30] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        2,    2,    1,    1,    3,    3,    3,    1,    1,    1,
-        1,    4,    4,    4,    5,    1,    1,    4,    5
-    } ;
-
-static yyconst flex_int16_t yy_base[55] =
-    {   0,
-        0,    0,   72,  104,  104,  104,   51,  104,  104,  104,
-      104,  104,  104,   17,   22,   25,   33,   35,   30,   44,
-       29,   24,   16,    0,  104,  104,  104,   38,    0,    0,
-       50,  104,  104,    0,    2,   45,    0,  104,  104,  104,
-      104,    0,   49,  104,   53,   60,    0,   64,   70,  104,
-       92,   96,   97,  100
-    } ;
-
-static yyconst flex_int16_t yy_def[55] =
-    {   0,
-       50,    1,   50,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,   50,   50,   50,   50,   50,   50,   18,   50,
-       50,   50,   50,   51,   50,   50,   50,   50,   18,   19,
-       50,   50,   50,   31,   18,   52,   53,   50,   50,   50,
-       50,   51,   54,   50,   50,   50,   53,   50,   50,    0,
-       50,   50,   50,   50
-    } ;
-
-static yyconst flex_int16_t yy_nxt[134] =
-    {   0,
-        4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-       14,   15,   16,   17,   18,   19,   19,   20,   21,   22,
-       23,   24,   24,   24,   24,   25,   26,   24,   24,   28,
-       50,   29,   30,   30,   28,   41,   29,   30,   30,   31,
-       31,   31,   32,   40,   30,   30,   33,   34,   39,   35,
-       35,   30,   31,   31,   31,   45,   45,   36,   50,   48,
-       48,   38,   36,   37,   31,   31,   31,   46,   46,   46,
-       27,   50,   43,   44,   46,   46,   46,   43,   49,   49,
-       49,   50,   50,   44,   49,   49,   49,   50,   50,   50,
-       50,   50,   50,   44,   42,   42,   42,   46,   46,   47,
-
-       47,   49,   49,    3,   50,   50,   50,   50,   50,   50,
-       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,   50
-    } ;
-
-static yyconst flex_int16_t yy_chk[134] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,   14,
-       35,   14,   14,   14,   15,   23,   15,   15,   15,   16,
-       16,   16,   17,   22,   19,   19,   17,   18,   21,   18,
-       18,   18,   28,   28,   28,   36,   36,   18,   19,   43,
-       43,   20,   18,   18,   31,   31,   31,   45,   45,   45,
-        7,    3,   31,   31,   46,   46,   46,   31,   48,   48,
-       48,    0,    0,   46,   49,   49,   49,    0,    0,    0,
-        0,    0,    0,   49,   51,   51,   51,   52,   52,   53,
-
-       53,   54,   54,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,   50
-    } ;
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-extern int freeze_script__flex_debug;
-int freeze_script__flex_debug = 0;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *freeze_script_text;
-#line 1 "Scanner.l"
-#line 2 "Scanner.l"
-
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/GrammarUtil.h>        // Before Grammar.h, so that YYSTYPE is defined
-#include <FreezeScript/Grammar.h>
-#include <IceUtil/InputUtil.h>
-
-#include <stdlib.h>
-#include <math.h>
-
-#include <map>
-
-#if defined(_MSC_VER) && defined(ICE_64)
-//
-// '=' : conversion from 'size_t' to 'int', possible loss of data
-// The result of fread() is a size_t and gets inserted into an int
-//
-#   pragma warning( 4 : 4267 )
-//
-// 'initializing' : conversion from '__int64' to 'int', possible loss of data
-// Puts a pointer-difference into an int
-//
-#   pragma warning( 4 : 4244 )
-#endif
-
-#ifdef _MSC_VER
-#   ifdef freeze_script_wrap
-#      undef freeze_script_wrap
-#      define freeze_script_wrap() 1
-#   endif
-#   define YY_NO_UNISTD_H
-#endif
-
-#ifdef __SUNPRO_CC
-#   ifdef freeze_script_wrap
-#      undef freeze_script_wrap
-#      define freeze_script_wrap() 1
-#   endif
-#   ifdef ICE_64
-#       pragma error_messages(off,truncwarn)
-#   endif
-#endif
-
-using namespace std;
-using namespace FreezeScript;
-
-namespace FreezeScript
-{
-
-typedef map<string, int> KeywordMap;
-static KeywordMap keywordMap;
-
-void initScanner();
-int checkKeyword(const string&);
-StringTokPtr parseString(char);
-
-}
-
-#define        YY_USER_INIT initScanner();
-
-#define        YY_INPUT(buf, result, max_size) { result = getInput(buf, max_size); }
-#line 585 "lex.yy.c"
-
-#define INITIAL 0
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-static int yy_init_globals (void );
-
-/* Accessor methods to globals.
-   These are made visible to non-reentrant scanners for convenience. */
-
-int freeze_script_lex_destroy (void );
-
-int freeze_script_get_debug (void );
-
-void freeze_script_set_debug (int debug_flag  );
-
-YY_EXTRA_TYPE freeze_script_get_extra (void );
-
-void freeze_script_set_extra (YY_EXTRA_TYPE user_defined  );
-
-FILE *freeze_script_get_in (void );
-
-void freeze_script_set_in  (FILE * in_str  );
-
-FILE *freeze_script_get_out (void );
-
-void freeze_script_set_out  (FILE * out_str  );
-
-int freeze_script_get_leng (void );
-
-char *freeze_script_get_text (void );
-
-int freeze_script_get_lineno (void );
-
-void freeze_script_set_lineno (int line_number  );
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int freeze_script_wrap (void );
-#else
-extern int freeze_script_wrap (void );
-#endif
-#endif
-
-    static void yyunput (int c,char *buf_ptr  );
-    
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
-#endif
-
-#ifndef YY_NO_INPUT
-
-#ifdef __cplusplus
-static int yyinput (void );
-#else
-static int input (void );
-#endif
-
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO do { if (fwrite( freeze_script_text, freeze_script_leng, 1, freeze_script_out )) {} } while (0)
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-		{ \
-		int c = '*'; \
-		unsigned n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( freeze_script_in )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( freeze_script_in ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, freeze_script_in))==0 && ferror(freeze_script_in)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(freeze_script_in); \
-			} \
-		}\
-\
-
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* end tables serialization structures and prototypes */
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int freeze_script_lex (void);
-
-#define YY_DECL int freeze_script_lex (void)
-#endif /* !YY_DECL */
-
-/* Code executed at the beginning of each rule, after freeze_script_text and freeze_script_leng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-    
-#line 83 "Scanner.l"
-
-
-#line 770 "lex.yy.c"
-
-	if ( !(yy_init) )
-		{
-		(yy_init) = 1;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! (yy_start) )
-			(yy_start) = 1;	/* first start state */
-
-		if ( ! freeze_script_in )
-			freeze_script_in = stdin;
-
-		if ( ! freeze_script_out )
-			freeze_script_out = stdout;
-
-		if ( ! YY_CURRENT_BUFFER ) {
-			freeze_script_ensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				freeze_script__create_buffer(freeze_script_in,YY_BUF_SIZE );
-		}
-
-		freeze_script__load_buffer_state( );
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = (yy_c_buf_p);
-
-		/* Support of freeze_script_text. */
-		*yy_cp = (yy_hold_char);
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = (yy_start);
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				(yy_last_accepting_state) = yy_current_state;
-				(yy_last_accepting_cpos) = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 51 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_current_state != 50 );
-		yy_cp = (yy_last_accepting_cpos);
-		yy_current_state = (yy_last_accepting_state);
-
-yy_find_action:
-		yy_act = yy_accept[yy_current_state];
-
-		YY_DO_BEFORE_ACTION;
-
-do_action:	/* This label is used only to access EOF actions. */
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = (yy_hold_char);
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
-			goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 85 "Scanner.l"
-{
-    // C++-style comment
-    int c;
-    do
-    {
-        c = yyinput();
-        if(c == '\n')
-        {
-            parseLine++;
-        }
-    }
-    while(c != '\n' && c != EOF);
-}
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 99 "Scanner.l"
-{
-    // C-style comment
-    while(true)
-    {
-        int c = yyinput();
-        if(c == '\n')
-        {
-            parseLine++;
-        }
-        else if(c == '*')
-        {
-            int next = yyinput();
-            if(next == '/')
-            {
-                break;
-            }
-            else
-            {
-                unput(next);
-            }
-        }
-        else if(c == EOF)
-        {
-            parseErrorReporter->expressionSyntaxError("EOF in comment");
-            break;
-        }
-    }
-}
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 128 "Scanner.l"
-{
-    StringTokPtr ident = new StringTok;
-    ident->v = freeze_script_text;
-    *yylvalp = ident;
-    return checkKeyword(ident->v);
-}
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 135 "Scanner.l"
-{
-    StringTokPtr str = parseString('"');
-    *yylvalp = str;
-    return TOK_STRING_LITERAL;
-}
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 141 "Scanner.l"
-{
-    StringTokPtr str = parseString('\'');
-    *yylvalp = str;
-    return TOK_STRING_LITERAL;
-}
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 147 "Scanner.l"
-{
-    IntegerTokPtr itp = new IntegerTok;
-    *yylvalp = itp;
-    if(!IceUtilInternal::stringToInt64(string(freeze_script_text), itp->v))
-    {
-	assert(itp->v != 0);
-        string msg = "integer constant `";
-        msg += freeze_script_text;
-        msg += "' out of range";
-        parseErrorReporter->expressionSyntaxError(msg);
-    }
-    return TOK_INTEGER_LITERAL;
-}
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 161 "Scanner.l"
-{
-    errno = 0;
-    FloatingTokPtr ftp = new FloatingTok;
-    *yylvalp = ftp;
-    string literal(freeze_script_text);
-    char lastChar = literal[literal.size() - 1];
-    if(lastChar == 'f' || lastChar == 'F')
-    {
-        literal = literal.substr(0, literal.size() - 1);        // Clobber trailing 'f' or 'F' suffix
-    }
-    ftp->v = strtod(literal.c_str(), 0);
-    if((ftp->v == HUGE_VAL || ftp->v == -HUGE_VAL) && errno == ERANGE)
-    {
-        string msg = "floating-point constant `";
-        msg += freeze_script_text;
-        msg += "' too large (overflow)";
-        parseErrorReporter->expressionSyntaxError(msg);
-    }
-    else if(ftp->v == 0 && errno == ERANGE)
-    {
-        string msg = "floating-point constant `";
-        msg += freeze_script_text;
-        msg += "' too small (underflow)";
-        parseErrorReporter->expressionSyntaxError(msg);
-    }
-    return TOK_FLOATING_POINT_LITERAL;
-}
-	YY_BREAK
-case 8:
-/* rule 8 can match eol */
-YY_RULE_SETUP
-#line 189 "Scanner.l"
-{
-    // Igore white-space
-    
-    if(freeze_script_text[0] == '\n')
-    {
-        parseLine++;
-    }
-}
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 198 "Scanner.l"
-return TOK_LESS_THAN;
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 199 "Scanner.l"
-return TOK_GREATER_THAN;
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 200 "Scanner.l"
-return TOK_LESS_EQUAL;
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 201 "Scanner.l"
-return TOK_GREATER_EQUAL;
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 202 "Scanner.l"
-return TOK_EQUAL;
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 203 "Scanner.l"
-return TOK_NEQ;
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 204 "Scanner.l"
-return TOK_ADD;
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 205 "Scanner.l"
-return TOK_SUB;
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 206 "Scanner.l"
-return TOK_MUL;
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 207 "Scanner.l"
-return TOK_DIV;
-	YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 208 "Scanner.l"
-return TOK_MOD;
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 209 "Scanner.l"
-return TOK_LPAREN;
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 210 "Scanner.l"
-return TOK_RPAREN;
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 211 "Scanner.l"
-return TOK_LBRACKET;
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 212 "Scanner.l"
-return TOK_RBRACKET;
-	YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 213 "Scanner.l"
-return TOK_SCOPE_DELIMITER;
-	YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 215 "Scanner.l"
-{
-    return freeze_script_text[0];
-}
-	YY_BREAK
-case 26:
-YY_RULE_SETUP
-#line 219 "Scanner.l"
-ECHO;
-	YY_BREAK
-#line 1079 "lex.yy.c"
-case YY_STATE_EOF(INITIAL):
-	yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = (yy_hold_char);
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed freeze_script_in at a new source and called
-			 * freeze_script_lex().  If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = freeze_script_in;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state(  );
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++(yy_c_buf_p);
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = (yy_last_accepting_cpos);
-				yy_current_state = (yy_last_accepting_state);
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer(  ) )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				(yy_did_buffer_switch_on_eof) = 0;
-
-				if ( freeze_script_wrap( ) )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * freeze_script_text, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				(yy_c_buf_p) =
-					(yytext_ptr) + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state(  );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				(yy_c_buf_p) =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
-
-				yy_current_state = yy_get_previous_state(  );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-} /* end of freeze_script_lex */
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-static int yy_get_next_buffer (void)
-{
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-
-	else
-		{
-			int num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
-
-			int yy_c_buf_p_offset =
-				(int) ((yy_c_buf_p) - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					freeze_script_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-						number_to_move - 1;
-
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), (size_t) num_to_read );
-
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	if ( (yy_n_chars) == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			freeze_script_restart(freeze_script_in  );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) freeze_script_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-	}
-
-	(yy_n_chars) += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-
-	return ret_val;
-}
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-    static yy_state_type yy_get_previous_state (void)
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-    
-	yy_current_state = (yy_start);
-
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			(yy_last_accepting_state) = yy_current_state;
-			(yy_last_accepting_cpos) = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 51 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
-
-	return yy_current_state;
-}
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
-{
-	register int yy_is_jam;
-    	register char *yy_cp = (yy_c_buf_p);
-
-	register YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		(yy_last_accepting_state) = yy_current_state;
-		(yy_last_accepting_cpos) = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 51 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 50);
-
-	return yy_is_jam ? 0 : yy_current_state;
-}
-
-    static void yyunput (int c, register char * yy_bp )
-{
-	register char *yy_cp;
-    
-    yy_cp = (yy_c_buf_p);
-
-	/* undo effects of setting up freeze_script_text */
-	*yy_cp = (yy_hold_char);
-
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = (yy_n_chars) + 2;
-		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
-					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
-		register char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
-
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
-
-		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	*--yy_cp = (char) c;
-
-	(yytext_ptr) = yy_bp;
-	(yy_hold_char) = *yy_cp;
-	(yy_c_buf_p) = yy_cp;
-}
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-    static int yyinput (void)
-#else
-    static int input  (void)
-#endif
-
-{
-	int c;
-    
-	*(yy_c_buf_p) = (yy_hold_char);
-
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-			/* This was really a NUL. */
-			*(yy_c_buf_p) = '\0';
-
-		else
-			{ /* need more input */
-			int offset = (yy_c_buf_p) - (yytext_ptr);
-			++(yy_c_buf_p);
-
-			switch ( yy_get_next_buffer(  ) )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					freeze_script_restart(freeze_script_in );
-
-					/*FALLTHROUGH*/
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( freeze_script_wrap( ) )
-						return EOF;
-
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					(yy_c_buf_p) = (yytext_ptr) + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve freeze_script_text */
-	(yy_hold_char) = *++(yy_c_buf_p);
-
-	return c;
-}
-#endif	/* ifndef YY_NO_INPUT */
-
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * 
- * @note This function does not reset the start condition to @c INITIAL .
- */
-    void freeze_script_restart  (FILE * input_file )
-{
-    
-	if ( ! YY_CURRENT_BUFFER ){
-        freeze_script_ensure_buffer_stack ();
-		YY_CURRENT_BUFFER_LVALUE =
-            freeze_script__create_buffer(freeze_script_in,YY_BUF_SIZE );
-	}
-
-	freeze_script__init_buffer(YY_CURRENT_BUFFER,input_file );
-	freeze_script__load_buffer_state( );
-}
-
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * 
- */
-    void freeze_script__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
-{
-    
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		freeze_script_pop_buffer_state();
-	 *		freeze_script_push_buffer_state(new_buffer);
-     */
-	freeze_script_ensure_buffer_stack ();
-	if ( YY_CURRENT_BUFFER == new_buffer )
-		return;
-
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	freeze_script__load_buffer_state( );
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (freeze_script_wrap()) processing, but the only time this flag
-	 * is looked at is after freeze_script_wrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-static void freeze_script__load_buffer_state  (void)
-{
-    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	freeze_script_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	(yy_hold_char) = *(yy_c_buf_p);
-}
-
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
- * @return the allocated buffer state.
- */
-    YY_BUFFER_STATE freeze_script__create_buffer  (FILE * file, int  size )
-{
-	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) freeze_script_alloc(sizeof( struct yy_buffer_state )  );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in freeze_script__create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) freeze_script_alloc(b->yy_buf_size + 2  );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in freeze_script__create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	freeze_script__init_buffer(b,file );
-
-	return b;
-}
-
-/** Destroy the buffer.
- * @param b a buffer created with freeze_script__create_buffer()
- * 
- */
-    void freeze_script__delete_buffer (YY_BUFFER_STATE  b )
-{
-    
-	if ( ! b )
-		return;
-
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		freeze_script_free((void *) b->yy_ch_buf  );
-
-	freeze_script_free((void *) b  );
-}
-
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a freeze_script_restart() or at EOF.
- */
-    static void freeze_script__init_buffer  (YY_BUFFER_STATE  b, FILE * file )
-
-{
-	int oerrno = errno;
-    
-	freeze_script__flush_buffer(b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-    /* If b is the current buffer, then freeze_script__init_buffer was _probably_
-     * called from freeze_script_restart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
-
-        b->yy_is_interactive = 0;
-    
-	errno = oerrno;
-}
-
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
- */
-    void freeze_script__flush_buffer (YY_BUFFER_STATE  b )
-{
-    	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == YY_CURRENT_BUFFER )
-		freeze_script__load_buffer_state( );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *  
- */
-void freeze_script_push_buffer_state (YY_BUFFER_STATE new_buffer )
-{
-    	if (new_buffer == NULL)
-		return;
-
-	freeze_script_ensure_buffer_stack();
-
-	/* This block is copied from freeze_script__switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		(yy_buffer_stack_top)++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from freeze_script__switch_to_buffer. */
-	freeze_script__load_buffer_state( );
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *  
- */
-void freeze_script_pop_buffer_state (void)
-{
-    	if (!YY_CURRENT_BUFFER)
-		return;
-
-	freeze_script__delete_buffer(YY_CURRENT_BUFFER );
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if ((yy_buffer_stack_top) > 0)
-		--(yy_buffer_stack_top);
-
-	if (YY_CURRENT_BUFFER) {
-		freeze_script__load_buffer_state( );
-		(yy_did_buffer_switch_on_eof) = 1;
-	}
-}
-
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-static void freeze_script_ensure_buffer_stack (void)
-{
-	int num_to_alloc;
-    
-	if (!(yy_buffer_stack)) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
-         */
-		num_to_alloc = 1;
-		(yy_buffer_stack) = (struct yy_buffer_state**)freeze_script_alloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in freeze_script_ensure_buffer_stack()" );
-								  
-		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		(yy_buffer_stack_max) = num_to_alloc;
-		(yy_buffer_stack_top) = 0;
-		return;
-	}
-
-	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)freeze_script_realloc
-								((yy_buffer_stack),
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in freeze_script_ensure_buffer_stack()" );
-
-		/* zero only the new slots.*/
-		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-		(yy_buffer_stack_max) = num_to_alloc;
-	}
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE freeze_script__scan_buffer  (char * base, yy_size_t  size )
-{
-	YY_BUFFER_STATE b;
-    
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) freeze_script_alloc(sizeof( struct yy_buffer_state )  );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in freeze_script__scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	freeze_script__switch_to_buffer(b  );
-
-	return b;
-}
-
-/** Setup the input buffer state to scan a string. The next call to freeze_script_lex() will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- * 
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       freeze_script__scan_bytes() instead.
- */
-YY_BUFFER_STATE freeze_script__scan_string (yyconst char * yystr )
-{
-    
-	return freeze_script__scan_bytes(yystr,strlen(yystr) );
-}
-
-/** Setup the input buffer state to scan the given bytes. The next call to freeze_script_lex() will
- * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
- * 
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE freeze_script__scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
-{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-    
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) freeze_script_alloc(n  );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in freeze_script__scan_bytes()" );
-
-	for ( i = 0; i < _yybytes_len; ++i )
-		buf[i] = yybytes[i];
-
-	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = freeze_script__scan_buffer(buf,n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in freeze_script__scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-}
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-static void yy_fatal_error (yyconst char* msg )
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up freeze_script_text. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		freeze_script_text[freeze_script_leng] = (yy_hold_char); \
-		(yy_c_buf_p) = freeze_script_text + yyless_macro_arg; \
-		(yy_hold_char) = *(yy_c_buf_p); \
-		*(yy_c_buf_p) = '\0'; \
-		freeze_script_leng = yyless_macro_arg; \
-		} \
-	while ( 0 )
-
-/* Accessor  methods (get/set functions) to struct members. */
-
-/** Get the current line number.
- * 
- */
-int freeze_script_get_lineno  (void)
-{
-        
-    return freeze_script_lineno;
-}
-
-/** Get the input stream.
- * 
- */
-FILE *freeze_script_get_in  (void)
-{
-        return freeze_script_in;
-}
-
-/** Get the output stream.
- * 
- */
-FILE *freeze_script_get_out  (void)
-{
-        return freeze_script_out;
-}
-
-/** Get the length of the current token.
- * 
- */
-int freeze_script_get_leng  (void)
-{
-        return freeze_script_leng;
-}
-
-/** Get the current token.
- * 
- */
-
-char *freeze_script_get_text  (void)
-{
-        return freeze_script_text;
-}
-
-/** Set the current line number.
- * @param line_number
- * 
- */
-void freeze_script_set_lineno (int  line_number )
-{
-    
-    freeze_script_lineno = line_number;
-}
-
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * 
- * @see freeze_script__switch_to_buffer
- */
-void freeze_script_set_in (FILE *  in_str )
-{
-        freeze_script_in = in_str ;
-}
-
-void freeze_script_set_out (FILE *  out_str )
-{
-        freeze_script_out = out_str ;
-}
-
-int freeze_script_get_debug  (void)
-{
-        return freeze_script__flex_debug;
-}
-
-void freeze_script_set_debug (int  bdebug )
-{
-        freeze_script__flex_debug = bdebug ;
-}
-
-static int yy_init_globals (void)
-{
-        /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from freeze_script_lex_destroy(), so don't allocate here.
-     */
-
-    (yy_buffer_stack) = 0;
-    (yy_buffer_stack_top) = 0;
-    (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = (char *) 0;
-    (yy_init) = 0;
-    (yy_start) = 0;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
-    freeze_script_in = stdin;
-    freeze_script_out = stdout;
-#else
-    freeze_script_in = (FILE *) 0;
-    freeze_script_out = (FILE *) 0;
-#endif
-
-    /* For future reference: Set errno on error, since we are called by
-     * freeze_script_lex_init()
-     */
-    return 0;
-}
-
-/* freeze_script_lex_destroy is for both reentrant and non-reentrant scanners. */
-int freeze_script_lex_destroy  (void)
-{
-    
-    /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		freeze_script__delete_buffer(YY_CURRENT_BUFFER  );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		freeze_script_pop_buffer_state();
-	}
-
-	/* Destroy the stack itself. */
-	freeze_script_free((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
-
-    /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * freeze_script_lex() is called, initialization will occur. */
-    yy_init_globals( );
-
-    return 0;
-}
-
-/*
- * Internal utility routines.
- */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-}
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-}
-#endif
-
-void *freeze_script_alloc (yy_size_t  size )
-{
-	return (void *) malloc( size );
-}
-
-void *freeze_script_realloc  (void * ptr, yy_size_t  size )
-{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-}
-
-void freeze_script_free (void * ptr )
-{
-	free( (char *) ptr );	/* see freeze_script_realloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
-
-#line 219 "Scanner.l"
-
-
-
-namespace FreezeScript
-{
-
-void
-initScanner()
-{
-    keywordMap["true"] = TOK_TRUE;
-    keywordMap["false"] = TOK_FALSE;
-    keywordMap["and"] = TOK_AND;
-    keywordMap["or"] = TOK_OR;
-    keywordMap["not"] = TOK_NOT;
-    keywordMap["nil"] = TOK_NIL;
-}
-
-int
-checkKeyword(const string& id)
-{
-    KeywordMap::const_iterator pos = keywordMap.find(id);
-    if(pos != keywordMap.end())
-    {
-        return pos->second;
-    }
-    return TOK_IDENTIFIER;
-}
-
-StringTokPtr
-parseString(char start)
-{
-    StringTokPtr str = new StringTok;
-    while(true)
-    {
-        char c = static_cast<char>(yyinput());
-        if(c == start)
-        {
-            break;
-        }
-        else if(c == EOF)
-        {
-            parseErrorReporter->expressionSyntaxError("EOF in string");
-            break;
-        }
-        else if(c == '\n')
-        {
-            parseErrorReporter->expressionSyntaxError("newline in string");
-        }
-        else if(c == '\\')
-        {
-            char next = static_cast<char>(yyinput());
-            switch(next)
-            {
-                case '\\':
-                case '"':
-                case '\'':
-                {
-                    str->v += next;
-                    break;
-                }
-            
-                case 'n':
-                {
-                    str->v += '\n';
-                    break;
-                }
-            
-                case 'r':
-                {
-                    str->v += '\r';
-                    break;
-                }
-
-                case 't':
-                {
-                    str->v += '\t';
-                    break;
-                }
-            
-                case 'v':
-                {
-                    str->v += '\v';
-                    break;
-                }
-            
-                case 'f':
-                {
-                    str->v += '\f';
-                    break;
-                }
-
-                case 'a':
-                {
-                    str->v += '\a';
-                    break;
-                }
-
-                case 'b':
-                {
-                    str->v += '\b';
-                    break;
-                }
-
-                case '?':
-                {
-                    str->v += '\?';
-                    break;
-                }
-
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                {
-                    static string octalDigits = "01234567";
-                    unsigned short us = next - '0';
-                    if(octalDigits.find_first_of(next = static_cast<char>(yyinput())) != string::npos)
-                    {
-                        us = us * 8 + next - '0';
-                        if(octalDigits.find_first_of(next = static_cast<char>(yyinput())) != string::npos)
-                        {
-                            us = us * 8 + next - '0';
-                        }
-                        else
-                        {
-                            unput(next);
-                        }
-                    }
-                    else
-                    {
-                            unput(next);
-                    }
-                    str->v += static_cast<char>(us);
-                    break;
-                }
-                case 'x':
-                {
-                    IceUtil::Int64 ull = 0;
-                    while(isxdigit(static_cast<unsigned char>(next = static_cast<char>(yyinput()))))
-                    {
-                        ull *= 16;
-                        if(isdigit(static_cast<unsigned char>(next)))
-                        {
-                            ull += next - '0';
-                        }
-                        else if(islower(static_cast<unsigned char>(next)))
-                        {
-                            ull += next - 'a' + 10;
-                        }
-                        else
-                        {
-                            ull += next - 'A' + 10;
-                        }
-                    }
-                    unput(next);
-                    str->v += static_cast<char>(ull);
-                    break;
-                }
-        
-                // TODO: add universal character names
-            
-                default:
-                {
-                    str->v += c;
-                    unput(next);
-                }
-            }
-        }
-        else
-        {
-            str->v += c;
-        }
-    }
-
-    return str;
-}
-
-} // End of namespace FreezeScript
-
diff --git a/cpp/src/FreezeScript/Scanner.l b/cpp/src/FreezeScript/Scanner.l
deleted file mode 100644
index d3e62daafaf..00000000000
--- a/cpp/src/FreezeScript/Scanner.l
+++ /dev/null
@@ -1,395 +0,0 @@
-%{
-
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/GrammarUtil.h>        // Before Grammar.h, so that YYSTYPE is defined
-#include <FreezeScript/Grammar.h>
-#include <IceUtil/InputUtil.h>
-
-#include <stdlib.h>
-#include <math.h>
-
-#include <map>
-
-#if defined(_MSC_VER) && defined(ICE_64)
-//
-// '=' : conversion from 'size_t' to 'int', possible loss of data
-// The result of fread() is a size_t and gets inserted into an int
-//
-#   pragma warning( 4 : 4267 )
-//
-// 'initializing' : conversion from '__int64' to 'int', possible loss of data
-// Puts a pointer-difference into an int
-//
-#   pragma warning( 4 : 4244 )
-#endif
-
-#ifdef _MSC_VER
-#   ifdef freeze_script_wrap
-#      undef freeze_script_wrap
-#      define freeze_script_wrap() 1
-#   endif
-#   define YY_NO_UNISTD_H
-#endif
-
-#ifdef __SUNPRO_CC
-#   ifdef freeze_script_wrap
-#      undef freeze_script_wrap
-#      define freeze_script_wrap() 1
-#   endif
-#   ifdef ICE_64
-#       pragma error_messages(off,truncwarn)
-#   endif
-#endif
-
-using namespace std;
-using namespace FreezeScript;
-
-namespace FreezeScript
-{
-
-typedef map<string, int> KeywordMap;
-static KeywordMap keywordMap;
-
-void initScanner();
-int checkKeyword(const string&);
-StringTokPtr parseString(char);
-
-}
-
-#define        YY_USER_INIT initScanner();
-
-#define        YY_INPUT(buf, result, max_size) { result = getInput(buf, max_size); }
-%}
-
-%option noyywrap
-%option never-interactive
-%option prefix="freeze_script_"
-%option outfile="lex.yy.c"
-
-identifier		[[:alpha:]_][[:alnum:]_]*
-integer_constant	(\+|-)?((0[0-7]+)|(0x[[:xdigit:]]+)|([[:digit:]]+))
-fractional_constant	(\+|-)?(([[:digit:]]*\.[[:digit:]]+)|([[:digit:]]+\.))
-exponent_part		(e|E)(\+|-)?[[:digit:]]+
-floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{exponent_part}))[fF]?
-
-%%
-
-"//" {
-    // C++-style comment
-    int c;
-    do
-    {
-        c = yyinput();
-        if(c == '\n')
-        {
-            parseLine++;
-        }
-    }
-    while(c != '\n' && c != EOF);
-}
-
-"/*" {
-    // C-style comment
-    while(true)
-    {
-        int c = yyinput();
-        if(c == '\n')
-        {
-            parseLine++;
-        }
-        else if(c == '*')
-        {
-            int next = yyinput();
-            if(next == '/')
-            {
-                break;
-            }
-            else
-            {
-                unput(next);
-            }
-        }
-        else if(c == EOF)
-        {
-            parseErrorReporter->expressionSyntaxError("EOF in comment");
-            break;
-        }
-    }
-}
-
-{identifier} {
-    StringTokPtr ident = new StringTok;
-    ident->v = yytext;
-    *yylvalp = ident;
-    return checkKeyword(ident->v);
-}
-
-\" {
-    StringTokPtr str = parseString('"');
-    *yylvalp = str;
-    return TOK_STRING_LITERAL;
-}
-
-\' {
-    StringTokPtr str = parseString('\'');
-    *yylvalp = str;
-    return TOK_STRING_LITERAL;
-}
-
-{integer_constant} {
-    IntegerTokPtr itp = new IntegerTok;
-    *yylvalp = itp;
-    if(!IceUtilInternal::stringToInt64(string(yytext), itp->v))
-    {
-	assert(itp->v != 0);
-        string msg = "integer constant `";
-        msg += yytext;
-        msg += "' out of range";
-        parseErrorReporter->expressionSyntaxError(msg);
-    }
-    return TOK_INTEGER_LITERAL;
-}
-
-{floating_literal} {
-    errno = 0;
-    FloatingTokPtr ftp = new FloatingTok;
-    *yylvalp = ftp;
-    string literal(yytext);
-    char lastChar = literal[literal.size() - 1];
-    if(lastChar == 'f' || lastChar == 'F')
-    {
-        literal = literal.substr(0, literal.size() - 1);        // Clobber trailing 'f' or 'F' suffix
-    }
-    ftp->v = strtod(literal.c_str(), 0);
-    if((ftp->v == HUGE_VAL || ftp->v == -HUGE_VAL) && errno == ERANGE)
-    {
-        string msg = "floating-point constant `";
-        msg += yytext;
-        msg += "' too large (overflow)";
-        parseErrorReporter->expressionSyntaxError(msg);
-    }
-    else if(ftp->v == 0 && errno == ERANGE)
-    {
-        string msg = "floating-point constant `";
-        msg += yytext;
-        msg += "' too small (underflow)";
-        parseErrorReporter->expressionSyntaxError(msg);
-    }
-    return TOK_FLOATING_POINT_LITERAL;
-}
-
-[[:space:]] {
-    // Igore white-space
-    
-    if(yytext[0] == '\n')
-    {
-        parseLine++;
-    }
-}
-
-"<"     return TOK_LESS_THAN;
-">"     return TOK_GREATER_THAN;
-"<="    return TOK_LESS_EQUAL;
-">="    return TOK_GREATER_EQUAL;
-"=="    return TOK_EQUAL;
-"!="    return TOK_NEQ;
-"+"     return TOK_ADD;
-"-"     return TOK_SUB;
-"*"     return TOK_MUL;
-"/"     return TOK_DIV;
-"%"     return TOK_MOD;
-"("     return TOK_LPAREN;
-")"     return TOK_RPAREN;
-"["     return TOK_LBRACKET;
-"]"     return TOK_RBRACKET;
-"::"    return TOK_SCOPE_DELIMITER;
-
-. {
-    return yytext[0];
-}
-
-%%
-
-namespace FreezeScript
-{
-
-void
-initScanner()
-{
-    keywordMap["true"] = TOK_TRUE;
-    keywordMap["false"] = TOK_FALSE;
-    keywordMap["and"] = TOK_AND;
-    keywordMap["or"] = TOK_OR;
-    keywordMap["not"] = TOK_NOT;
-    keywordMap["nil"] = TOK_NIL;
-}
-
-int
-checkKeyword(const string& id)
-{
-    KeywordMap::const_iterator pos = keywordMap.find(id);
-    if(pos != keywordMap.end())
-    {
-        return pos->second;
-    }
-    return TOK_IDENTIFIER;
-}
-
-StringTokPtr
-parseString(char start)
-{
-    StringTokPtr str = new StringTok;
-    while(true)
-    {
-        char c = static_cast<char>(yyinput());
-        if(c == start)
-        {
-            break;
-        }
-        else if(c == EOF)
-        {
-            parseErrorReporter->expressionSyntaxError("EOF in string");
-            break;
-        }
-        else if(c == '\n')
-        {
-            parseErrorReporter->expressionSyntaxError("newline in string");
-        }
-        else if(c == '\\')
-        {
-            char next = static_cast<char>(yyinput());
-            switch(next)
-            {
-                case '\\':
-                case '"':
-                case '\'':
-                {
-                    str->v += next;
-                    break;
-                }
-            
-                case 'n':
-                {
-                    str->v += '\n';
-                    break;
-                }
-            
-                case 'r':
-                {
-                    str->v += '\r';
-                    break;
-                }
-
-                case 't':
-                {
-                    str->v += '\t';
-                    break;
-                }
-            
-                case 'v':
-                {
-                    str->v += '\v';
-                    break;
-                }
-            
-                case 'f':
-                {
-                    str->v += '\f';
-                    break;
-                }
-
-                case 'a':
-                {
-                    str->v += '\a';
-                    break;
-                }
-
-                case 'b':
-                {
-                    str->v += '\b';
-                    break;
-                }
-
-                case '?':
-                {
-                    str->v += '\?';
-                    break;
-                }
-
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                {
-                    static string octalDigits = "01234567";
-                    unsigned short us = next - '0';
-                    if(octalDigits.find_first_of(next = static_cast<char>(yyinput())) != string::npos)
-                    {
-                        us = us * 8 + next - '0';
-                        if(octalDigits.find_first_of(next = static_cast<char>(yyinput())) != string::npos)
-                        {
-                            us = us * 8 + next - '0';
-                        }
-                        else
-                        {
-                            unput(next);
-                        }
-                    }
-                    else
-                    {
-                            unput(next);
-                    }
-                    str->v += static_cast<char>(us);
-                    break;
-                }
-                case 'x':
-                {
-                    IceUtil::Int64 ull = 0;
-                    while(isxdigit(static_cast<unsigned char>(next = static_cast<char>(yyinput()))))
-                    {
-                        ull *= 16;
-                        if(isdigit(static_cast<unsigned char>(next)))
-                        {
-                            ull += next - '0';
-                        }
-                        else if(islower(static_cast<unsigned char>(next)))
-                        {
-                            ull += next - 'a' + 10;
-                        }
-                        else
-                        {
-                            ull += next - 'A' + 10;
-                        }
-                    }
-                    unput(next);
-                    str->v += static_cast<char>(ull);
-                    break;
-                }
-        
-                // TODO: add universal character names
-            
-                default:
-                {
-                    str->v += c;
-                    unput(next);
-                }
-            }
-        }
-        else
-        {
-            str->v += c;
-        }
-    }
-
-    return str;
-}
-
-} // End of namespace FreezeScript
diff --git a/cpp/src/FreezeScript/TransformAnalyzer.cpp b/cpp/src/FreezeScript/TransformAnalyzer.cpp
deleted file mode 100644
index 5eac1d6e9a5..00000000000
--- a/cpp/src/FreezeScript/TransformAnalyzer.cpp
+++ /dev/null
@@ -1,1236 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/TransformAnalyzer.h>
-#include <FreezeScript/Util.h>
-#include <IceUtil/OutputUtil.h>
-#include <map>
-
-using namespace std;
-using namespace Slice;
-using namespace IceUtil;
-using namespace IceUtilInternal;
-
-namespace FreezeScript
-{
-
-//
-// AnalyzeTransformVisitor visits the old definitions and compares them with
-// the new definitions.
-//
-class AnalyzeTransformVisitor : public ParserVisitor
-{
-public:
-
-    AnalyzeTransformVisitor(XMLOutput&, const UnitPtr&, bool, vector<string>&, vector<string>&);
-
-    void addDatabase(const string&, const TypePtr&, const TypePtr&, const TypePtr&, const TypePtr&);
-
-    virtual bool visitClassDefStart(const ClassDefPtr&);
-    virtual bool visitStructStart(const StructPtr&);
-    virtual void visitSequence(const SequencePtr&);
-    virtual void visitDictionary(const DictionaryPtr&);
-    virtual void visitEnum(const EnumPtr&);
-
-private:
-
-    void compareMembers(const DataMemberList&, const DataMemberList&);
-    void compareTypes(const string&, const TypePtr&, const TypePtr&);
-    void typeChange(const string&, const TypePtr&, const TypePtr&);
-    bool checkClasses(const ClassDeclPtr&, const ClassDeclPtr&);
-
-    XMLOutput& _out;
-    UnitPtr _newUnit;
-    bool _ignoreTypeChanges;
-    vector<string>& _missingTypes;
-    vector<string>& _errors;
-};
-
-//
-// InitVisitor visits the new definitions to find any that are not present
-// in the old definitions, and generates init elements for them.
-//
-class AnalyzeInitVisitor : public ParserVisitor
-{
-public:
-
-    AnalyzeInitVisitor(XMLOutput&, const UnitPtr&);
-
-    virtual bool visitClassDefStart(const ClassDefPtr&);
-    virtual bool visitStructStart(const StructPtr&);
-    virtual void visitSequence(const SequencePtr&);
-    virtual void visitDictionary(const DictionaryPtr&);
-    virtual void visitEnum(const EnumPtr&);
-
-private:
-
-    void typeChange(const TypePtr&, const string&, const string&);
-
-    XMLOutput& _out;
-    UnitPtr _oldUnit;
-};
-
-}
-
-////////////////////////////////////
-// AnalyzeTransformVisitor
-////////////////////////////////////
-
-FreezeScript::AnalyzeTransformVisitor::AnalyzeTransformVisitor(XMLOutput& out, const UnitPtr& newUnit,
-                                                               bool ignoreTypeChanges, vector<string>& missingTypes,
-                                                               vector<string>& errors) :
-    _out(out), _newUnit(newUnit), _ignoreTypeChanges(ignoreTypeChanges), _missingTypes(missingTypes), _errors(errors)
-{
-}
-
-void
-FreezeScript::AnalyzeTransformVisitor::addDatabase(const string& name, const TypePtr& oldKey, const TypePtr& newKey,
-                                                   const TypePtr& oldValue, const TypePtr& newValue)
-{
-    _out << "\n";
-    _out << se("database");
-
-    if(!name.empty())
-    {
-        _out << attr("name", name);
-    }
-
-    string oldKeyName = oldKey ? typeToString(oldKey) : string("UNKNOWN");
-    string newKeyName = newKey ? typeToString(newKey) : string("UNKNOWN");
-    if(oldKeyName == newKeyName)
-    {
-        _out << attr("key", oldKeyName);
-    }
-    else
-    {
-        _out << attr("key", oldKeyName + "," + newKeyName);
-    }
-
-    string oldValueName = oldValue ? typeToString(oldValue) : string("UNKNOWN");
-    string newValueName = newValue ? typeToString(newValue) : string("UNKNOWN");
-    if(oldValueName == newValueName)
-    {
-        _out << attr("value", oldValueName);
-    }
-    else
-    {
-        _out << attr("value", oldValueName + "," + newValueName);
-    }
-
-    _out << se("record");
-    if(oldKey && newKey)
-    {
-        compareTypes("database key", oldKey, newKey);
-    }
-    if(oldValue && newValue)
-    {
-        compareTypes("database value", oldValue, newValue);
-    }
-    _out << ee;
-
-    _out << ee;
-}
-
-bool
-FreezeScript::AnalyzeTransformVisitor::visitClassDefStart(const ClassDefPtr& v)
-{
-    if(v->isInterface() || v->isLocal())
-    {
-        return false;
-    }
-
-    string scoped = v->scoped();
-    if(ignoreType(scoped))
-    {
-        return false;
-    }
-
-    TypeList l = _newUnit->lookupTypeNoBuiltin(scoped, false);
-    if(l.empty())
-    {
-        _missingTypes.push_back(scoped);
-        return false;
-    }
-
-    //
-    // Allow transforming from class to struct.
-    //
-    ClassDeclPtr decl = ClassDeclPtr::dynamicCast(l.front());
-    StructPtr newStruct = StructPtr::dynamicCast(l.front());
-    if(!newStruct && (!decl || decl->isInterface()))
-    {
-        if(!_ignoreTypeChanges)
-        {
-            typeChange(scoped, v->declaration(), l.front());
-        }
-        return false;
-    }
-
-    ClassDefPtr newClass;
-    if(decl)
-    {
-        newClass = decl->definition();
-        if(!newClass)
-        {
-            _missingTypes.push_back(scoped);
-            return false;
-        }
-    }
-
-    DataMemberList oldMembers, newMembers;
-
-    if(newClass)
-    {
-        oldMembers = v->dataMembers();
-        newMembers = newClass->dataMembers();
-    }
-    else
-    {
-        oldMembers = v->allDataMembers();
-        newMembers = newStruct->dataMembers();
-    }
-
-    _out.newline();
-    _out.newline();
-    if(newStruct)
-    {
-        _out << "<!-- struct " << scoped << " -->";
-    }
-    else
-    {
-        _out << "<!-- class " << scoped << " -->";
-    }
-    _out << se("transform") << attr("type", scoped);
-
-    compareMembers(oldMembers, newMembers);
-
-    _out << ee;
-
-    return false;
-}
-
-bool
-FreezeScript::AnalyzeTransformVisitor::visitStructStart(const StructPtr& v)
-{
-    if(v->isLocal())
-    {
-        return false;
-    }
-
-    string scoped = v->scoped();
-    if(ignoreType(scoped))
-    {
-        return false;
-    }
-
-    TypeList l = _newUnit->lookupTypeNoBuiltin(scoped, false);
-    if(l.empty())
-    {
-        _missingTypes.push_back(scoped);
-        return false;
-    }
-
-    //
-    // Allow transforming from struct to class.
-    //
-    StructPtr newStruct = StructPtr::dynamicCast(l.front());
-    ClassDeclPtr decl = ClassDeclPtr::dynamicCast(l.front());
-    ClassDefPtr newClass;
-    if(decl)
-    {
-        newClass = decl->definition();
-        if(!newClass)
-        {
-            _missingTypes.push_back(scoped);
-            return false;
-        }
-    }
-    else if(!newStruct)
-    {
-        if(!_ignoreTypeChanges)
-        {
-            typeChange(scoped, v, l.front());
-        }
-        return false;
-    }
-
-    _out.newline();
-    _out.newline();
-    if(newClass)
-    {
-        _out << "<!-- class " << scoped << " -->";
-    }
-    else
-    {
-        _out << "<!-- struct " << scoped << " -->";
-    }
-    _out << se("transform") << attr("type", scoped);
-
-    DataMemberList oldMembers, newMembers;
-
-    if(newClass)
-    {
-        oldMembers = v->dataMembers();
-        newMembers = newClass->allDataMembers();
-    }
-    else
-    {
-        oldMembers = v->dataMembers();
-        newMembers = newStruct->dataMembers();
-    }
-
-    compareMembers(oldMembers, newMembers);
-
-    _out << ee;
-
-    return false;
-}
-
-void
-FreezeScript::AnalyzeTransformVisitor::visitSequence(const SequencePtr& v)
-{
-    if(v->isLocal())
-    {
-        return;
-    }
-
-    string scoped = v->scoped();
-    if(ignoreType(scoped))
-    {
-        return;
-    }
-
-    TypeList l = _newUnit->lookupTypeNoBuiltin(scoped, false);
-    if(l.empty())
-    {
-        _missingTypes.push_back(scoped);
-        return;
-    }
-
-    SequencePtr newSeq = SequencePtr::dynamicCast(l.front());
-    if(!newSeq)
-    {
-        if(!_ignoreTypeChanges)
-        {
-            typeChange(scoped, v, l.front());
-        }
-        return;
-    }
-
-    _out.newline();
-    _out.newline();
-    _out << "<!-- sequence " << scoped << " -->";
-    _out << se("transform") << attr("type", scoped);
-
-    compareTypes(scoped + " sequence type", v->type(), newSeq->type());
-
-    _out << ee;
-}
-
-void
-FreezeScript::AnalyzeTransformVisitor::visitDictionary(const DictionaryPtr& v)
-{
-    if(v->isLocal())
-    {
-        return;
-    }
-
-    string scoped = v->scoped();
-    if(ignoreType(scoped))
-    {
-        return;
-    }
-
-    TypeList l = _newUnit->lookupTypeNoBuiltin(scoped, false);
-    if(l.empty())
-    {
-        _missingTypes.push_back(scoped);
-        return;
-    }
-
-    DictionaryPtr newDict = DictionaryPtr::dynamicCast(l.front());
-    if(!newDict)
-    {
-        if(!_ignoreTypeChanges)
-        {
-            typeChange(scoped, v, l.front());
-        }
-        return;
-    }
-
-    _out.newline();
-    _out.newline();
-    _out << "<!-- dictionary " << scoped << " -->";
-    _out << se("transform") << attr("type", scoped);
-
-    compareTypes(scoped + " key type", v->keyType(), newDict->keyType());
-    compareTypes(scoped + " value type", v->valueType(), newDict->valueType());
-
-    _out << ee;
-}
-
-void
-FreezeScript::AnalyzeTransformVisitor::visitEnum(const EnumPtr& v)
-{
-    if(v->isLocal())
-    {
-        return;
-    }
-
-    string scoped = v->scoped();
-    if(ignoreType(scoped))
-    {
-        return;
-    }
-
-    TypeList l = _newUnit->lookupTypeNoBuiltin(scoped, false);
-    if(l.empty())
-    {
-        _missingTypes.push_back(scoped);
-        return;
-    }
-
-    EnumPtr newEnum = EnumPtr::dynamicCast(l.front());
-    if(!newEnum)
-    {
-        if(!_ignoreTypeChanges)
-        {
-            typeChange(scoped, v, l.front());
-        }
-        return;
-    }
-
-    map<string, int> m;
-    {
-        Slice::EnumeratorList enumerators = newEnum->getEnumerators();
-        int i = 0;
-        for(Slice::EnumeratorList::iterator p = enumerators.begin(); p != enumerators.end(); ++p, ++i)
-        {
-            m.insert(map<string, int>::value_type((*p)->name(), i));
-        }
-    }
-
-    _out.newline();
-    _out.newline();
-    _out << "<!-- enum " << scoped << " -->";
-    _out << se("transform") << attr("type", scoped);
-
-    Slice::EnumeratorList enumerators = v->getEnumerators();
-    int i = 0;
-    for(Slice::EnumeratorList::iterator p = enumerators.begin(); p != enumerators.end(); ++p, ++i)
-    {
-        map<string, int>::const_iterator q = m.find((*p)->name());
-        if(q == m.end())
-        {
-            _out.newline();
-            _out << "<!-- NOTICE: enumerator `" << (*p)->name() << "' has been removed -->";
-        }
-        else if(q->second != i)
-        {
-            _out.newline();
-            _out << "<!-- NOTICE: enumerator `" << (*p)->name() << "' has changed position -->";
-        }
-    }
-
-    _out << ee;
-}
-
-void
-FreezeScript::AnalyzeTransformVisitor::compareMembers(const DataMemberList& oldMembers,
-                                                      const DataMemberList& newMembers)
-{
-    map<string, DataMemberPtr> oldMap, newMap;
-
-    for(DataMemberList::const_iterator p = oldMembers.begin(); p != oldMembers.end(); ++p)
-    {
-        oldMap.insert(pair<string, DataMemberPtr>((*p)->name(), *p));
-    }
-
-    for(DataMemberList::const_iterator p = newMembers.begin(); p != newMembers.end(); ++p)
-    {
-        newMap.insert(pair<string, DataMemberPtr>((*p)->name(), *p));
-    }
-
-    for(DataMemberList::const_iterator p = oldMembers.begin(); p != oldMembers.end(); ++p)
-    {
-        string name = (*p)->name();
-        map<string, DataMemberPtr>::iterator q = newMap.find(name);
-        if(q == newMap.end())
-        {
-            _out.newline();
-            _out << "<!-- NOTICE: " << name << " has been removed -->";
-        }
-        else
-        {
-            TypePtr oldType = (*p)->type();
-            TypePtr newType = q->second->type();
-            compareTypes(name, oldType, newType);
-
-            //
-            // Remove this entry from the map to indicate that we've
-            // already seen it.
-            //
-            newMap.erase(q);
-        }
-    }
-
-    //
-    // Iterate over the remaining entries in newMap. These represent
-    // members that were added in the new definition.
-    //
-    for(map<string, DataMemberPtr>::iterator q = newMap.begin(); q != newMap.end(); ++q)
-    {
-        _out.newline();
-        _out << "<!-- NOTICE: " << q->first << " has been added -->";
-    }
-}
-
-void
-FreezeScript::AnalyzeTransformVisitor::compareTypes(const string& desc, const TypePtr& oldType, const TypePtr& newType)
-{
-    assert(!oldType->isLocal());
-    if(newType->isLocal())
-    {
-        ostringstream ostr;
-        ostr << desc << " has changed to a local type";
-        _errors.push_back(ostr.str());
-        return;
-    }
-
-    BuiltinPtr b = BuiltinPtr::dynamicCast(oldType);
-    if(b)
-    {
-        BuiltinPtr newb = BuiltinPtr::dynamicCast(newType);
-        switch(b->kind())
-        {
-        case Builtin::KindByte:
-        {
-            if(newb)
-            {
-                switch(newb->kind())
-                {
-                case Builtin::KindByte:
-                case Builtin::KindShort:
-                case Builtin::KindInt:
-                case Builtin::KindLong:
-                case Builtin::KindString:
-                {
-                    return;
-                }
-                case Builtin::KindBool:
-                case Builtin::KindFloat:
-                case Builtin::KindDouble:
-                case Builtin::KindObject:
-                case Builtin::KindObjectProxy:
-                case Builtin::KindLocalObject:
-                {
-                    break;
-                }
-                }
-            }
-
-            break;
-        }
-        case Builtin::KindBool:
-        {
-            if(newb && (newb->kind() == Builtin::KindBool || newb->kind() == Builtin::KindString))
-            {
-                return;
-            }
-
-            break;
-        }
-        case Builtin::KindShort:
-        {
-            if(newb)
-            {
-                switch(newb->kind())
-                {
-                case Builtin::KindByte:
-                case Builtin::KindShort:
-                case Builtin::KindInt:
-                case Builtin::KindLong:
-                case Builtin::KindString:
-                {
-                    return;
-                }
-                case Builtin::KindBool:
-                case Builtin::KindFloat:
-                case Builtin::KindDouble:
-                case Builtin::KindObject:
-                case Builtin::KindObjectProxy:
-                case Builtin::KindLocalObject:
-                {
-                    break;
-                }
-                }
-            }
-
-            break;
-        }
-        case Builtin::KindInt:
-        {
-            if(newb)
-            {
-                switch(newb->kind())
-                {
-                case Builtin::KindByte:
-                case Builtin::KindShort:
-                case Builtin::KindInt:
-                case Builtin::KindLong:
-                case Builtin::KindString:
-                {
-                    return;
-                }
-                case Builtin::KindBool:
-                case Builtin::KindFloat:
-                case Builtin::KindDouble:
-                case Builtin::KindObject:
-                case Builtin::KindObjectProxy:
-                case Builtin::KindLocalObject:
-                {
-                    break;
-                }
-                }
-            }
-
-            break;
-        }
-        case Builtin::KindLong:
-        {
-            if(newb)
-            {
-                switch(newb->kind())
-                {
-                case Builtin::KindByte:
-                case Builtin::KindShort:
-                case Builtin::KindInt:
-                case Builtin::KindLong:
-                case Builtin::KindString:
-                {
-                    return;
-                }
-                case Builtin::KindBool:
-                case Builtin::KindFloat:
-                case Builtin::KindDouble:
-                case Builtin::KindObject:
-                case Builtin::KindObjectProxy:
-                case Builtin::KindLocalObject:
-                {
-                    break;
-                }
-                }
-            }
-
-            break;
-        }
-        case Builtin::KindFloat:
-        {
-            if(newb)
-            {
-                switch(newb->kind())
-                {
-                case Builtin::KindFloat:
-                case Builtin::KindDouble:
-                case Builtin::KindString:
-                {
-                    return;
-                }
-                case Builtin::KindByte:
-                case Builtin::KindShort:
-                case Builtin::KindInt:
-                case Builtin::KindLong:
-                case Builtin::KindBool:
-                case Builtin::KindObject:
-                case Builtin::KindObjectProxy:
-                case Builtin::KindLocalObject:
-                {
-                    break;
-                }
-                }
-            }
-
-            break;
-        }
-        case Builtin::KindDouble:
-        {
-            if(newb)
-            {
-                switch(newb->kind())
-                {
-                case Builtin::KindFloat:
-                case Builtin::KindDouble:
-                case Builtin::KindString:
-                {
-                    return;
-                }
-                case Builtin::KindByte:
-                case Builtin::KindShort:
-                case Builtin::KindInt:
-                case Builtin::KindLong:
-                case Builtin::KindBool:
-                case Builtin::KindObject:
-                case Builtin::KindObjectProxy:
-                case Builtin::KindLocalObject:
-                {
-                    break;
-                }
-                }
-            }
-
-            break;
-        }
-        case Builtin::KindString:
-        {
-            if(newb)
-            {
-                switch(newb->kind())
-                {
-                case Builtin::KindByte:
-                case Builtin::KindBool:
-                case Builtin::KindShort:
-                case Builtin::KindInt:
-                case Builtin::KindLong:
-                case Builtin::KindFloat:
-                case Builtin::KindDouble:
-                case Builtin::KindString:
-                case Builtin::KindObjectProxy:
-                {
-                    return;
-                }
-                case Builtin::KindObject:
-                case Builtin::KindLocalObject:
-                {
-                    break;
-                }
-                }
-
-                break;
-            }
-
-            if(EnumPtr::dynamicCast(newType))
-            {
-                return;
-            }
-
-            if(ProxyPtr::dynamicCast(newType))
-            {
-                return;
-            }
-
-            break;
-        }
-        case Builtin::KindObject:
-        {
-            //
-            // Allow change from Object to class. Validation has to
-            // be done during transformation, when the actual type of
-            // an instance can be compared for compatibility with the
-            // new type.
-            //
-            ClassDeclPtr cl = ClassDeclPtr::dynamicCast(newType);
-            if(cl || (newb && newb->kind() == Builtin::KindObject))
-            {
-                return;
-            }
-
-            break;
-        }
-        case Builtin::KindObjectProxy:
-        {
-            ProxyPtr p = ProxyPtr::dynamicCast(newType);
-            if(p || (newb && newb->kind() == Builtin::KindObjectProxy) || (newb && newb->kind() == Builtin::KindString))
-            {
-                return;
-            }
-
-            break;
-        }
-        case Builtin::KindLocalObject:
-        {
-            assert(false);
-            break;
-        }
-        }
-
-        typeChange(desc, oldType, newType);
-        return;
-    }
-
-    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(oldType);
-    if(cl)
-    {
-        if(!cl->definition())
-        {
-            _errors.push_back("class " + cl->scoped() + " declared but not defined");
-            return;
-        }
-
-        //
-        // Allow target type of Object.
-        //
-        BuiltinPtr newb = BuiltinPtr::dynamicCast(newType);
-        if(newb && newb->kind() == Builtin::KindObject)
-        {
-            return;
-        }
-
-        //
-        // Allow target type of struct.
-        //
-        if(StructPtr::dynamicCast(newType))
-        {
-            return;
-        }
-
-        ClassDeclPtr newcl = ClassDeclPtr::dynamicCast(newType);
-        if(newcl)
-        {
-            if(!newcl->definition())
-            {
-                _errors.push_back("class " + newcl->scoped() + " declared but not defined");
-                return;
-            }
-
-            if(checkClasses(cl, newcl))
-            {
-                return;
-            }
-        }
-
-        typeChange(desc, oldType, newType);
-        return;
-    }
-
-    StructPtr s = StructPtr::dynamicCast(oldType);
-    if(s)
-    {
-        StructPtr news = StructPtr::dynamicCast(newType);
-        if(news && s->scoped() == news->scoped())
-        {
-            return;
-        }
-
-        //
-        // Allow target type of class.
-        //
-        if(ClassDeclPtr::dynamicCast(newType))
-        {
-            return;
-        }
-
-        typeChange(desc, oldType, newType);
-        return;
-    }
-
-    ProxyPtr proxy = ProxyPtr::dynamicCast(oldType);
-    if(proxy)
-    {
-        //
-        // Allow target type of Object* and string.
-        //
-        BuiltinPtr newb = BuiltinPtr::dynamicCast(newType);
-        if(newb && (newb->kind() == Builtin::KindObjectProxy || newb->kind() == Builtin::KindString))
-        {
-            return;
-        }
-
-        ProxyPtr newProxy = ProxyPtr::dynamicCast(newType);
-        if(newProxy && checkClasses(proxy->_class(), newProxy->_class()))
-        {
-            return;
-        }
-
-        typeChange(desc, oldType, newType);
-        return;
-    }
-
-    DictionaryPtr dict = DictionaryPtr::dynamicCast(oldType);
-    if(dict)
-    {
-        DictionaryPtr newDict = DictionaryPtr::dynamicCast(newType);
-        if(newDict && dict->scoped() == newDict->scoped())
-        {
-            return;
-        }
-
-        typeChange(desc, oldType, newType);
-        return;
-    }
-
-    SequencePtr seq = SequencePtr::dynamicCast(oldType);
-    if(seq)
-    {
-        SequencePtr newSeq = SequencePtr::dynamicCast(newType);
-        if(newSeq && seq->scoped() == newSeq->scoped())
-        {
-            return;
-        }
-
-        typeChange(desc, oldType, newType);
-        return;
-    }
-
-    EnumPtr en = EnumPtr::dynamicCast(oldType);
-    if(en)
-    {
-        EnumPtr newen = EnumPtr::dynamicCast(newType);
-        BuiltinPtr newb = BuiltinPtr::dynamicCast(newType);
-        if((newen && en->scoped() == newen->scoped()) || (newb && newb->kind() == Builtin::KindString))
-        {
-            return;
-        }
-
-        typeChange(desc, oldType, newType);
-        return;
-    }
-
-    assert(false);
-}
-
-void
-FreezeScript::AnalyzeTransformVisitor::typeChange(const string& desc, const TypePtr& t1, const TypePtr& t2)
-{
-    BuiltinPtr b1 = BuiltinPtr::dynamicCast(t1);
-    BuiltinPtr b2 = BuiltinPtr::dynamicCast(t2);
-    ContainedPtr c1 = ContainedPtr::dynamicCast(t1);
-    ContainedPtr c2 = ContainedPtr::dynamicCast(t2);
-    ProxyPtr p1 = ProxyPtr::dynamicCast(t1);
-    ProxyPtr p2 = ProxyPtr::dynamicCast(t2);
-
-    if(_ignoreTypeChanges)
-    {
-        _out.newline();
-        _out << "<!-- NOTICE: " << desc << " has changed from ";
-        if(b1)
-        {
-            _out << b1->kindAsString();
-        }
-        else if(p1)
-        {
-            _out << p1->_class()->scoped() << '*';
-        }
-        else
-        {
-            assert(c1);
-            _out << c1->kindOf() << ' ' << c1->scoped();
-        }
-        _out << " to ";
-        if(b2)
-        {
-            _out << b2->kindAsString();
-        }
-        else if(p2)
-        {
-            _out << p2->_class()->scoped() << '*';
-        }
-        else
-        {
-            assert(c2);
-            _out << c2->kindOf() << ' ' << c2->scoped();
-        }
-        _out << " -->";
-    }
-    else
-    {
-        ostringstream ostr;
-        ostr << "unsupported type change in " << desc << " from ";
-        if(b1)
-        {
-            ostr << b1->kindAsString();
-        }
-        else if(p1)
-        {
-            ostr << p1->_class()->scoped() << '*';
-        }
-        else
-        {
-            assert(c1);
-            ostr << c1->kindOf() << ' ' << c1->scoped();
-        }
-        ostr << " to ";
-        if(b2)
-        {
-            ostr << b2->kindAsString();
-        }
-        else if(p2)
-        {
-            ostr << p2->_class()->scoped() << '*';
-        }
-        else
-        {
-            assert(c2);
-            ostr << c2->kindOf() << ' ' << c2->scoped();
-        }
-        _errors.push_back(ostr.str());
-    }
-}
-
-bool
-FreezeScript::AnalyzeTransformVisitor::checkClasses(const ClassDeclPtr& from, const ClassDeclPtr& to)
-{
-    string fromScoped = from->scoped();
-    string toScoped = to->scoped();
-
-    if(fromScoped == toScoped)
-    {
-        return true;
-    }
-
-    //
-    // The types don't match, so check them for compatibility. Specifically,
-    // look up the old type id in the new Slice and see if it has the target
-    // type as a base class.
-    //
-    TypeList l = to->unit()->lookupTypeNoBuiltin(from->scoped(), false);
-    if(!l.empty())
-    {
-        ClassDeclPtr decl = ClassDeclPtr::dynamicCast(l.front());
-        if(decl)
-        {
-            ClassDefPtr def = decl->definition();
-            if(def)
-            {
-                ClassList bases = def->allBases();
-                for(ClassList::iterator p = bases.begin(); p != bases.end(); ++p)
-                {
-                    if((*p)->scoped() == toScoped)
-                    {
-                        return true;
-                    }
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-////////////////////////////////////
-// InitVisitor
-////////////////////////////////////
-
-FreezeScript::AnalyzeInitVisitor::AnalyzeInitVisitor(XMLOutput& out, const UnitPtr& oldUnit) :
-    _out(out), _oldUnit(oldUnit)
-{
-}
-
-bool
-FreezeScript::AnalyzeInitVisitor::visitClassDefStart(const ClassDefPtr& v)
-{
-    if(v->isInterface() || v->isLocal())
-    {
-        return false;
-    }
-
-    string scoped = v->scoped();
-    TypeList l = _oldUnit->lookupTypeNoBuiltin(scoped, false);
-    if(!l.empty())
-    {
-        ClassDeclPtr decl = ClassDeclPtr::dynamicCast(l.front());
-        if(!decl || decl->isInterface())
-        {
-            typeChange(l.front(), scoped, "class");
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    _out.newline();
-    _out.newline();
-    _out << "<!-- class " << scoped << " -->";
-    _out << se("init") << attr("type", scoped);
-    _out << ee;
-
-    return false;
-}
-
-bool
-FreezeScript::AnalyzeInitVisitor::visitStructStart(const StructPtr& v)
-{
-    if(v->isLocal())
-    {
-        return false;
-    }
-
-    string scoped = v->scoped();
-    TypeList l = _oldUnit->lookupTypeNoBuiltin(scoped, false);
-    if(!l.empty())
-    {
-        StructPtr s = StructPtr::dynamicCast(l.front());
-        if(!s)
-        {
-            typeChange(l.front(), scoped, "struct");
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    _out.newline();
-    _out.newline();
-    _out << "<!-- struct " << scoped << " -->";
-    _out << se("init") << attr("type", scoped);
-    _out << ee;
-
-    return false;
-}
-
-void
-FreezeScript::AnalyzeInitVisitor::visitSequence(const SequencePtr& v)
-{
-    if(v->isLocal())
-    {
-        return;
-    }
-
-    string scoped = v->scoped();
-    TypeList l = _oldUnit->lookupTypeNoBuiltin(scoped, false);
-    if(!l.empty())
-    {
-        SequencePtr s = SequencePtr::dynamicCast(l.front());
-        if(!s)
-        {
-            typeChange(l.front(), scoped, "sequence");
-        }
-        else
-        {
-            return;
-        }
-    }
-
-    _out.newline();
-    _out.newline();
-    _out << "<!-- sequence " << scoped << " -->";
-    _out << se("init") << attr("type", scoped);
-    _out << ee;
-}
-
-void
-FreezeScript::AnalyzeInitVisitor::visitDictionary(const DictionaryPtr& v)
-{
-    if(v->isLocal())
-    {
-        return;
-    }
-
-    string scoped = v->scoped();
-    TypeList l = _oldUnit->lookupTypeNoBuiltin(scoped, false);
-    if(!l.empty())
-    {
-        DictionaryPtr d = DictionaryPtr::dynamicCast(l.front());
-        if(!d)
-        {
-            typeChange(l.front(), scoped, "dictionary");
-        }
-        else
-        {
-            return;
-        }
-    }
-
-    _out.newline();
-    _out.newline();
-    _out << "<!-- dictionary " << scoped << " -->";
-    _out << se("init") << attr("type", scoped);
-    _out << ee;
-}
-
-void
-FreezeScript::AnalyzeInitVisitor::visitEnum(const EnumPtr& v)
-{
-    if(v->isLocal())
-    {
-        return;
-    }
-
-    string scoped = v->scoped();
-    TypeList l = _oldUnit->lookupTypeNoBuiltin(scoped, false);
-    if(!l.empty())
-    {
-        EnumPtr e = EnumPtr::dynamicCast(l.front());
-        if(!e)
-        {
-            typeChange(l.front(), scoped, "enum");
-        }
-        else
-        {
-            return;
-        }
-    }
-
-    _out.newline();
-    _out.newline();
-    _out << "<!-- enum " << scoped << " -->";
-    _out << se("init") << attr("type", scoped);
-    _out << ee;
-}
-
-
-void
-FreezeScript::AnalyzeInitVisitor::typeChange(const TypePtr& t, const string& scoped, const string& kind)
-{
-    BuiltinPtr b = BuiltinPtr::dynamicCast(t);
-    ContainedPtr c = ContainedPtr::dynamicCast(t);
-    ProxyPtr p = ProxyPtr::dynamicCast(t);
-
-    _out.newline();
-    _out.newline();
-    _out << "<!-- NOTICE: " << scoped << " has changed from ";
-    if(b)
-    {
-        _out << b->kindAsString();
-    }
-    else if(p)
-    {
-        _out << "proxy";
-    }
-    else
-    {
-        assert(c);
-        _out << c->kindOf();
-    }
-    _out << " to " << kind << " -->";
-}
-
-FreezeScript::TransformAnalyzer::TransformAnalyzer(const UnitPtr& oldUnit, const UnitPtr& newUnit,
-                                                   bool ignoreTypeChanges, ostream& os, vector<string>& missingTypes,
-                                                   vector<string>& errors) :
-    _old(oldUnit), _new(newUnit), _out(os),
-    _visitor(new AnalyzeTransformVisitor(_out, newUnit, ignoreTypeChanges, missingTypes, errors))
-{
-    _out << se("transformdb");
-}
-
-FreezeScript::TransformAnalyzer::~TransformAnalyzer()
-{
-    delete _visitor;
-}
-
-void
-FreezeScript::TransformAnalyzer::addDatabase(const string& name, const TypePtr& oldKey, const TypePtr& newKey,
-                                             const TypePtr& oldValue, const TypePtr& newValue)
-{
-    _visitor->addDatabase(name, oldKey, newKey, oldValue, newValue);
-}
-
-void
-FreezeScript::TransformAnalyzer::finish()
-{
-    _old->visit(_visitor, false);
-
-    AnalyzeInitVisitor initVisitor(_out, _old);
-    _new->visit(&initVisitor, false);
-
-    _out << ee;
-    _out << '\n';
-}
diff --git a/cpp/src/FreezeScript/TransformAnalyzer.h b/cpp/src/FreezeScript/TransformAnalyzer.h
deleted file mode 100644
index 4ade5f87703..00000000000
--- a/cpp/src/FreezeScript/TransformAnalyzer.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_SCRIPT_TRANSFORM_ANALYZER_H
-#define FREEZE_SCRIPT_TRANSFORM_ANALYZER_H
-
-#include <Slice/Parser.h>
-#include <IceUtil/OutputUtil.h>
-#include <ostream>
-
-namespace FreezeScript
-{
-
-class AnalyzeTransformVisitor;
-
-class TransformAnalyzer
-{
-public:
-
-    TransformAnalyzer(const Slice::UnitPtr&, const Slice::UnitPtr&, bool, std::ostream&, std::vector<std::string>&,
-                      std::vector<std::string>&);
-    ~TransformAnalyzer();
-
-    void addDatabase(const std::string&, const Slice::TypePtr&, const Slice::TypePtr&, const Slice::TypePtr&,
-                     const Slice::TypePtr&);
-    void finish();
-
-private:
-
-    Slice::UnitPtr _old;
-    Slice::UnitPtr _new;
-    IceUtilInternal::XMLOutput _out;
-    AnalyzeTransformVisitor* _visitor;
-};
-
-}
-
-#endif
diff --git a/cpp/src/FreezeScript/TransformDB.rc b/cpp/src/FreezeScript/TransformDB.rc
deleted file mode 100644
index 9fcc0eff244..00000000000
--- a/cpp/src/FreezeScript/TransformDB.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "Transform Freeze Database\0"
-            VALUE "FileVersion", "3.6.3\0"
-            VALUE "InternalName", "transformdb\0"
-            VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
-            VALUE "OriginalFilename", "transformdb.exe\0"
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
diff --git a/cpp/src/FreezeScript/TransformVisitor.cpp b/cpp/src/FreezeScript/TransformVisitor.cpp
deleted file mode 100644
index 209c0d0e79a..00000000000
--- a/cpp/src/FreezeScript/TransformVisitor.cpp
+++ /dev/null
@@ -1,995 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/TransformVisitor.h>
-#include <FreezeScript/Util.h>
-#include <IceUtil/InputUtil.h>
-
-using namespace std;
-
-FreezeScript::TransformVisitor::TransformVisitor(const DataPtr& src, const TransformInfoPtr& info,
-                                                 const string& context) :
-    _src(src), _info(info), _context(context)
-{
-    assert(_info);
-}
-
-void
-FreezeScript::TransformVisitor::visitBoolean(const BooleanDataPtr& dest)
-{
-    Slice::TypePtr type = dest->getType();
-    if(_info->doDefaultTransform(type))
-    {
-        BooleanDataPtr b = BooleanDataPtr::dynamicCast(_src);
-        if(b)
-        {
-            dest->setValue(b->getValue());
-        }
-        else
-        {
-            StringDataPtr s = StringDataPtr::dynamicCast(_src);
-            if(s)
-            {
-                string v = s->getValue();
-                if(v == "true")
-                {
-                    dest->setValue(true);
-                }
-                else if(v == "false")
-                {
-                    dest->setValue(false);
-                }
-                else
-                {
-                    conversionError(type, _src->getType(), v);
-                }
-            }
-            else
-            {
-                typeMismatchError(type, _src->getType());
-            }
-        }
-    }
-    _info->executeCustomTransform(dest, _src);
-}
-
-void
-FreezeScript::TransformVisitor::visitInteger(const IntegerDataPtr& dest)
-{
-    Slice::TypePtr type = dest->getType();
-    if(_info->doDefaultTransform(type))
-    {
-        IntegerDataPtr i = IntegerDataPtr::dynamicCast(_src);
-        if(i)
-        {
-            dest->setValue(i->getValue(), false);
-        }
-        else
-        {
-            StringDataPtr s = StringDataPtr::dynamicCast(_src);
-            if(s)
-            {
-                string str = s->getValue();
-                Ice::Long value;
-                if(IceUtilInternal::stringToInt64(str, value))
-                {
-                    dest->setValue(value, false);
-                }
-                else
-                {
-                    conversionError(type, _src->getType(), str);
-                }
-            }
-            else
-            {
-                typeMismatchError(type, _src->getType());
-            }
-        }
-    }
-    _info->executeCustomTransform(dest, _src);
-}
-
-void
-FreezeScript::TransformVisitor::visitDouble(const DoubleDataPtr& dest)
-{
-    Slice::TypePtr type = dest->getType();
-    if(_info->doDefaultTransform(type))
-    {
-        DoubleDataPtr d = DoubleDataPtr::dynamicCast(_src);
-        if(d)
-        {
-            dest->setValue(d->doubleValue());
-        }
-        else
-        {
-            StringDataPtr s = StringDataPtr::dynamicCast(_src);
-            if(s)
-            {
-                string str = s->stringValue();
-                const char* start = str.c_str();
-                char* end;
-                double v = strtod(start, &end);
-                if(errno == ERANGE)
-                {
-                    rangeError(str, type);
-                }
-                else
-                {
-                    while(*end)
-                    {
-                        if(!isspace(static_cast<unsigned char>(*end)))
-                        {
-                            conversionError(type, _src->getType(), str);
-                            return;
-                        }
-                        end++;
-                    }
-                    if(!*end)
-                    {
-                        dest->setValue(v);
-                    }
-                }
-            }
-            else
-            {
-                typeMismatchError(type, _src->getType());
-            }
-        }
-    }
-    _info->executeCustomTransform(dest, _src);
-}
-
-void
-FreezeScript::TransformVisitor::visitString(const StringDataPtr& dest)
-{
-    Slice::TypePtr type = dest->getType();
-    if(_info->doDefaultTransform(type))
-    {
-        StringDataPtr s = StringDataPtr::dynamicCast(_src);
-        BooleanDataPtr b = BooleanDataPtr::dynamicCast(_src);
-        IntegerDataPtr i = IntegerDataPtr::dynamicCast(_src);
-        DoubleDataPtr d = DoubleDataPtr::dynamicCast(_src);
-        EnumDataPtr e = EnumDataPtr::dynamicCast(_src);
-        ProxyDataPtr p = ProxyDataPtr::dynamicCast(_src);
-        if(s || b || i || d || e || p)
-        {
-            dest->setValue(_src->toString());
-        }
-        else
-        {
-            typeMismatchError(type, _src->getType());
-        }
-    }
-    _info->executeCustomTransform(dest, _src);
-}
-
-void
-FreezeScript::TransformVisitor::visitProxy(const ProxyDataPtr& dest)
-{
-    Slice::TypePtr type = dest->getType();
-    if(_info->doDefaultTransform(type))
-    {
-        ProxyDataPtr p = ProxyDataPtr::dynamicCast(_src);
-        if(p)
-        {
-            dest->setValue(p->getValue());
-        }
-        else
-        {
-            StringDataPtr s = StringDataPtr::dynamicCast(_src);
-            if(s)
-            {
-                dest->setValue(s->getValue(), false);
-            }
-            else
-            {
-                typeMismatchError(type, _src->getType());
-            }
-        }
-    }
-    _info->executeCustomTransform(dest, _src);
-}
-
-void
-FreezeScript::TransformVisitor::visitStruct(const StructDataPtr& dest)
-{
-    Slice::TypePtr type = dest->getType();
-    if(_info->doDefaultTransform(type))
-    {
-        //
-        // Support struct->struct and class->struct transforms.
-        //
-        StructDataPtr s = StructDataPtr::dynamicCast(_src);
-        ObjectRefPtr obj = ObjectRefPtr::dynamicCast(_src);
-        if((s || obj) && isCompatible(type, _src->getType()))
-        {
-            //
-            // Transform members with the same name.
-            //
-            DataMemberMap srcMap = s ? s->getMembers() : obj->getValue()->getMembers();
-            DataMemberMap destMap = dest->getMembers();
-            string typeName = typeToString(type);
-            for(DataMemberMap::iterator p = destMap.begin(); p != destMap.end(); ++p)
-            {
-                DataMemberMap::iterator q = srcMap.find(p->first);
-                if(q != srcMap.end())
-                {
-                    string context = typeName + " member " + p->first + " value";
-                    TransformVisitor v(q->second, _info, context);
-                    p->second->visit(v);
-                }
-            }
-        }
-        else
-        {
-            typeMismatchError(type, _src->getType());
-        }
-    }
-    _info->executeCustomTransform(dest, _src);
-}
-
-void
-FreezeScript::TransformVisitor::visitSequence(const SequenceDataPtr& dest)
-{
-    Slice::TypePtr type = dest->getType();
-    if(_info->doDefaultTransform(type))
-    {
-        SequenceDataPtr s = SequenceDataPtr::dynamicCast(_src);
-        if(s && isCompatible(type, _src->getType()))
-        {
-            DataList& srcElements = s->getElements();
-            DataList destElements;
-            Slice::SequencePtr seqType = Slice::SequencePtr::dynamicCast(type);
-            assert(seqType);
-            Slice::TypePtr elemType = seqType->type();
-            string typeName = typeToString(type);
-            for(DataList::const_iterator p = srcElements.begin(); p != srcElements.end(); ++p)
-            {
-                DataPtr element = _info->getDataFactory()->create(elemType, false);
-                Destroyer<DataPtr> elementDestroyer(element);
-                try
-                {
-                    TransformVisitor v(*p, _info, typeName + " element");
-                    element->visit(v);
-                    destElements.push_back(element);
-                    elementDestroyer.release();
-                }
-                catch(const ClassNotFoundException& ex)
-                {
-                    //
-                    // If transformation of the sequence element fails because a class
-                    // could not be found, then we invoke purgeObjects() to determine
-                    // whether we should ignore the situation (and remove the element
-                    // from the sequence) or raise the exception again.
-                    //
-                    if(!_info->purgeObjects())
-                    {
-                        throw;
-                    }
-                    warning("purging element of sequence " + typeToString(type) +
-                            " due to missing class type " + ex.id);
-                }
-            }
-            DataList& l = dest->getElements();
-            l.swap(destElements);
-        }
-        else
-        {
-            typeMismatchError(type, _src->getType());
-        }
-    }
-    _info->executeCustomTransform(dest, _src);
-}
-
-void
-FreezeScript::TransformVisitor::visitEnum(const EnumDataPtr& dest)
-{
-    Slice::TypePtr type = dest->getType();
-    if(_info->doDefaultTransform(type))
-    {
-        string name;
-        EnumDataPtr e = EnumDataPtr::dynamicCast(_src);
-        if(e && isCompatible(type, _src->getType()))
-        {
-            name = e->toString();
-        }
-        else
-        {
-            StringDataPtr s = StringDataPtr::dynamicCast(_src);
-            if(s)
-            {
-                name = s->getValue();
-            }
-            else
-            {
-                typeMismatchError(type, _src->getType());
-                return;
-            }
-        }
-
-        if(!dest->setValueAsString(name))
-        {
-            conversionError(type, _src->getType(), name);
-        }
-    }
-    _info->executeCustomTransform(dest, _src);
-}
-
-void
-FreezeScript::TransformVisitor::visitDictionary(const DictionaryDataPtr& dest)
-{
-    Slice::TypePtr type = dest->getType();
-    if(_info->doDefaultTransform(type))
-    {
-        DictionaryDataPtr d = DictionaryDataPtr::dynamicCast(_src);
-        if(d && isCompatible(type, _src->getType()))
-        {
-            DataMap& srcMap = d->getElements();
-            DataMap destMap;
-            Slice::DictionaryPtr dictType = Slice::DictionaryPtr::dynamicCast(type);
-            assert(dictType);
-            Slice::TypePtr keyType = dictType->keyType();
-            Slice::TypePtr valueType = dictType->valueType();
-            string typeName = typeToString(type);
-            for(DataMap::const_iterator p = srcMap.begin(); p != srcMap.end(); ++p)
-            {
-                DataPtr key = _info->getDataFactory()->create(keyType, false);
-                Destroyer<DataPtr> keyDestroyer(key);
-                DataPtr value = _info->getDataFactory()->create(valueType, false);
-                Destroyer<DataPtr> valueDestroyer(value);
-
-                TransformVisitor keyVisitor(p->first, _info, typeName + " key");
-                key->visit(keyVisitor);
-
-                try
-                {
-                    TransformVisitor valueVisitor(p->second, _info, typeName + " value");
-                    value->visit(valueVisitor);
-                }
-                catch(const ClassNotFoundException& ex)
-                {
-                    //
-                    // If transformation of the dictionary value fails because a class
-                    // could not be found, then we invoke purgeObjects() to determine
-                    // whether we should ignore the situation (and remove the element
-                    // from the dictionary) or raise the exception again.
-                    //
-                    if(!_info->purgeObjects())
-                    {
-                        throw;
-                    }
-                    warning("purging element of dictionary " + typeToString(dictType) + " due to missing class type " +
-                            ex.id);
-                    continue;
-                }
-
-                DataMap::const_iterator q = destMap.find(key);
-                if(q != destMap.end())
-                {
-                    warning("duplicate dictionary key in " + typeToString(dictType));
-                }
-                else
-                {
-                    destMap.insert(DataMap::value_type(key, value));
-                    keyDestroyer.release();
-                    valueDestroyer.release();
-                }
-            }
-            DataMap& m = dest->getElements();
-            m.swap(destMap);
-        }
-        else
-        {
-            typeMismatchError(type, _src->getType());
-        }
-    }
-    _info->executeCustomTransform(dest, _src);
-}
-
-void
-FreezeScript::TransformVisitor::visitObject(const ObjectRefPtr& dest)
-{
-    //
-    // Support struct->class and class->class transforms.
-    //
-    Slice::TypePtr type = dest->getType();
-    ObjectRefPtr src = ObjectRefPtr::dynamicCast(_src);
-    StructDataPtr s = StructDataPtr::dynamicCast(_src);
-    if(!src && !s)
-    {
-        typeMismatchError(type, _src->getType());
-    }
-    else if(_info->doDefaultTransform(type))
-    {
-        if(src)
-        {
-            //
-            // class->class transform
-            //
-            ObjectDataPtr srcValue = src->getValue();
-            Slice::TypePtr srcType = src->getType();
-            if(!srcValue)
-            {
-                //
-                // Allow a nil value from type Object.
-                //
-                if(Slice::BuiltinPtr::dynamicCast(srcType) || isCompatible(type, srcType))
-                {
-                    dest->setValue(0);
-                }
-                else
-                {
-                    typeMismatchError(type, srcType);
-                }
-            }
-            else
-            {
-                Slice::TypePtr srcValueType = srcValue->getType();
-                if(isCompatible(type, srcValueType))
-                {
-                    //
-                    // If the types are in the same Slice unit, then we can simply
-                    // copy the reference. Otherwise, we check the object map to
-                    // see if an equivalent object has already been created, and
-                    // if not, then we have to create one.
-                    //
-                    if(type->unit().get() == srcValueType->unit().get())
-                    {
-                        dest->setValue(srcValue);
-                    }
-                    else
-                    {
-                        ObjectDataMap& objectDataMap = _info->getObjectDataMap();
-                        ObjectDataMap::iterator p = objectDataMap.find(srcValue.get());
-                        if(p != objectDataMap.end() && p->second)
-                        {
-                            dest->setValue(p->second);
-                        }
-                        else
-                        {
-                            //
-                            // If the type has been renamed, we need to get its equivalent
-                            // in the new Slice definitions.
-                            //
-                            Slice::TypePtr newType = _info->getRenamedType(srcValueType);
-                            if(!newType)
-                            {
-                                string name = typeToString(srcValueType);
-                                Slice::TypeList l = type->unit()->lookupType(name, false);
-                                if(l.empty())
-                                {
-                                    throw ClassNotFoundException(name);
-                                }
-                                newType = l.front();
-                            }
-
-                            //
-                            // Use createObject() so that an initializer is invoked if necessary.
-                            //
-                            DataPtr newObj = _info->getDataFactory()->createObject(newType, false);
-                            ObjectRefPtr newRef = ObjectRefPtr::dynamicCast(newObj);
-                            assert(newRef);
-
-                            ObjectDataPtr newValue = newRef->getValue();
-                            try
-                            {
-                                transformObject(newValue, srcValue);
-                            }
-                            catch(...)
-                            {
-                                newObj->destroy();
-                                throw;
-                            }
-
-                            dest->setValue(newValue);
-                            newObj->destroy();
-                        }
-                    }
-                }
-                else
-                {
-                    typeMismatchError(type, srcValueType);
-                }
-            }
-        }
-        else
-        {
-            //
-            // struct->class transform
-            //
-            Slice::TypePtr srcType = _src->getType();
-            if(isCompatible(type, srcType))
-            {
-                //
-                // If the type has been renamed, we need to get its equivalent
-                // in the new Slice definitions.
-                //
-                Slice::TypePtr newType = _info->getRenamedType(srcType);
-                if(!newType)
-                {
-                    string name = typeToString(srcType);
-                    Slice::TypeList l = type->unit()->lookupType(name, false);
-                    if(l.empty())
-                    {
-                        throw ClassNotFoundException(name);
-                    }
-                    newType = l.front();
-                }
-
-                //
-                // Use createObject() so that an initializer is invoked if necessary.
-                //
-                DataPtr newObj = _info->getDataFactory()->createObject(newType, false);
-                ObjectRefPtr newRef = ObjectRefPtr::dynamicCast(newObj);
-                assert(newRef);
-
-                ObjectDataPtr newValue = newRef->getValue();
-                try
-                {
-                    //
-                    // Transform members with the same name.
-                    //
-                    DataMemberMap srcMap = s->getMembers();
-                    DataMemberMap destMap = newValue->getMembers();
-                    string typeName = typeToString(type);
-                    for(DataMemberMap::iterator p = destMap.begin(); p != destMap.end(); ++p)
-                    {
-                        DataMemberMap::iterator q = srcMap.find(p->first);
-                        if(q != srcMap.end())
-                        {
-                            string context = typeName + " member " + p->first + " value";
-                            TransformVisitor v(q->second, _info, context);
-                            p->second->visit(v);
-                        }
-                    }
-                }
-                catch(...)
-                {
-                    newObj->destroy();
-                    throw;
-                }
-
-                dest->setValue(newValue);
-                newObj->destroy();
-            }
-            else
-            {
-                typeMismatchError(type, srcType);
-            }
-        }
-    }
-    _info->executeCustomTransform(dest, _src);
-}
-
-void
-FreezeScript::TransformVisitor::transformObject(const ObjectDataPtr& dest, const ObjectDataPtr& src)
-{
-    //
-    // The source object must be present in the object map (we currently don't support
-    // transforming two ObjectData instances from the same Slice unit - this transform
-    // would be handled by-reference at the ObjectRef level). We must update the object
-    // map before transforming members in order to handle cycles.
-    //
-    ObjectDataMap& objectDataMap = _info->getObjectDataMap();
-    ObjectDataMap::iterator p = objectDataMap.find(src.get());
-    assert(p != objectDataMap.end());
-    assert(p->second == 0);
-    objectDataMap.erase(p);
-    objectDataMap.insert(ObjectDataMap::value_type(src.get(), dest));
-    p = objectDataMap.find(src.get());
-
-    try
-    {
-        //
-        // Transform members with the same name.
-        //
-        DataMemberMap srcMap = src->getMembers();
-        DataMemberMap destMap = dest->getMembers();
-        string typeName = typeToString(dest->getType());
-        for(DataMemberMap::iterator p = destMap.begin(); p != destMap.end(); ++p)
-        {
-            DataMemberMap::iterator q = srcMap.find(p->first);
-            if(q != srcMap.end())
-            {
-                string context = typeName + " member " + p->first + " value";
-                TransformVisitor v(q->second, _info, context);
-                p->second->visit(v);
-            }
-        }
-    }
-    catch(...)
-    {
-        objectDataMap.erase(p);
-
-#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
-        objectDataMap.insert(ObjectDataMap::value_type(src.get(), static_cast<ObjectDataPtr>(nullptr)));
-#else
-        objectDataMap.insert(ObjectDataMap::value_type(src.get(), 0));
-#endif
-        throw;
-    }
-}
-
-bool
-FreezeScript::TransformVisitor::checkRename(const Slice::TypePtr& dest, const Slice::TypePtr& src)
-{
-    if(dest->unit().get() != src->unit().get())
-    {
-        Slice::TypePtr t = _info->getRenamedType(src);
-        return t.get() == dest.get();
-    }
-
-    return false;
-}
-
-bool
-FreezeScript::TransformVisitor::isCompatible(const Slice::TypePtr& dest, const Slice::TypePtr& src)
-{
-    Slice::BuiltinPtr b1 = Slice::BuiltinPtr::dynamicCast(dest);
-    if(b1)
-    {
-        Slice::BuiltinPtr b2 = Slice::BuiltinPtr::dynamicCast(src);
-        switch(b1->kind())
-        {
-        case Slice::Builtin::KindByte:
-        case Slice::Builtin::KindShort:
-        case Slice::Builtin::KindInt:
-        case Slice::Builtin::KindLong:
-        {
-            if(b2)
-            {
-                switch(b2->kind())
-                {
-                case Slice::Builtin::KindByte:
-                case Slice::Builtin::KindShort:
-                case Slice::Builtin::KindInt:
-                case Slice::Builtin::KindLong:
-                case Slice::Builtin::KindString:
-                {
-                    return true;
-                }
-                case Slice::Builtin::KindBool:
-                case Slice::Builtin::KindFloat:
-                case Slice::Builtin::KindDouble:
-                case Slice::Builtin::KindObject:
-                case Slice::Builtin::KindObjectProxy:
-                case Slice::Builtin::KindLocalObject:
-                {
-                    return false;
-                }
-                }
-            }
-
-            return false;
-        }
-        case Slice::Builtin::KindBool:
-        {
-            if(b2 && (b2->kind() == Slice::Builtin::KindBool || b2->kind() == Slice::Builtin::KindString))
-            {
-                return true;
-            }
-
-            return false;
-        }
-        case Slice::Builtin::KindFloat:
-        case Slice::Builtin::KindDouble:
-        {
-            if(b2)
-            {
-                switch(b2->kind())
-                {
-                case Slice::Builtin::KindFloat:
-                case Slice::Builtin::KindDouble:
-                case Slice::Builtin::KindString:
-                {
-                    return true;
-                }
-                case Slice::Builtin::KindByte:
-                case Slice::Builtin::KindShort:
-                case Slice::Builtin::KindInt:
-                case Slice::Builtin::KindLong:
-                case Slice::Builtin::KindBool:
-                case Slice::Builtin::KindObject:
-                case Slice::Builtin::KindObjectProxy:
-                case Slice::Builtin::KindLocalObject:
-                {
-                    return false;
-                }
-                }
-            }
-
-            return false;
-        }
-        case Slice::Builtin::KindString:
-        {
-            if(b2)
-            {
-                switch(b2->kind())
-                {
-                case Slice::Builtin::KindByte:
-                case Slice::Builtin::KindBool:
-                case Slice::Builtin::KindShort:
-                case Slice::Builtin::KindInt:
-                case Slice::Builtin::KindLong:
-                case Slice::Builtin::KindFloat:
-                case Slice::Builtin::KindDouble:
-                case Slice::Builtin::KindString:
-                case Slice::Builtin::KindObjectProxy:
-                {
-                    return true;
-                }
-                case Slice::Builtin::KindObject:
-                case Slice::Builtin::KindLocalObject:
-                {
-                    return false;
-                }
-                }
-
-                return false;
-            }
-            else if(Slice::EnumPtr::dynamicCast(src))
-            {
-                return true;
-            }
-            else if(Slice::ProxyPtr::dynamicCast(src))
-            {
-                return true;
-            }
-
-            return false;
-        }
-        case Slice::Builtin::KindObject:
-        {
-            //
-            // Allow transformation from Object to class. Validation has to
-            // be done during transformation, when the actual type of
-            // an instance can be compared for compatibility with the
-            // new type.
-            //
-            Slice::ClassDeclPtr cl = Slice::ClassDeclPtr::dynamicCast(src);
-            if(cl || (b2 && b2->kind() == Slice::Builtin::KindObject))
-            {
-                return true;
-            }
-
-            return false;
-        }
-        case Slice::Builtin::KindObjectProxy:
-        {
-            Slice::ProxyPtr p = Slice::ProxyPtr::dynamicCast(src);
-            if(p || (b2 && b2->kind() == Slice::Builtin::KindObjectProxy) ||
-               (b2 && b2->kind() == Slice::Builtin::KindString))
-            {
-                return true;
-            }
-
-            return false;
-        }
-        case Slice::Builtin::KindLocalObject:
-        {
-            assert(false);
-            return false;
-        }
-        }
-
-        assert(false);
-    }
-
-    Slice::ClassDeclPtr cl1 = Slice::ClassDeclPtr::dynamicCast(dest);
-    if(cl1)
-    {
-        Slice::ClassDeclPtr cl2 = Slice::ClassDeclPtr::dynamicCast(src);
-        if(cl2 && checkClasses(cl1, cl2))
-        {
-            return true;
-        }
-
-        Slice::StructPtr s2 = Slice::StructPtr::dynamicCast(src);
-        if(s2)
-        {
-            if(checkRename(dest, src))
-            {
-                return true;
-            }
-
-            if(s2 && cl1->scoped() == s2->scoped())
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    Slice::StructPtr s1 = Slice::StructPtr::dynamicCast(dest);
-    if(s1)
-    {
-        if(checkRename(dest, src))
-        {
-            return true;
-        }
-
-        Slice::StructPtr s2 = Slice::StructPtr::dynamicCast(src);
-        Slice::ClassDeclPtr cl2 = Slice::ClassDeclPtr::dynamicCast(src);
-        if((s2 && s1->scoped() == s2->scoped()) || (cl2 && s1->scoped() == cl2->scoped()))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    Slice::ProxyPtr p1 = Slice::ProxyPtr::dynamicCast(dest);
-    if(p1)
-    {
-        Slice::BuiltinPtr b2 = Slice::BuiltinPtr::dynamicCast(src);
-        if(b2 && (b2->kind() == Slice::Builtin::KindObjectProxy || b2->kind() == Slice::Builtin::KindString))
-        {
-            return true;
-        }
-
-        Slice::ProxyPtr p2 = Slice::ProxyPtr::dynamicCast(src);
-        if(p2 && checkClasses(p1->_class(), p2->_class()))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    Slice::DictionaryPtr d1 = Slice::DictionaryPtr::dynamicCast(dest);
-    if(d1)
-    {
-        Slice::DictionaryPtr d2 = Slice::DictionaryPtr::dynamicCast(src);
-        if(d2)
-        {
-            return isCompatible(d1->keyType(), d2->keyType()) &&
-                   isCompatible(d1->valueType(), d2->valueType());
-        }
-
-        return false;
-    }
-
-    Slice::SequencePtr seq1 = Slice::SequencePtr::dynamicCast(dest);
-    if(seq1)
-    {
-        Slice::SequencePtr seq2 = Slice::SequencePtr::dynamicCast(src);
-        if(seq2)
-        {
-            return isCompatible(seq1->type(), seq2->type());
-        }
-
-        return false;
-    }
-
-    Slice::EnumPtr e1 = Slice::EnumPtr::dynamicCast(dest);
-    if(e1)
-    {
-        Slice::BuiltinPtr b2 = Slice::BuiltinPtr::dynamicCast(src);
-        if(b2 && b2->kind() == Slice::Builtin::KindString)
-        {
-            return true;
-        }
-
-        if(checkRename(dest, src))
-        {
-            return true;
-        }
-
-        Slice::EnumPtr e2 = Slice::EnumPtr::dynamicCast(src);
-        if(e2 && e1->scoped() == e2->scoped())
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    assert(false);
-    return false;
-}
-
-bool
-FreezeScript::TransformVisitor::checkClasses(const Slice::ClassDeclPtr& dest, const Slice::ClassDeclPtr& src)
-{
-    //
-    // Here are the rules for verifying class compatibility:
-    //
-    // 1. If the type ids are the same, assume they are compatible.
-    // 2. If the source type has been renamed, then check its equivalent new definition for compatibility.
-    // 3. Otherwise, the types are only compatible if they are defined in the same Slice unit, and if the
-    //    destination type is a base type of the source type.
-    //
-    string s1 = dest->scoped();
-    string s2 = src->scoped();
-    if(s1 == s2)
-    {
-        return true;
-    }
-    else
-    {
-        Slice::TypePtr t = _info->getRenamedType(src);
-        Slice::ClassDeclPtr s = Slice::ClassDeclPtr::dynamicCast(t);
-        if(s)
-        {
-            return checkClasses(dest, s);
-        }
-
-        if(dest->unit().get() != src->unit().get())
-        {
-            Slice::TypeList l = dest->unit()->lookupTypeNoBuiltin(s2, false);
-            if(l.empty())
-            {
-                _info->getErrorReporter()->error("class " + s2 + " not found in new Slice definitions");
-            }
-            s = Slice::ClassDeclPtr::dynamicCast(l.front());
-        }
-        else
-        {
-            s = src;
-        }
-
-        if(s)
-        {
-            Slice::ClassDefPtr def = s->definition();
-            if(!def)
-            {
-                _info->getErrorReporter()->error("class " + s2 + " declared but not defined");
-            }
-            return def->isA(s1);
-        }
-    }
-
-    return false;
-}
-
-void
-FreezeScript::TransformVisitor::typeMismatchError(const Slice::TypePtr& dest, const Slice::TypePtr& src)
-{
-    ostringstream ostr;
-    ostr << "unable to transform";
-    if(!_context.empty())
-    {
-        ostr << ' ' << _context;
-    }
-    ostr << " from " << typeToString(src) << " to " << typeToString(dest);
-    warning(ostr.str());
-}
-
-void
-FreezeScript::TransformVisitor::conversionError(const Slice::TypePtr& dest, const Slice::TypePtr& src,
-                                                const string& value)
-{
-    ostringstream ostr;
-    ostr << "unable to convert";
-    if(!_context.empty())
-    {
-        ostr << ' ' << _context;
-    }
-    ostr << " `" << value << "' from " << typeToString(src) << " to " << typeToString(dest);
-    warning(ostr.str());
-}
-
-void
-FreezeScript::TransformVisitor::rangeError(const string& value, const Slice::TypePtr& type)
-{
-    ostringstream ostr;
-    if(!_context.empty())
-    {
-        ostr << _context << ' ';
-    }
-    ostr << "`" << value << "' is out of range for type " << typeToString(type);
-    warning(ostr.str());
-}
-
-void
-FreezeScript::TransformVisitor::warning(const string& msg)
-{
-    _info->getErrorReporter()->warning(msg);
-}
diff --git a/cpp/src/FreezeScript/TransformVisitor.h b/cpp/src/FreezeScript/TransformVisitor.h
deleted file mode 100644
index 9217ed02d7c..00000000000
--- a/cpp/src/FreezeScript/TransformVisitor.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_SCRIPT_TRANSFORM_VISITOR_H
-#define FREEZE_SCRIPT_TRANSFORM_VISITOR_H
-
-#include <FreezeScript/Data.h>
-
-namespace FreezeScript
-{
-
-//
-// ObjectDataMap associates old instances of ObjectData to their
-// transformed equivalents.
-//
-typedef std::map<const ObjectData*, ObjectDataPtr> ObjectDataMap;
-
-//
-// TransformInfo supplies information required by TransformVisitor.
-//
-class TransformInfo : public IceUtil::SimpleShared
-{
-public:
-
-    virtual ~TransformInfo() {}
-
-    //
-    // Get data factory.
-    //
-    virtual DataFactoryPtr getDataFactory() = 0;
-
-    //
-    // Get error reporter.
-    //
-    virtual ErrorReporterPtr getErrorReporter() = 0;
-
-    //
-    // Indicates whether the default transformation should be performed.
-    //
-    virtual bool doDefaultTransform(const Slice::TypePtr&) = 0;
-
-    //
-    // Indicates whether a base class transformation should be performed.
-    //
-    virtual bool doBaseTransform(const Slice::ClassDefPtr&) = 0;
-
-    //
-    // Given an old type, return the equivalent new type if the type
-    // has been renamed.
-    //
-    virtual Slice::TypePtr getRenamedType(const Slice::TypePtr&) = 0;
-
-    //
-    // Execute the custom transformation for the given old and new Data values.
-    //
-    virtual void executeCustomTransform(const DataPtr&, const DataPtr&) = 0;
-
-    //
-    // The facet name of the database (evictor only).
-    //
-    virtual std::string facetName() = 0;
-
-    //
-    // Indicates whether objects should be removed if no class definition is found.
-    //
-    virtual bool purgeObjects() = 0;
-
-    //
-    // Associates old object instances with their transformed equivalents.
-    //
-    virtual ObjectDataMap& getObjectDataMap() = 0;
-};
-typedef IceUtil::Handle<TransformInfo> TransformInfoPtr;
-
-//
-// TransformVisitor is used to visit a destination Data value and
-// preserve as much information as possible from the source Data value.
-//
-class TransformVisitor : public DataVisitor
-{
-public:
-
-    TransformVisitor(const DataPtr&, const TransformInfoPtr&, const std::string& = std::string());
-
-    virtual void visitBoolean(const BooleanDataPtr&);
-    virtual void visitInteger(const IntegerDataPtr&);
-    virtual void visitDouble(const DoubleDataPtr&);
-    virtual void visitString(const StringDataPtr&);
-    virtual void visitProxy(const ProxyDataPtr&);
-    virtual void visitStruct(const StructDataPtr&);
-    virtual void visitSequence(const SequenceDataPtr&);
-    virtual void visitEnum(const EnumDataPtr&);
-    virtual void visitDictionary(const DictionaryDataPtr&);
-    virtual void visitObject(const ObjectRefPtr&);
-
-private:
-
-    void transformObject(const ObjectDataPtr&, const ObjectDataPtr&);
-    bool checkRename(const Slice::TypePtr&, const Slice::TypePtr&);
-    bool isCompatible(const Slice::TypePtr&, const Slice::TypePtr&);
-    bool checkClasses(const Slice::ClassDeclPtr&, const Slice::ClassDeclPtr&);
-    void typeMismatchError(const Slice::TypePtr&, const Slice::TypePtr&);
-    void conversionError(const Slice::TypePtr&, const Slice::TypePtr&, const std::string&);
-    void rangeError(const std::string&, const Slice::TypePtr&);
-    void warning(const std::string&);
-
-    DataPtr _src;
-    TransformInfoPtr _info;
-    std::string _context; // Provides additional detail for use in warning messages.
-};
-
-} // End of namespace FreezeScript
-
-#endif
diff --git a/cpp/src/FreezeScript/Transformer.cpp b/cpp/src/FreezeScript/Transformer.cpp
deleted file mode 100644
index c3c3ebbea40..00000000000
--- a/cpp/src/FreezeScript/Transformer.cpp
+++ /dev/null
@@ -1,3044 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/Transformer.h>
-#include <FreezeScript/Parser.h>
-#include <FreezeScript/TransformVisitor.h>
-#include <FreezeScript/AssignVisitor.h>
-#include <FreezeScript/Print.h>
-#include <FreezeScript/Functions.h>
-#include <FreezeScript/Exception.h>
-#include <FreezeScript/Util.h>
-#include <Freeze/Catalog.h>
-#include <Freeze/Initialize.h>
-#include <IceXML/Parser.h>
-#include <IceUtil/InputUtil.h>
-#include <db_cxx.h>
-#include <climits>
-
-using namespace std;
-
-namespace FreezeScript
-{
-
-class DeleteRecordException {};
-
-class Descriptor;
-typedef IceUtil::Handle<Descriptor> DescriptorPtr;
-
-class InitDescriptor;
-typedef IceUtil::Handle<InitDescriptor> InitDescriptorPtr;
-
-class TransformDescriptor;
-typedef IceUtil::Handle<TransformDescriptor> TransformDescriptorPtr;
-
-class TransformDataFactory;
-typedef IceUtil::Handle<TransformDataFactory> TransformDataFactoryPtr;
-
-typedef map<string, TransformDescriptorPtr> TransformMap;
-typedef map<string, Slice::TypePtr> RenameMap;
-
-//
-// TransformInfoI
-//
-struct TransformInfoI : public TransformInfo
-{
-    virtual DataFactoryPtr getDataFactory();
-    virtual ErrorReporterPtr getErrorReporter();
-    virtual bool doDefaultTransform(const Slice::TypePtr&);
-    virtual bool doBaseTransform(const Slice::ClassDefPtr&);
-    virtual Slice::TypePtr getRenamedType(const Slice::TypePtr&);
-    virtual void executeCustomTransform(const DataPtr&, const DataPtr&);
-    virtual string facetName();
-    virtual bool purgeObjects();
-    virtual ObjectDataMap& getObjectDataMap();
-
-    Ice::CommunicatorPtr communicator;
-    FreezeScript::ObjectFactoryPtr objectFactory;
-    Slice::UnitPtr oldUnit;
-    Slice::UnitPtr newUnit;
-    Db* oldDb;
-    Db* newDb;
-    DbTxn* newDbTxn;
-
-    //
-    // Connection to the new environment; not null only if we want to write into the catalog
-    //
-    Freeze::ConnectionPtr connection;
-    string newDbName;
-
-    string facet;
-    bool purge;
-    ErrorReporterPtr errorReporter;
-    TransformDataFactoryPtr factory;
-    SymbolTablePtr symbolTable;
-    Slice::TypePtr oldKeyType;
-    Slice::TypePtr oldValueType;
-    Slice::TypePtr newKeyType;
-    Slice::TypePtr newValueType;
-    TransformMap transformMap;
-    RenameMap renameMap;
-    ObjectDataMap objectDataMap;
-};
-typedef IceUtil::Handle<TransformInfoI> TransformInfoIPtr;
-
-//
-// TransformDataFactory
-//
-class TransformDataFactory : public DataFactory
-{
-public:
-
-    TransformDataFactory(const Ice::CommunicatorPtr&, const Slice::UnitPtr&, const ErrorReporterPtr&);
-
-    void addInitDescriptor(const InitDescriptorPtr&);
-    void disableInitializers();
-    void enableInitializers();
-
-protected:
-
-    virtual void initialize(const DataPtr&);
-
-private:
-
-    typedef map<string, InitDescriptorPtr> InitMap;
-    InitMap _initMap;
-    bool _enabled;
-};
-
-//
-// Descriptor
-//
-class Descriptor : public IceUtil::SimpleShared
-{
-public:
-
-    virtual ~Descriptor();
-
-    virtual DescriptorPtr parent() const;
-    virtual void addChild(const DescriptorPtr&) = 0;
-    virtual void validate() = 0;
-    virtual void execute(const SymbolTablePtr&) = 0;
-
-protected:
-
-    Descriptor(const DescriptorPtr&, int, const TransformInfoIPtr&);
-
-    NodePtr parse(const string&) const;
-
-    Slice::TypePtr findType(const Slice::UnitPtr&, const string&);
-
-    DescriptorPtr _parent;
-    int _line;
-    TransformInfoIPtr _info;
-};
-
-//
-// SetDescriptor
-//
-class SetDescriptor : public Descriptor
-{
-public:
-
-    SetDescriptor(const DescriptorPtr&, int, const TransformInfoIPtr&, const IceXML::Attributes&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&);
-
-private:
-
-    EntityNodePtr _target;
-    NodePtr _value;
-    string _valueStr;
-    string _type;
-    NodePtr _length;
-    string _lengthStr;
-    bool _convert;
-};
-
-//
-// DefineDescriptor
-//
-class DefineDescriptor : public Descriptor
-{
-public:
-
-    DefineDescriptor(const DescriptorPtr&, int, const TransformInfoIPtr&, const IceXML::Attributes&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&);
-
-private:
-
-    string _name;
-    NodePtr _value;
-    string _valueStr;
-    Slice::TypePtr _type;
-    bool _convert;
-};
-
-//
-// AddDescriptor
-//
-class AddDescriptor : public Descriptor
-{
-public:
-
-    AddDescriptor(const DescriptorPtr&, int, const TransformInfoIPtr&, const IceXML::Attributes&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&);
-
-private:
-
-    EntityNodePtr _target;
-    NodePtr _key;
-    string _keyStr;
-    NodePtr _index;
-    string _indexStr;
-    NodePtr _value;
-    string _valueStr;
-    string _type;
-    bool _convert;
-};
-
-//
-// RemoveDescriptor
-//
-class RemoveDescriptor : public Descriptor
-{
-public:
-
-    RemoveDescriptor(const DescriptorPtr&, int, const TransformInfoIPtr&, const IceXML::Attributes&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&);
-
-private:
-
-    EntityNodePtr _target;
-    NodePtr _key;
-    string _keyStr;
-    NodePtr _index;
-    string _indexStr;
-};
-
-//
-// DeleteDescriptor
-//
-class DeleteDescriptor : public Descriptor
-{
-public:
-
-    DeleteDescriptor(const DescriptorPtr&, int, const TransformInfoIPtr&, const IceXML::Attributes&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&);
-};
-
-//
-// FailDescriptor
-//
-class FailDescriptor : public Descriptor
-{
-public:
-
-    FailDescriptor(const DescriptorPtr&, int, const TransformInfoIPtr&, const IceXML::Attributes&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&);
-
-private:
-
-    NodePtr _test;
-    string _testStr;
-    string _message;
-};
-
-//
-// EchoDescriptor
-//
-class EchoDescriptor : public Descriptor
-{
-public:
-
-    EchoDescriptor(const DescriptorPtr&, int, const TransformInfoIPtr&, const IceXML::Attributes&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&);
-
-private:
-
-    string _message;
-    NodePtr _value;
-    string _valueStr;
-};
-
-//
-// ExecutableContainerDescriptor
-//
-class ExecutableContainerDescriptor : public Descriptor
-{
-public:
-
-    ExecutableContainerDescriptor(const DescriptorPtr&, int, const TransformInfoIPtr&, const IceXML::Attributes&,
-                                  const string&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&);
-
-protected:
-
-    vector<DescriptorPtr> _children;
-
-private:
-
-    string _name;
-};
-
-//
-// IfDescriptor
-//
-class IfDescriptor : public ExecutableContainerDescriptor
-{
-public:
-
-    IfDescriptor(const DescriptorPtr&, int, const TransformInfoIPtr&, const IceXML::Attributes&);
-
-    virtual void execute(const SymbolTablePtr&);
-
-private:
-
-    NodePtr _test;
-    string _testStr;
-};
-
-//
-// IterateDescriptor
-//
-class IterateDescriptor : public ExecutableContainerDescriptor
-{
-public:
-
-    IterateDescriptor(const DescriptorPtr&, int, const TransformInfoIPtr&, const IceXML::Attributes&);
-
-    virtual void execute(const SymbolTablePtr&);
-
-private:
-
-    EntityNodePtr _target;
-    string _key;
-    string _value;
-    string _element;
-    string _index;
-};
-
-//
-// TransformDescriptor
-//
-class TransformDescriptor : public ExecutableContainerDescriptor
-{
-public:
-
-    TransformDescriptor(const DescriptorPtr&, int, const TransformInfoIPtr&, const IceXML::Attributes&);
-
-    Slice::TypePtr type() const;
-    string typeName() const;
-    Slice::TypePtr renameType() const;
-    string renameTypeName() const;
-    bool doDefaultTransform() const;
-    bool doBaseTransform() const;
-
-private:
-
-    bool _default;
-    bool _base;
-    Slice::TypePtr _newType;
-    Slice::TypePtr _renameType;
-};
-typedef IceUtil::Handle<TransformDescriptor> TransformDescriptorPtr;
-
-//
-// InitDescriptor
-//
-class InitDescriptor : public ExecutableContainerDescriptor
-{
-public:
-
-    InitDescriptor(const DescriptorPtr&, int, const TransformInfoIPtr&, const IceXML::Attributes&);
-
-    void initialize(const DataPtr&);
-
-    string typeName() const;
-
-private:
-
-    Slice::TypePtr _type;
-};
-
-//
-// RecordDescriptor
-//
-class RecordDescriptor : public ExecutableContainerDescriptor
-{
-public:
-
-    RecordDescriptor(const DescriptorPtr&, int, const TransformInfoIPtr&, const IceXML::Attributes&);
-
-    virtual void execute(const SymbolTablePtr&);
-
-private:
-
-    void transformRecord(const Ice::ByteSeq&, const Ice::ByteSeq&, Ice::ByteSeq&, Ice::ByteSeq&);
-
-    Slice::UnitPtr _old;
-    Slice::UnitPtr _new;
-};
-typedef IceUtil::Handle<RecordDescriptor> RecordDescriptorPtr;
-
-//
-// DatabaseDescriptor
-//
-class DatabaseDescriptor : public ExecutableContainerDescriptor
-{
-public:
-
-    DatabaseDescriptor(const DescriptorPtr&, int, const TransformInfoIPtr&, const IceXML::Attributes&);
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void execute(const SymbolTablePtr&);
-
-    string name() const;
-
-private:
-
-    string _name;
-    string _oldKeyName;
-    string _oldValueName;
-    string _newKeyName;
-    string _newValueName;
-    RecordDescriptorPtr _record;
-};
-typedef IceUtil::Handle<DatabaseDescriptor> DatabaseDescriptorPtr;
-
-//
-// TransformDBDescriptor
-//
-class TransformDBDescriptor : public Descriptor
-{
-public:
-
-    TransformDBDescriptor(int, const TransformInfoIPtr&, const IceXML::Attributes&);
-    ~TransformDBDescriptor();
-
-    virtual void addChild(const DescriptorPtr&);
-    virtual void validate();
-    virtual void execute(const SymbolTablePtr&);
-
-private:
-
-    map<string, DatabaseDescriptorPtr> _databases;
-    vector<DescriptorPtr> _children;
-};
-typedef IceUtil::Handle<TransformDBDescriptor> TransformDBDescriptorPtr;
-
-//
-// SymbolTableI
-//
-class SymbolTableI : public SymbolTable
-{
-public:
-
-    SymbolTableI(const TransformInfoIPtr&, const SymbolTablePtr& = SymbolTablePtr());
-
-    virtual void add(const string&, const DataPtr&);
-
-    virtual DataPtr getValue(const EntityNodePtr&) const;
-
-    virtual DataPtr getConstantValue(const string&) const;
-
-    virtual SymbolTablePtr createChild();
-
-    virtual Slice::TypePtr lookupType(const string&);
-
-    virtual DataPtr invokeFunction(const string&, const DataPtr&, const DataList&);
-
-private:
-
-    DataPtr findValue(const string&) const;
-
-    class EntityVisitor : public EntityNodeVisitor
-    {
-    public:
-
-        EntityVisitor(SymbolTableI*);
-
-        virtual void visitIdentifier(const string&);
-        virtual void visitElement(const NodePtr&);
-
-        DataPtr getCurrent() const;
-
-    private:
-
-        SymbolTableI* _table;
-        DataPtr _current;
-        bool _error;
-    };
-
-    friend class EntityVisitor;
-
-    TransformInfoIPtr _info;
-    SymbolTablePtr _parent;
-    typedef map<string, DataPtr> DataMap;
-    DataMap _dataMap;
-    DataMap _constantCache;
-};
-typedef IceUtil::Handle<SymbolTableI> SymbolTableIPtr;
-
-//
-// ObjectVisitor
-//
-class ObjectVisitor : public DataVisitor
-{
-public:
-
-    ObjectVisitor(ObjectDataMap&);
-
-    virtual void visitStruct(const StructDataPtr&);
-    virtual void visitSequence(const SequenceDataPtr&);
-    virtual void visitDictionary(const DictionaryDataPtr&);
-    virtual void visitObject(const ObjectRefPtr&);
-
-private:
-
-    ObjectDataMap& _map;
-};
-
-//
-// DescriptorHandler
-//
-class DescriptorHandler : public IceXML::Handler
-{
-public:
-
-    DescriptorHandler(const TransformInfoIPtr&);
-
-    virtual void startElement(const string&, const IceXML::Attributes&, int, int);
-    virtual void endElement(const string&, int, int);
-    virtual void characters(const string&, int, int);
-    virtual void error(const string&, int, int);
-
-    TransformDBDescriptorPtr descriptor() const;
-
-private:
-
-    TransformInfoIPtr _info;
-    DescriptorPtr _current;
-    TransformDBDescriptorPtr _descriptor;
-};
-
-void assignOrTransform(const DataPtr&, const DataPtr&, bool, const TransformInfoPtr&);
-
-} // End of namespace FreezeScript
-
-//
-// TransformDataFactory
-//
-FreezeScript::TransformDataFactory::TransformDataFactory(const Ice::CommunicatorPtr& communicator,
-                                                         const Slice::UnitPtr& unit,
-                                                         const ErrorReporterPtr& errorReporter) :
-    DataFactory(communicator, unit, errorReporter), _enabled(true)
-{
-}
-
-void
-FreezeScript::TransformDataFactory::addInitDescriptor(const InitDescriptorPtr& init)
-{
-    string typeName = init->typeName();
-    assert(_initMap.find(typeName) == _initMap.end());
-    _initMap.insert(InitMap::value_type(typeName, init));
-}
-
-void
-FreezeScript::TransformDataFactory::initialize(const DataPtr& data)
-{
-    if(_enabled)
-    {
-        string typeName = typeToString(data->getType());
-        InitMap::iterator p = _initMap.find(typeName);
-        if(p != _initMap.end())
-        {
-            p->second->initialize(data);
-        }
-    }
-}
-
-void
-FreezeScript::TransformDataFactory::disableInitializers()
-{
-    _enabled = false;
-}
-
-void
-FreezeScript::TransformDataFactory::enableInitializers()
-{
-    _enabled = true;
-}
-
-//
-// Descriptor
-//
-FreezeScript::Descriptor::Descriptor(const DescriptorPtr& parent, int line, const TransformInfoIPtr& info) :
-    _parent(parent), _line(line), _info(info)
-{
-}
-
-FreezeScript::Descriptor::~Descriptor()
-{
-}
-
-FreezeScript::DescriptorPtr
-FreezeScript::Descriptor::parent() const
-{
-    return _parent;
-}
-
-FreezeScript::NodePtr
-FreezeScript::Descriptor::parse(const string& expr) const
-{
-    return parseExpression(expr, _info->factory, _info->errorReporter);
-}
-
-Slice::TypePtr
-FreezeScript::Descriptor::findType(const Slice::UnitPtr& u, const string& type)
-{
-    Slice::TypeList l;
-
-    l = u->lookupType(type, false);
-    if(l.empty())
-    {
-        _info->errorReporter->error("unknown type `" + type + "'");
-    }
-
-    return l.front();
-}
-
-//
-// SetDescriptor
-//
-FreezeScript::SetDescriptor::SetDescriptor(const DescriptorPtr& parent, int line, const TransformInfoIPtr& info,
-                                           const IceXML::Attributes& attributes) :
-    Descriptor(parent, line, info)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "set", _line);
-
-    IceXML::Attributes::const_iterator p;
-
-    string target;
-    p = attributes.find("target");
-    if(p == attributes.end())
-    {
-        _info->errorReporter->error("required attribute `target' is missing");
-    }
-    target = p->second;
-
-    p = attributes.find("value");
-    if(p != attributes.end())
-    {
-        _valueStr = p->second;
-    }
-
-    p = attributes.find("type");
-    if(p != attributes.end())
-    {
-        _type = p->second;
-    }
-
-    p = attributes.find("length");
-    if(p != attributes.end())
-    {
-        _lengthStr = p->second;
-    }
-
-    p = attributes.find("convert");
-    if(p != attributes.end())
-    {
-        _convert = p->second == "true";
-    }
-
-    if(!_valueStr.empty() && !_type.empty())
-    {
-        _info->errorReporter->error("attributes `value' and 'type' are mutually exclusive");
-    }
-
-    if(_valueStr.empty() && _type.empty() && _lengthStr.empty())
-    {
-        _info->errorReporter->error("requires a value for attributes `value', 'type' or 'length'");
-    }
-
-    NodePtr node = parse(target);
-    _target = EntityNodePtr::dynamicCast(node);
-    if(!_target)
-    {
-        _info->errorReporter->error("`target' attribute is not an entity: `" + target + "'");
-    }
-
-    if(!_valueStr.empty())
-    {
-        _value = parse(_valueStr);
-    }
-
-    if(!_lengthStr.empty())
-    {
-        _length = parse(_lengthStr);
-    }
-}
-
-void
-FreezeScript::SetDescriptor::addChild(const DescriptorPtr&)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "set", _line);
-    _info->errorReporter->error("child elements are not supported");
-}
-
-void
-FreezeScript::SetDescriptor::validate()
-{
-}
-
-void
-FreezeScript::SetDescriptor::execute(const SymbolTablePtr& sym)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "set", _line);
-
-    DataPtr data = sym->getValue(_target);
-    if(data->readOnly())
-    {
-        ostringstream ostr;
-        ostr << _target;
-        _info->errorReporter->error("target `" + ostr.str() + "' cannot be modified");
-    }
-
-    DataPtr value;
-    if(_value)
-    {
-        try
-        {
-            value = _value->evaluate(sym);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _info->errorReporter->error("evaluation of value `" + _valueStr + "' failed:\n" + ex.reason());
-        }
-    }
-
-    Destroyer<DataPtr> valueDestroyer;
-    if(!_type.empty())
-    {
-        assert(!value);
-        Slice::TypePtr type = sym->lookupType(_type);
-        if(!type)
-        {
-            _info->errorReporter->error("type `" + _type + "' not found");
-        }
-        value = _info->factory->createObject(type, false);
-        valueDestroyer.set(value);
-    }
-
-    DataPtr length;
-    if(_length)
-    {
-        SequenceDataPtr seq = SequenceDataPtr::dynamicCast(data);
-        if(!seq)
-        {
-            ostringstream ostr;
-            ostr << _target;
-            _info->errorReporter->error("target `" + ostr.str() + "' is not a sequence");
-        }
-
-        try
-        {
-            length = _length->evaluate(sym);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _info->errorReporter->error("evaluation of length `" + _lengthStr + "' failed:\n" + ex.reason());
-        }
-
-        DataList& elements = seq->getElements();
-        Ice::Long l = length->integerValue();
-        if(l < 0 || l > INT_MAX)
-        {
-            _info->errorReporter->error("sequence length " + length->toString() + " is out of range");
-        }
-
-        DataList::size_type len = static_cast<DataList::size_type>(l);
-        if(len < elements.size())
-        {
-            for(DataList::size_type i = len; i < elements.size(); ++i)
-            {
-                elements[i]->destroy();
-            }
-            elements.resize(len);
-        }
-        else if(len > elements.size())
-        {
-            Slice::SequencePtr seqType = Slice::SequencePtr::dynamicCast(seq->getType());
-            assert(seqType);
-            Slice::TypePtr elemType = seqType->type();
-            for(DataList::size_type i = elements.size(); i < len; ++i)
-            {
-                DataPtr v = _info->factory->create(elemType, false);
-                if(value)
-                {
-                    assignOrTransform(v, value, _convert, _info);
-                }
-                elements.push_back(v);
-            }
-        }
-    }
-    else
-    {
-        assignOrTransform(data, value, _convert, _info);
-    }
-}
-
-//
-// DefineDescriptor
-//
-FreezeScript::DefineDescriptor::DefineDescriptor(const DescriptorPtr& parent, int line, const TransformInfoIPtr& info,
-                                                 const IceXML::Attributes& attributes) :
-    Descriptor(parent, line, info)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "define", _line);
-
-    IceXML::Attributes::const_iterator p;
-
-    p = attributes.find("name");
-    if(p == attributes.end())
-    {
-        _info->errorReporter->error("required attribute `name' is missing");
-    }
-    _name = p->second;
-
-    p = attributes.find("type");
-    if(p == attributes.end())
-    {
-        _info->errorReporter->error("required attribute `type' is missing");
-    }
-    if(p->second.find("::New") != string::npos)
-    {
-        Slice::TypeList l = _info->newUnit->lookupType(p->second.substr(5), false);
-        if(l.empty())
-        {
-            _info->errorReporter->error("type `" + p->second + "' not found");
-        }
-        _type = l.front();
-    }
-    else if(p->second.find("::Old") != string::npos)
-    {
-        Slice::TypeList l = _info->oldUnit->lookupType(p->second.substr(5), false);
-        if(l.empty())
-        {
-            _info->errorReporter->error("type `" + p->second + "' not found");
-        }
-        _type = l.front();
-    }
-    else
-    {
-        Slice::TypeList l = _info->newUnit->lookupType(p->second, false);
-        if(l.empty())
-        {
-            _info->errorReporter->error("type `" + p->second + "' not found");
-        }
-        _type = l.front();
-    }
-
-    p = attributes.find("value");
-    if(p != attributes.end())
-    {
-        _valueStr = p->second;
-    }
-
-    p = attributes.find("convert");
-    if(p != attributes.end())
-    {
-        _convert = p->second == "true";
-    }
-
-    if(!_valueStr.empty())
-    {
-        _value = parse(_valueStr);
-    }
-}
-
-void
-FreezeScript::DefineDescriptor::addChild(const DescriptorPtr&)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "define", _line);
-    _info->errorReporter->error("child elements are not supported");
-}
-
-void
-FreezeScript::DefineDescriptor::validate()
-{
-}
-
-void
-FreezeScript::DefineDescriptor::execute(const SymbolTablePtr& sym)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "define", _line);
-
-    DataPtr data = _info->factory->create(_type, false);
-
-    DataPtr value;
-    if(_value)
-    {
-        try
-        {
-            value = _value->evaluate(sym);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _info->errorReporter->error("evaluation of value `" + _valueStr + "' failed:\n" + ex.reason());
-        }
-    }
-
-    if(value)
-    {
-        assignOrTransform(data, value, _convert, _info);
-    }
-
-    sym->add(_name, data);
-}
-
-//
-// AddDescriptor
-//
-FreezeScript::AddDescriptor::AddDescriptor(const DescriptorPtr& parent, int line, const TransformInfoIPtr& info,
-                                           const IceXML::Attributes& attributes) :
-    Descriptor(parent, line, info)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "add", _line);
-
-    IceXML::Attributes::const_iterator p;
-
-    string target;
-    p = attributes.find("target");
-    if(p == attributes.end())
-    {
-        _info->errorReporter->error("required attribute `target' is missing");
-    }
-    target = p->second;
-
-    p = attributes.find("key");
-    if(p != attributes.end())
-    {
-        _keyStr = p->second;
-    }
-
-    p = attributes.find("index");
-    if(p != attributes.end())
-    {
-        _indexStr = p->second;
-    }
-
-    p = attributes.find("value");
-    if(p != attributes.end())
-    {
-        _valueStr = p->second;
-    }
-
-    p = attributes.find("type");
-    if(p != attributes.end())
-    {
-        _type = p->second;
-    }
-
-    p = attributes.find("convert");
-    if(p != attributes.end())
-    {
-        _convert = p->second == "true";
-    }
-
-    if(!_keyStr.empty() && !_indexStr.empty())
-    {
-        _info->errorReporter->error("attributes `key' and `index' are mutually exclusive");
-    }
-
-    if(_keyStr.empty() && _indexStr.empty())
-    {
-        _info->errorReporter->error("one of attributes `key' or `index' is required");
-    }
-
-    if(!_valueStr.empty() && !_type.empty())
-    {
-        _info->errorReporter->error("attributes `value' and `type' are mutually exclusive");
-    }
-
-    NodePtr node = parse(target);
-    _target = EntityNodePtr::dynamicCast(node);
-    if(!_target)
-    {
-        _info->errorReporter->error("`target' attribute is not an entity: `" + target + "'");
-    }
-
-    if(!_keyStr.empty())
-    {
-        _key = parse(_keyStr);
-    }
-
-    if(!_indexStr.empty())
-    {
-        _index = parse(_indexStr);
-    }
-
-    if(!_valueStr.empty())
-    {
-        _value = parse(_valueStr);
-    }
-}
-
-void
-FreezeScript::AddDescriptor::addChild(const DescriptorPtr&)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "add", _line);
-    _info->errorReporter->error("child elements are not supported");
-}
-
-void
-FreezeScript::AddDescriptor::validate()
-{
-}
-
-void
-FreezeScript::AddDescriptor::execute(const SymbolTablePtr& sym)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "add", _line);
-
-    DataPtr data = sym->getValue(_target);
-    if(data->readOnly())
-    {
-        ostringstream ostr;
-        ostr << _target;
-        _info->errorReporter->error("target `" + ostr.str() + "' cannot be modified");
-    }
-
-    if(_key)
-    {
-        DictionaryDataPtr dict = DictionaryDataPtr::dynamicCast(data);
-        if(!dict)
-        {
-            ostringstream ostr;
-            ostr << _target;
-            _info->errorReporter->error("target `" + ostr.str() + "' is not a dictionary");
-        }
-
-        Slice::DictionaryPtr type = Slice::DictionaryPtr::dynamicCast(dict->getType());
-        assert(type);
-
-        DataPtr key;
-        Destroyer<DataPtr> keyDestroyer;
-        try
-        {
-            DataPtr v = _key->evaluate(sym);
-            key = _info->factory->create(type->keyType(), false);
-            keyDestroyer.set(key);
-            assignOrTransform(key, v, _convert, _info);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _info->errorReporter->error("evaluation of key `" + _keyStr + "' failed:\n" + ex.reason());
-        }
-
-        if(dict->getElement(key))
-        {
-            ostringstream ostr;
-            printData(key, ostr);
-            _info->errorReporter->error("key " + ostr.str() + " already exists in dictionary");
-        }
-
-        DataPtr elem = _info->factory->create(type->valueType(), false);
-        Destroyer<DataPtr> elemDestroyer(elem);
-
-        DataPtr value;
-        if(_value)
-        {
-            try
-            {
-                value = _value->evaluate(sym);
-            }
-            catch(const EvaluateException& ex)
-            {
-                _info->errorReporter->error("evaluation of value `" + _valueStr + "' failed:\n" + ex.reason());
-            }
-        }
-
-        Destroyer<DataPtr> valueDestroyer;
-        if(!_type.empty())
-        {
-            assert(!value);
-            Slice::TypePtr type = sym->lookupType(_type);
-            if(!type)
-            {
-                _info->errorReporter->error("type `" + _type + "' not found");
-            }
-            value = _info->factory->createObject(type, false);
-            valueDestroyer.set(value);
-        }
-
-        if(value)
-        {
-            assignOrTransform(elem, value, _convert, _info);
-        }
-        DataMap& map = dict->getElements();
-        map.insert(DataMap::value_type(key, elem));
-        keyDestroyer.release();
-        elemDestroyer.release();
-    }
-    else
-    {
-        assert(_index);
-
-        SequenceDataPtr seq = SequenceDataPtr::dynamicCast(data);
-        if(!seq)
-        {
-            ostringstream ostr;
-            ostr << _target;
-            _info->errorReporter->error("target `" + ostr.str() + "' is not a sequence");
-        }
-
-        Slice::SequencePtr type = Slice::SequencePtr::dynamicCast(seq->getType());
-        assert(type);
-
-        DataPtr index;
-        Destroyer<DataPtr> indexDestroyer;
-        try
-        {
-            index = _index->evaluate(sym);
-            indexDestroyer.set(index);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _info->errorReporter->error("evaluation of index `" + _indexStr + "' failed:\n" + ex.reason());
-        }
-
-        DataList& elements = seq->getElements();
-        Ice::Long l = index->integerValue();
-        DataList::size_type i = static_cast<DataList::size_type>(l);
-        if(l < 0 || l > INT_MAX || i > elements.size())
-        {
-            _info->errorReporter->error("sequence index " + index->toString() + " is out of range");
-        }
-
-        DataPtr elem = _info->factory->create(type->type(), false);
-        Destroyer<DataPtr> elemDestroyer(elem);
-
-        DataPtr value;
-        if(_value)
-        {
-            try
-            {
-                value = _value->evaluate(sym);
-            }
-            catch(const EvaluateException& ex)
-            {
-                _info->errorReporter->error("evaluation of value `" + _valueStr + "' failed:\n" + ex.reason());
-            }
-        }
-
-        Destroyer<DataPtr> valueDestroyer;
-        if(!_type.empty())
-        {
-            assert(!value);
-            Slice::TypePtr type = sym->lookupType(_type);
-            if(!type)
-            {
-                _info->errorReporter->error("type `" + _type + "' not found");
-            }
-            value = _info->factory->createObject(type, false);
-            valueDestroyer.set(value);
-        }
-
-        if(value)
-        {
-            assignOrTransform(elem, value, _convert, _info);
-        }
-
-        elements.insert(elements.begin() + i, elem);
-        indexDestroyer.release();
-        elemDestroyer.release();
-    }
-}
-
-//
-// RemoveDescriptor
-//
-FreezeScript::RemoveDescriptor::RemoveDescriptor(const DescriptorPtr& parent, int line, const TransformInfoIPtr& info,
-                                                 const IceXML::Attributes& attributes) :
-    Descriptor(parent, line, info)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "remove", _line);
-
-    IceXML::Attributes::const_iterator p;
-
-    string target;
-    p = attributes.find("target");
-    if(p == attributes.end())
-    {
-        _info->errorReporter->error("required attribute `target' is missing");
-    }
-    target = p->second;
-
-    p = attributes.find("key");
-    if(p != attributes.end())
-    {
-        _keyStr = p->second;
-    }
-
-    p = attributes.find("index");
-    if(p != attributes.end())
-    {
-        _indexStr = p->second;
-    }
-
-    NodePtr node = parse(target);
-    _target = EntityNodePtr::dynamicCast(node);
-    if(!_target)
-    {
-        _info->errorReporter->error("`target' attribute is not an entity: `" + target + "'");
-    }
-
-    if(!_keyStr.empty() && !_indexStr.empty())
-    {
-        _info->errorReporter->error("attributes `key' and `index' are mutually exclusive");
-    }
-
-    if(_keyStr.empty() && _indexStr.empty())
-    {
-        _info->errorReporter->error("one of attributes `key' or `index' is required");
-    }
-
-    if(!_keyStr.empty())
-    {
-        _key = parse(_keyStr);
-    }
-
-    if(!_indexStr.empty())
-    {
-        _index = parse(_indexStr);
-    }
-}
-
-void
-FreezeScript::RemoveDescriptor::addChild(const DescriptorPtr&)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "remove", _line);
-    _info->errorReporter->error("child elements are not supported");
-}
-
-void
-FreezeScript::RemoveDescriptor::validate()
-{
-}
-
-void
-FreezeScript::RemoveDescriptor::execute(const SymbolTablePtr& sym)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "remove", _line);
-
-    DataPtr data = sym->getValue(_target);
-    if(data->readOnly())
-    {
-        ostringstream ostr;
-        ostr << _target;
-        _info->errorReporter->error("target `" + ostr.str() + "' cannot be modified");
-    }
-
-    if(_key)
-    {
-        DataPtr key;
-        try
-        {
-            key = _key->evaluate(sym);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _info->errorReporter->error("evaluation of key `" + _keyStr + "' failed:\n" + ex.reason());
-        }
-
-        DictionaryDataPtr dict = DictionaryDataPtr::dynamicCast(data);
-        if(!dict)
-        {
-            ostringstream ostr;
-            ostr << _target;
-            _info->errorReporter->error("target `" + ostr.str() + "' is not a dictionary");
-        }
-
-        DataMap& map = dict->getElements();
-        DataMap::iterator p = map.find(key);
-        if(p != map.end())
-        {
-            p->first->destroy();
-            p->second->destroy();
-            map.erase(p);
-        }
-    }
-    else
-    {
-        assert(_index);
-
-        DataPtr index;
-        try
-        {
-            index = _index->evaluate(sym);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _info->errorReporter->error("evaluation of index `" + _indexStr + "' failed:\n" + ex.reason());
-        }
-
-        SequenceDataPtr seq = SequenceDataPtr::dynamicCast(data);
-        if(!seq)
-        {
-            ostringstream ostr;
-            ostr << _target;
-            _info->errorReporter->error("target `" + ostr.str() + "' is not a sequence");
-        }
-
-        DataList& elements = seq->getElements();
-        Ice::Long l = index->integerValue();
-        DataList::size_type i = static_cast<DataList::size_type>(l);
-        if(l < 0 || l > INT_MAX || i >= elements.size())
-        {
-            _info->errorReporter->error("sequence index " + index->toString() + " is out of range");
-        }
-
-        elements[i]->destroy();
-        elements.erase(elements.begin() + i);
-    }
-}
-
-//
-// DeleteDescriptor
-//
-FreezeScript::DeleteDescriptor::DeleteDescriptor(const DescriptorPtr& parent, int line, const TransformInfoIPtr& info,
-                                                 const IceXML::Attributes&) :
-    Descriptor(parent, line, info)
-{
-}
-
-void
-FreezeScript::DeleteDescriptor::addChild(const DescriptorPtr&)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "delete", _line);
-    _info->errorReporter->error("child elements are not supported");
-}
-
-void
-FreezeScript::DeleteDescriptor::validate()
-{
-}
-
-void
-FreezeScript::DeleteDescriptor::execute(const SymbolTablePtr&)
-{
-    throw DeleteRecordException();
-}
-
-//
-// FailDescriptor
-//
-FreezeScript::FailDescriptor::FailDescriptor(const DescriptorPtr& parent, int line, const TransformInfoIPtr& info,
-                                             const IceXML::Attributes& attributes) :
-    Descriptor(parent, line, info)
-{
-    IceXML::Attributes::const_iterator p;
-
-    p = attributes.find("test");
-    if(p != attributes.end())
-    {
-        _testStr = p->second;
-    }
-
-    p = attributes.find("message");
-    if(p != attributes.end())
-    {
-        _message = p->second;
-    }
-
-    if(!_testStr.empty())
-    {
-        _test = parse(_testStr);
-    }
-
-    if(_message.empty())
-    {
-        ostringstream ostr;
-        ostr << "<fail> executed at line " << line << endl;
-        _message = ostr.str();
-    }
-}
-
-void
-FreezeScript::FailDescriptor::addChild(const DescriptorPtr&)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "fail", _line);
-    _info->errorReporter->error("child elements are not supported");
-}
-
-void
-FreezeScript::FailDescriptor::validate()
-{
-}
-
-void
-FreezeScript::FailDescriptor::execute(const SymbolTablePtr& sym)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "fail", _line);
-
-    if(_test)
-    {
-        try
-        {
-            DataPtr b = _test->evaluate(sym);
-            BooleanDataPtr bd = BooleanDataPtr::dynamicCast(b);
-            if(!bd)
-            {
-                _info->errorReporter->error("expression `" + _testStr + "' does not evaluate to a boolean");
-            }
-            if(!bd->booleanValue())
-            {
-                return;
-            }
-        }
-        catch(const EvaluateException& ex)
-        {
-            _info->errorReporter->error("evaluation of expression `" + _testStr + "' failed:\n" + ex.reason());
-        }
-    }
-
-    throw FailureException(__FILE__, __LINE__, _message);
-}
-
-//
-// EchoDescriptor
-//
-FreezeScript::EchoDescriptor::EchoDescriptor(const DescriptorPtr& parent, int line, const TransformInfoIPtr& info,
-                                             const IceXML::Attributes& attributes) :
-    Descriptor(parent, line, info)
-{
-    IceXML::Attributes::const_iterator p;
-
-    p = attributes.find("message");
-    if(p != attributes.end())
-    {
-        _message = p->second;
-    }
-
-    p = attributes.find("value");
-    if(p != attributes.end())
-    {
-        _valueStr = p->second;
-    }
-
-    if(!_valueStr.empty())
-    {
-        _value = parse(_valueStr);
-    }
-}
-
-void
-FreezeScript::EchoDescriptor::addChild(const DescriptorPtr&)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "echo", _line);
-    _info->errorReporter->error("child elements are not supported");
-}
-
-void
-FreezeScript::EchoDescriptor::validate()
-{
-}
-
-void
-FreezeScript::EchoDescriptor::execute(const SymbolTablePtr& sym)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "echo", _line);
-
-    ostream& out = _info->errorReporter->stream();
-
-    if(!_message.empty())
-    {
-        out << _message;
-    }
-
-    if(_value)
-    {
-        DataPtr v;
-        try
-        {
-            v = _value->evaluate(sym);
-        }
-        catch(const EvaluateException& ex)
-        {
-            _info->errorReporter->error("evaluation of value `" + _valueStr + "' failed:\n" + ex.reason());
-        }
-        printData(v, out);
-    }
-
-    out << endl;
-}
-
-//
-// ExecutableContainerDescriptor
-//
-FreezeScript::ExecutableContainerDescriptor::ExecutableContainerDescriptor(const DescriptorPtr& parent, int line,
-                                                                           const TransformInfoIPtr& info,
-                                                                           const IceXML::Attributes&,
-                                                                           const string& name) :
-    Descriptor(parent, line, info), _name(name)
-{
-}
-
-void
-FreezeScript::ExecutableContainerDescriptor::addChild(const DescriptorPtr& child)
-{
-    _children.push_back(child);
-}
-
-void
-FreezeScript::ExecutableContainerDescriptor::validate()
-{
-    for(vector<DescriptorPtr>::iterator p = _children.begin(); p != _children.end(); ++p)
-    {
-        (*p)->validate();
-    }
-}
-
-void
-FreezeScript::ExecutableContainerDescriptor::execute(const SymbolTablePtr& sym)
-{
-    for(vector<DescriptorPtr>::iterator p = _children.begin(); p != _children.end(); ++p)
-    {
-        (*p)->execute(sym);
-    }
-}
-
-//
-// IfDescriptor
-//
-FreezeScript::IfDescriptor::IfDescriptor(const DescriptorPtr& parent, int line, const TransformInfoIPtr& info,
-                                         const IceXML::Attributes& attributes) :
-    ExecutableContainerDescriptor(parent, line, info, attributes, "if")
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "if", _line);
-
-    IceXML::Attributes::const_iterator p = attributes.find("test");
-    if(p == attributes.end())
-    {
-        _info->errorReporter->error("required attribute `test' is missing");
-    }
-    _testStr = p->second;
-
-    _test = parse(_testStr);
-}
-
-void
-FreezeScript::IfDescriptor::execute(const SymbolTablePtr& sym)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "if", _line);
-
-    try
-    {
-        DataPtr b = _test->evaluate(sym);
-        BooleanDataPtr bd = BooleanDataPtr::dynamicCast(b);
-        if(!bd)
-        {
-            _info->errorReporter->error("expression `" + _testStr + "' does not evaluate to a boolean");
-        }
-        if(bd->booleanValue())
-        {
-            ExecutableContainerDescriptor::execute(sym);
-        }
-    }
-    catch(const EvaluateException& ex)
-    {
-        _info->errorReporter->error("evaluation of conditional expression `" + _testStr + "' failed:\n" + ex.reason());
-    }
-}
-
-//
-// IterateDescriptor
-//
-FreezeScript::IterateDescriptor::IterateDescriptor(const DescriptorPtr& parent, int line,
-                                                   const TransformInfoIPtr& info,
-                                                   const IceXML::Attributes& attributes) :
-    ExecutableContainerDescriptor(parent, line, info, attributes, "iterate")
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "iterate", _line);
-
-    IceXML::Attributes::const_iterator p;
-    string target;
-
-    p = attributes.find("target");
-    if(p == attributes.end())
-    {
-        _info->errorReporter->error("required attribute `target' is missing");
-    }
-    target = p->second;
-
-    p = attributes.find("key");
-    if(p != attributes.end())
-    {
-        _key = p->second;
-    }
-
-    p = attributes.find("value");
-    if(p != attributes.end())
-    {
-        _value = p->second;
-    }
-
-    p = attributes.find("element");
-    if(p != attributes.end())
-    {
-        _element = p->second;
-    }
-
-    p = attributes.find("index");
-    if(p != attributes.end())
-    {
-        _index = p->second;
-    }
-
-    NodePtr node = parse(target);
-    _target = EntityNodePtr::dynamicCast(node);
-    if(!_target)
-    {
-        _info->errorReporter->error("`target' attribute is not an entity: `" + target + "'");
-    }
-}
-
-void
-FreezeScript::IterateDescriptor::execute(const SymbolTablePtr& sym)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "iterate", _line);
-
-    DataPtr data = sym->getValue(_target);
-
-    DictionaryDataPtr dict = DictionaryDataPtr::dynamicCast(data);
-    SequenceDataPtr seq = SequenceDataPtr::dynamicCast(data);
-    if(!dict && !seq)
-    {
-        ostringstream ostr;
-        ostr << _target;
-        _info->errorReporter->error("target `" + ostr.str() + "' is not a dictionary or sequence");
-    }
-
-    if(dict)
-    {
-        if(!_element.empty())
-        {
-            _info->errorReporter->error("attribute `element' specified for dictionary target");
-        }
-        if(!_index.empty())
-        {
-            _info->errorReporter->error("attribute `index' specified for dictionary target");
-        }
-
-        string key = _key;
-        if(key.empty())
-        {
-            key = "key";
-        }
-
-        string value = _value;
-        if(value.empty())
-        {
-            value = "value";
-        }
-
-        DataMap& map = dict->getElements();
-        for(DataMap::iterator p = map.begin(); p != map.end(); ++p)
-        {
-            SymbolTablePtr elemSym = sym->createChild();
-            elemSym->add(key, p->first);
-            elemSym->add(value, p->second);
-            ExecutableContainerDescriptor::execute(elemSym);
-        }
-    }
-    else
-    {
-        if(!_key.empty())
-        {
-            _info->errorReporter->error("attribute `key' specified for sequence target");
-        }
-        if(!_value.empty())
-        {
-            _info->errorReporter->error("attribute `value' specified for sequence target");
-        }
-
-        string element = _element;
-        if(element.empty())
-        {
-            element = "elem";
-        }
-
-        string index = _index;
-        if(index.empty())
-        {
-            index = "i";
-        }
-
-        //
-        // NOTE: Don't use iterator to traverse vector because child descriptors might remove elements.
-        //
-        DataList& l = seq->getElements();
-        DataList::size_type i = 0;
-        while(i < l.size())
-        {
-            SymbolTablePtr elemSym = sym->createChild();
-            elemSym->add(element, l[i]);
-            elemSym->add(index, _info->factory->createInteger(i, true));
-            ExecutableContainerDescriptor::execute(elemSym);
-            ++i;
-        }
-    }
-}
-
-//
-// TransformDescriptor
-//
-FreezeScript::TransformDescriptor::TransformDescriptor(const DescriptorPtr& parent, int line,
-                                                       const TransformInfoIPtr& info,
-                                                       const IceXML::Attributes& attributes) :
-    ExecutableContainerDescriptor(parent, line, info, attributes, "transform"), _default(true), _base(true)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "transform", _line);
-
-    IceXML::Attributes::const_iterator p;
-
-    string type, rename;
-
-    p = attributes.find("type");
-    if(p == attributes.end())
-    {
-        _info->errorReporter->error("required attribute `type' is missing");
-    }
-    type = p->second;
-
-    p = attributes.find("default");
-    if(p != attributes.end())
-    {
-        if(p->second == "false")
-        {
-            _default = false;
-        }
-    }
-
-    p = attributes.find("base");
-    if(p != attributes.end())
-    {
-        if(p->second == "false")
-        {
-            _base = false;
-        }
-    }
-
-    p = attributes.find("rename");
-    if(p != attributes.end())
-    {
-        rename = p->second;
-    }
-
-    Slice::TypeList l;
-
-    l = _info->newUnit->lookupType(type, false);
-    if(l.empty())
-    {
-        _info->errorReporter->error("unable to find type `" + type + "' in new Slice definitions");
-    }
-    else
-    {
-        _newType = l.front();
-    }
-
-    if(!rename.empty())
-    {
-        l = _info->oldUnit->lookupType(rename, false);
-        if(l.empty())
-        {
-            _info->errorReporter->error("unable to find type `" + rename + "' in old Slice definitions");
-        }
-        _renameType = l.front();
-    }
-}
-
-Slice::TypePtr
-FreezeScript::TransformDescriptor::type() const
-{
-    return _newType;
-}
-
-string
-FreezeScript::TransformDescriptor::typeName() const
-{
-    return typeToString(_newType);
-}
-
-Slice::TypePtr
-FreezeScript::TransformDescriptor::renameType() const
-{
-    return _renameType;
-}
-
-string
-FreezeScript::TransformDescriptor::renameTypeName() const
-{
-    string result;
-    if(_renameType)
-    {
-        result = typeToString(_renameType);
-    }
-    return result;
-}
-
-bool
-FreezeScript::TransformDescriptor::doDefaultTransform() const
-{
-    return _default;
-}
-
-bool
-FreezeScript::TransformDescriptor::doBaseTransform() const
-{
-    return _base;
-}
-
-//
-// InitDescriptor
-//
-FreezeScript::InitDescriptor::InitDescriptor(const DescriptorPtr& parent, int line, const TransformInfoIPtr& info,
-                                             const IceXML::Attributes& attributes) :
-    ExecutableContainerDescriptor(parent, line, info, attributes, "init")
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "init", _line);
-
-    IceXML::Attributes::const_iterator p = attributes.find("type");
-
-    string type;
-
-    if(p == attributes.end())
-    {
-        _info->errorReporter->error("required attribute `type' is missing");
-    }
-    type = p->second;
-
-    Slice::TypeList l = _info->newUnit->lookupType(type, false);
-    if(l.empty())
-    {
-        _info->errorReporter->error("unable to find type `" + type + "' in new Slice definitions");
-    }
-    else
-    {
-        _type = l.front();
-    }
-}
-
-void
-FreezeScript::InitDescriptor::initialize(const DataPtr& data)
-{
-    SymbolTablePtr sym = new SymbolTableI(_info, _info->symbolTable);
-    sym->add("value", data);
-    execute(sym);
-}
-
-string
-FreezeScript::InitDescriptor::typeName() const
-{
-    return typeToString(_type);
-}
-
-//
-// RecordDescriptor
-//
-FreezeScript::RecordDescriptor::RecordDescriptor(const DescriptorPtr& parent, int line, const TransformInfoIPtr& info,
-                                                 const IceXML::Attributes& attributes) :
-    ExecutableContainerDescriptor(parent, line, info, attributes, "record")
-{
-}
-
-void
-FreezeScript::RecordDescriptor::execute(const SymbolTablePtr& /*sym*/)
-{
-    //
-    // Temporarily add an object factory.
-    //
-    _info->objectFactory->activate(_info->factory, _info->oldUnit);
-
-    //
-    // Iterate over the database.
-    //
-    Dbc* dbc = 0;
-    _info->oldDb->cursor(0, &dbc, 0);
-    try
-    {
-        Dbt dbKey, dbValue;
-        while(dbc->get(&dbKey, &dbValue, DB_NEXT) == 0)
-        {
-            Ice::ByteSeq inKeyBytes;
-            inKeyBytes.resize(dbKey.get_size());
-            memcpy(&inKeyBytes[0], dbKey.get_data(), dbKey.get_size());
-
-            Ice::ByteSeq inValueBytes;
-            inValueBytes.resize(dbValue.get_size());
-            memcpy(&inValueBytes[0], dbValue.get_data(), dbValue.get_size());
-
-            try
-            {
-                Ice::ByteSeq outKeyBytes, outValueBytes;
-                transformRecord(inKeyBytes, inValueBytes, outKeyBytes, outValueBytes);
-                Dbt dbNewKey(&outKeyBytes[0], static_cast<unsigned>(outKeyBytes.size())),
-                             dbNewValue(&outValueBytes[0], static_cast<unsigned>(outValueBytes.size()));
-                if(_info->newDb->put(_info->newDbTxn, &dbNewKey, &dbNewValue, DB_NOOVERWRITE) == DB_KEYEXIST)
-                {
-                    _info->errorReporter->error("duplicate key encountered");
-                }
-            }
-            catch(const DeleteRecordException&)
-            {
-                // The record is deleted simply by not adding it to the new database.
-            }
-            catch(const ClassNotFoundException& ex)
-            {
-                if(!_info->purge)
-                {
-                    _info->errorReporter->error("class " + ex.id + " not found in new Slice definitions");
-                }
-                else
-                {
-                    // The record is deleted simply by not adding it to the new database.
-                    _info->errorReporter->warning("purging database record due to missing class type " + ex.id);
-                }
-            }
-        }
-    }
-    catch(...)
-    {
-        if(dbc)
-        {
-            dbc->close();
-        }
-        _info->objectFactory->deactivate();
-        throw;
-    }
-
-    if(dbc)
-    {
-        dbc->close();
-    }
-    _info->objectFactory->deactivate();
-}
-
-void
-FreezeScript::RecordDescriptor::transformRecord(const Ice::ByteSeq& inKeyBytes,
-                                                const Ice::ByteSeq& inValueBytes,
-                                                Ice::ByteSeq& outKeyBytes,
-                                                Ice::ByteSeq& outValueBytes)
-{
-    Ice::InputStreamPtr inKey = Ice::wrapInputStream(_info->communicator, inKeyBytes);
-    Ice::InputStreamPtr inValue = Ice::wrapInputStream(_info->communicator, inValueBytes);
-    inValue->startEncapsulation();
-
-    Ice::OutputStreamPtr outKey = Ice::createOutputStream(_info->communicator);
-    Ice::OutputStreamPtr outValue = Ice::createOutputStream(_info->communicator);
-    outValue->startEncapsulation();
-
-    //
-    // Create data representations of the old key and value types.
-    //
-    _info->factory->disableInitializers();
-    DataPtr oldKeyData = _info->factory->create(_info->oldKeyType, true);
-    Destroyer<DataPtr> oldKeyDataDestroyer(oldKeyData);
-    DataPtr oldValueData = _info->factory->create(_info->oldValueType, true);
-    Destroyer<DataPtr> oldValueDataDestroyer(oldValueData);
-
-    //
-    // Unmarshal the old key and value.
-    //
-    oldKeyData->unmarshal(inKey);
-    oldValueData->unmarshal(inValue);
-    _info->objectDataMap.clear();
-    if(_info->oldValueType->usesClasses())
-    {
-        inValue->readPendingObjects();
-        ObjectVisitor visitor(_info->objectDataMap);
-        oldValueData->visit(visitor);
-    }
-    _info->factory->enableInitializers();
-
-    //
-    // Create data representations of the new key and value types.
-    //
-    DataPtr newKeyData = _info->factory->create(_info->newKeyType, false);
-    Destroyer<DataPtr> newKeyDataDestroyer(newKeyData);
-    DataPtr newValueData = _info->factory->create(_info->newValueType, false);
-    Destroyer<DataPtr> newValueDataDestroyer(newValueData);
-    DataPtr facetData = _info->factory->createString(_info->facet, true);
-    Destroyer<DataPtr> facetDataDestroyer(facetData);
-
-    //
-    // Copy the data from the old key and value to the new key and value, if possible.
-    //
-    TransformVisitor keyVisitor(oldKeyData, _info);
-    newKeyData->visit(keyVisitor);
-    TransformVisitor valueVisitor(oldValueData, _info);
-    newValueData->visit(valueVisitor);
-
-    if(!_children.empty())
-    {
-        //
-        // Execute the child descriptors.
-        //
-        // TODO: Revisit identifiers.
-        //
-        SymbolTablePtr st = new SymbolTableI(_info, _info->symbolTable);
-        st->add("oldkey", oldKeyData);
-        st->add("newkey", newKeyData);
-        st->add("oldvalue", oldValueData);
-        st->add("newvalue", newValueData);
-        st->add("facet", facetData);
-        ExecutableContainerDescriptor::execute(st);
-    }
-
-    newKeyData->marshal(outKey);
-    newValueData->marshal(outValue);
-
-    outKey->finished(outKeyBytes);
-
-    if(_info->newValueType->usesClasses())
-    {
-        outValue->writePendingObjects();
-    }
-    outValue->endEncapsulation();
-    outValue->finished(outValueBytes);
-}
-
-//
-// DatabaseDescriptor
-//
-FreezeScript::DatabaseDescriptor::DatabaseDescriptor(const DescriptorPtr& parent, int line,
-                                                     const TransformInfoIPtr& info,
-                                                     const IceXML::Attributes& attributes) :
-    ExecutableContainerDescriptor(parent, line, info, attributes, "database")
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "database", _line);
-
-    IceXML::Attributes::const_iterator p;
-
-    p = attributes.find("name");
-    if(p != attributes.end())
-    {
-        _name = p->second;
-    }
-
-    p = attributes.find("key");
-    if(p == attributes.end())
-    {
-        _info->errorReporter->error("required attribute `key' is missing");
-    }
-    string keyTypes = p->second;
-
-    p = attributes.find("value");
-    if(p == attributes.end())
-    {
-        _info->errorReporter->error("required attribute `value' is missing");
-    }
-    string valueTypes = p->second;
-
-    string::size_type pos;
-
-    pos = keyTypes.find(',');
-    if(pos == 0 || pos == keyTypes.size())
-    {
-        _info->errorReporter->error("invalid key type specification `" + keyTypes +"'");
-    }
-    if(pos == string::npos)
-    {
-        _oldKeyName = keyTypes;
-        _newKeyName = keyTypes;
-    }
-    else
-    {
-        _oldKeyName = keyTypes.substr(0, pos);
-        _newKeyName = keyTypes.substr(pos + 1);
-    }
-
-    pos = valueTypes.find(',');
-    if(pos == 0 || pos == valueTypes.size())
-    {
-        _info->errorReporter->error("invalid value type specification `" + valueTypes +"'");
-    }
-    if(pos == string::npos)
-    {
-        _oldValueName = valueTypes;
-        _newValueName = valueTypes;
-    }
-    else
-    {
-        _oldValueName = valueTypes.substr(0, pos);
-        _newValueName = valueTypes.substr(pos + 1);
-    }
-}
-
-void
-FreezeScript::DatabaseDescriptor::addChild(const DescriptorPtr& child)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "database", _line);
-
-    RecordDescriptorPtr rec = RecordDescriptorPtr::dynamicCast(child);
-    if(rec)
-    {
-        if(_record)
-        {
-            _info->errorReporter->error("only one <record> element can be specified");
-        }
-        _record = rec;
-    }
-
-    ExecutableContainerDescriptor::addChild(child);
-}
-
-void
-FreezeScript::DatabaseDescriptor::execute(const SymbolTablePtr& st)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "database", _line);
-
-    //
-    // Look up the Slice definitions for the key and value types.
-    //
-    _info->oldKeyType = findType(_info->oldUnit, _oldKeyName);
-    _info->newKeyType = findType(_info->newUnit, _newKeyName);
-    _info->oldValueType = findType(_info->oldUnit, _oldValueName);
-    _info->newValueType = findType(_info->newUnit, _newValueName);
-
-    if(_info->connection != 0)
-    {
-        Freeze::Catalog catalog(_info->connection, Freeze::catalogName());
-        Freeze::CatalogData catalogData;
-        catalogData.evictor = false;
-        catalogData.key = _info->newKeyType->typeId(); 
-        catalogData.value = _info->newValueType->typeId();
-        catalog.put(Freeze::Catalog::value_type(_info->newDbName, catalogData));
-    }
-
-    //
-    // TODO: it looks like _info is not destroyed before the new dbEnv is closed.
-    //
-    _info->connection = 0;
-
-    ExecutableContainerDescriptor::execute(st);
-}
-
-string
-FreezeScript::DatabaseDescriptor::name() const
-{
-    return _name;
-}
-
-//
-// TransformDBDescriptor
-//
-FreezeScript::TransformDBDescriptor::TransformDBDescriptor(int line, const TransformInfoIPtr& info,
-                                                           const IceXML::Attributes&) :
-    Descriptor(0, line, info)
-{
-}
-
-FreezeScript::TransformDBDescriptor::~TransformDBDescriptor()
-{
-}
-
-void
-FreezeScript::TransformDBDescriptor::addChild(const DescriptorPtr& child)
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "transformdb", _line);
-
-    DatabaseDescriptorPtr db = DatabaseDescriptorPtr::dynamicCast(child);
-    TransformDescriptorPtr transform = TransformDescriptorPtr::dynamicCast(child);
-    InitDescriptorPtr init = InitDescriptorPtr::dynamicCast(child);
-
-    if(db)
-    {
-        string name = db->name();
-        map<string, DatabaseDescriptorPtr>::iterator p = _databases.find(name);
-        if(p != _databases.end())
-        {
-            if(name.empty())
-            {
-                _info->errorReporter->error("duplicate <database> element");
-            }
-            else
-            {
-                _info->errorReporter->error(string("duplicate <database> element for ") + name);
-            }
-        }
-        else
-        {
-            _databases[name] = db;
-            _children.push_back(db);
-        }
-    }
-    else if(transform)
-    {
-        string name = transform->typeName();
-        TransformMap::iterator p = _info->transformMap.find(name);
-        if(p != _info->transformMap.end())
-        {
-            _info->errorReporter->error("transform `" + name + "' specified more than once");
-        }
-        _info->transformMap.insert(TransformMap::value_type(name, transform));
-
-        string renameTypeName = transform->renameTypeName();
-        if(!renameTypeName.empty())
-        {
-            RenameMap::iterator q = _info->renameMap.find(renameTypeName);
-            if(q != _info->renameMap.end())
-            {
-                _info->errorReporter->error("multiple transform descriptors specify the rename value `" +
-                                            renameTypeName + "'");
-            }
-            _info->renameMap.insert(RenameMap::value_type(renameTypeName, transform->type()));
-        }
-
-        _children.push_back(transform);
-    }
-    else if(init)
-    {
-        _info->factory->addInitDescriptor(init);
-        _children.push_back(init);
-    }
-    else
-    {
-        _info->errorReporter->error("invalid child element");
-    }
-}
-
-void
-FreezeScript::TransformDBDescriptor::validate()
-{
-    DescriptorErrorContext ctx(_info->errorReporter, "transformdb", _line);
-
-    if(_databases.empty())
-    {
-        _info->errorReporter->error("no <database> element defined");
-    }
-
-    for(vector<DescriptorPtr>::iterator p = _children.begin(); p != _children.end(); ++p)
-    {
-        (*p)->validate();
-    }
-}
-
-void
-FreezeScript::TransformDBDescriptor::execute(const SymbolTablePtr& sym)
-{
-    map<string, DatabaseDescriptorPtr>::iterator p = _databases.find(_info->newDbName);
-    if(p == _databases.end())
-    {
-        p = _databases.find("");
-    }
-
-    if(p == _databases.end())
-    {
-        _info->errorReporter->error("no <database> element found for `" + _info->newDbName + "'");
-    }
-
-    p->second->execute(sym);
-}
-
-//
-// SymbolTableI
-//
-FreezeScript::SymbolTableI::SymbolTableI(const TransformInfoIPtr& info, const SymbolTablePtr& parent) :
-    _info(info), _parent(parent)
-{
-}
-
-void
-FreezeScript::SymbolTableI::add(const string& name, const DataPtr& data)
-{
-    DataMap::const_iterator p = _dataMap.find(name);
-    if(p != _dataMap.end())
-    {
-        _info->errorReporter->error("`" + name + "' is already defined");
-    }
-
-    _dataMap.insert(DataMap::value_type(name, data));
-}
-
-FreezeScript::DataPtr
-FreezeScript::SymbolTableI::getValue(const EntityNodePtr& entity) const
-{
-    EntityVisitor visitor(const_cast<SymbolTableI*>(this));
-    entity->visit(visitor);
-    DataPtr result = visitor.getCurrent();
-    if(!result)
-    {
-        ostringstream ostr;
-        ostr << "invalid entity `" << entity << "'";
-        _info->errorReporter->error(ostr.str());
-    }
-
-    return result;
-}
-
-FreezeScript::DataPtr
-FreezeScript::SymbolTableI::getConstantValue(const string& name) const
-{
-    string::size_type pos;
-    Slice::UnitPtr unit;
-    string key;
-
-    DataMap::const_iterator p = _constantCache.find(name);
-    if(p != _constantCache.end())
-    {
-        return p->second;
-    }
-
-    if(_parent)
-    {
-        return _parent->getConstantValue(name);
-    }
-
-    //
-    // Name must start with "::Old" or "::New" to indicate the Slice unit.
-    //
-    pos = name.find("::Old");
-    if(pos == 0)
-    {
-        if(name.length() > 5)
-        {
-            key = name.substr(5);
-            unit = _info->oldUnit;
-        }
-    }
-    else
-    {
-        pos = name.find("::New");
-        if(pos == 0)
-        {
-            if(name.length() > 5)
-            {
-                key = name.substr(5);
-                unit = _info->newUnit;
-            }
-        }
-    }
-
-    if(key.empty())
-    {
-        _info->errorReporter->error("invalid constant name `" + name + "'");
-    }
-
-    Slice::ContainedList l = unit->findContents(key);
-    if(l.empty())
-    {
-        _info->errorReporter->error("unknown constant `" + name + "'");
-    }
-
-    Slice::EnumeratorPtr e = Slice::EnumeratorPtr::dynamicCast(l.front());
-    Slice::ConstPtr c = Slice::ConstPtr::dynamicCast(l.front());
-    if(!e && !c)
-    {
-        _info->errorReporter->error("`" + name + "' does not refer to a Slice constant or enumerator");
-    }
-
-    DataPtr result;
-
-    if(c)
-    {
-        Slice::TypePtr type = c->type();
-        string value = c->value();
-        Slice::BuiltinPtr b = Slice::BuiltinPtr::dynamicCast(type);
-        if(b)
-        {
-            switch(b->kind())
-            {
-            case Slice::Builtin::KindByte:
-            case Slice::Builtin::KindShort:
-            case Slice::Builtin::KindInt:
-            case Slice::Builtin::KindLong:
-            {
-                Ice::Long n;
-                if(!IceUtilInternal::stringToInt64(value, n))
-                {
-                    assert(false);
-                }
-                result = _info->factory->createInteger(n, true);
-                break;
-            }
-
-            case Slice::Builtin::KindBool:
-            {
-                result = _info->factory->createBoolean(value == "true", true);
-                break;
-            }
-
-            case Slice::Builtin::KindFloat:
-            case Slice::Builtin::KindDouble:
-            {
-                double v = strtod(value.c_str(), 0);
-                result = _info->factory->createDouble(v, true);
-                break;
-            }
-
-            case Slice::Builtin::KindString:
-            {
-                result = _info->factory->createString(value, true);
-                break;
-            }
-
-            case Slice::Builtin::KindObject:
-            case Slice::Builtin::KindObjectProxy:
-            case Slice::Builtin::KindLocalObject:
-                assert(false);
-            }
-        }
-        else
-        {
-            Slice::EnumPtr en = Slice::EnumPtr::dynamicCast(type);
-            assert(en);
-            Slice::EnumeratorList el = en->getEnumerators();
-            for(Slice::EnumeratorList::iterator q = el.begin(); q != el.end(); ++q)
-            {
-                if((*q)->name() == value)
-                {
-                    e = *q;
-                    break;
-                }
-            }
-            assert(e);
-        }
-    }
-
-    if(!result)
-    {
-        assert(e);
-        result = _info->factory->create(e->type(), true);
-        EnumDataPtr ed = EnumDataPtr::dynamicCast(result);
-        assert(ed);
-        ed->setValueAsString(e->name());
-    }
-
-    //
-    // Cache the value.
-    //
-    const_cast<DataMap&>(_constantCache).insert(DataMap::value_type(name, result));
-
-    return result;
-}
-
-FreezeScript::SymbolTablePtr
-FreezeScript::SymbolTableI::createChild()
-{
-    return new SymbolTableI(_info, this);
-}
-
-Slice::TypePtr
-FreezeScript::SymbolTableI::lookupType(const string& name)
-{
-    Slice::TypeList l = _info->newUnit->lookupType(name, false);
-    Slice::TypePtr result;
-    if(!l.empty())
-    {
-        result = l.front();
-    }
-    return result;
-}
-
-FreezeScript::DataPtr
-FreezeScript::SymbolTableI::invokeFunction(const string& name, const DataPtr& target, const DataList& args)
-{
-    if(target)
-    {
-        DictionaryDataPtr targetDict = DictionaryDataPtr::dynamicCast(target);
-        if(targetDict && name == "containsKey")
-        {
-            if(args.size() != 1)
-            {
-                _info->errorReporter->error("containsKey() requires one argument");
-            }
-            Slice::DictionaryPtr dictType = Slice::DictionaryPtr::dynamicCast(targetDict->getType());
-            assert(dictType);
-            DataPtr key = _info->factory->create(dictType->keyType(), false);
-            assignOrTransform(key, args[0], false, _info);
-            DataPtr value = targetDict->getElement(key);
-            return _info->factory->createBoolean(value ? true : false, false);
-        }
-
-        DataPtr result;
-        if(invokeMemberFunction(name, target, args, result, _info->factory, _info->errorReporter))
-        {
-            return result;
-        }
-
-        _info->errorReporter->error("unknown function `" + name + "' invoked on type " +
-                                    typeToString(target->getType()));
-    }
-    else
-    {
-        //
-        // Global function.
-        //
-        DataPtr result;
-        if(invokeGlobalFunction(_info->communicator, name, args, result, _info->factory, _info->errorReporter))
-        {
-            return result;
-        }
-        else
-        {
-            _info->errorReporter->error("unknown global function `" + name + "'");
-        }
-    }
-
-    return 0;
-}
-
-FreezeScript::DataPtr
-FreezeScript::SymbolTableI::findValue(const string& name) const
-{
-    DataMap::const_iterator p = _dataMap.find(name);
-    if(p != _dataMap.end())
-    {
-        return p->second;
-    }
-
-    if(_parent)
-    {
-        SymbolTableIPtr parentI = SymbolTableIPtr::dynamicCast(_parent);
-        assert(parentI);
-        return parentI->findValue(name);
-    }
-
-    return 0;
-}
-
-FreezeScript::SymbolTableI::EntityVisitor::EntityVisitor(SymbolTableI* table) :
-    _table(table), _error(false)
-{
-}
-
-void
-FreezeScript::SymbolTableI::EntityVisitor::visitIdentifier(const string& name)
-{
-    if(!_error)
-    {
-        if(!_current)
-        {
-            _current = _table->findValue(name);
-        }
-        else
-        {
-            _current = _current->getMember(name);
-        }
-
-        if(!_current)
-        {
-            _error = true;
-        }
-    }
-}
-
-void
-FreezeScript::SymbolTableI::EntityVisitor::visitElement(const NodePtr& value)
-{
-    if(!_error)
-    {
-        assert(_current);
-
-        DataPtr val = value->evaluate(_table);
-        _current = _current->getElement(val);
-
-        if(!_current)
-        {
-            _error = true;
-        }
-    }
-}
-
-FreezeScript::DataPtr
-FreezeScript::SymbolTableI::EntityVisitor::getCurrent() const
-{
-    return _current;
-}
-
-//
-// ObjectVisitor
-//
-FreezeScript::ObjectVisitor::ObjectVisitor(ObjectDataMap& objectDataMap) :
-    _map(objectDataMap)
-{
-}
-
-void
-FreezeScript::ObjectVisitor::visitStruct(const StructDataPtr& data)
-{
-    Slice::TypePtr type = data->getType();
-    if(type->usesClasses())
-    {
-        DataMemberMap& members = data->getMembers();
-        for(DataMemberMap::iterator p = members.begin(); p != members.end(); ++p)
-        {
-            p->second->visit(*this);
-        }
-    }
-}
-
-void
-FreezeScript::ObjectVisitor::visitSequence(const SequenceDataPtr& data)
-{
-    Slice::TypePtr type = data->getType();
-    if(type->usesClasses())
-    {
-        DataList& elements = data->getElements();
-        for(DataList::iterator p = elements.begin(); p != elements.end(); ++p)
-        {
-            (*p)->visit(*this);
-        }
-    }
-}
-
-void
-FreezeScript::ObjectVisitor::visitDictionary(const DictionaryDataPtr& data)
-{
-    Slice::TypePtr type = data->getType();
-    if(type->usesClasses())
-    {
-        DataMap& elements = data->getElements();
-        for(DataMap::iterator p = elements.begin(); p != elements.end(); ++p)
-        {
-            //
-            // NOTE: There's no need to visit the key.
-            //
-            p->second->visit(*this);
-        }
-    }
-}
-
-void
-FreezeScript::ObjectVisitor::visitObject(const ObjectRefPtr& data)
-{
-    ObjectDataPtr value = data->getValue();
-    if(value)
-    {
-        ObjectDataMap::iterator p = _map.find(value.get());
-        if(p == _map.end())
-        {
-#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
-            _map.insert(ObjectDataMap::value_type(value.get(), static_cast<ObjectDataPtr>(nullptr)));
-#else
-            _map.insert(ObjectDataMap::value_type(value.get(), 0));
-#endif
-            DataMemberMap& members = value->getMembers();
-            for(DataMemberMap::iterator q = members.begin(); q != members.end(); ++q)
-            {
-                q->second->visit(*this);
-            }
-        }
-    }
-}
-
-//
-// TransformInfoI
-//
-FreezeScript::DataFactoryPtr
-FreezeScript::TransformInfoI::getDataFactory()
-{
-    return factory;
-}
-
-FreezeScript::ErrorReporterPtr
-FreezeScript::TransformInfoI::getErrorReporter()
-{
-    return errorReporter;
-}
-
-bool
-FreezeScript::TransformInfoI::doDefaultTransform(const Slice::TypePtr& type)
-{
-    TransformMap::const_iterator p = transformMap.find(typeToString(type));
-    if(p != transformMap.end())
-    {
-        return p->second->doDefaultTransform();
-    }
-    return true;
-}
-
-bool
-FreezeScript::TransformInfoI::doBaseTransform(const Slice::ClassDefPtr& type)
-{
-    TransformMap::const_iterator p = transformMap.find(type->scoped());
-    if(p != transformMap.end())
-    {
-        return p->second->doBaseTransform();
-    }
-    return true;
-}
-
-Slice::TypePtr
-FreezeScript::TransformInfoI::getRenamedType(const Slice::TypePtr& old)
-{
-    RenameMap::iterator p = renameMap.find(typeToString(old));
-    if(p != renameMap.end())
-    {
-        return p->second;
-    }
-    return 0;
-}
-
-void
-FreezeScript::TransformInfoI::executeCustomTransform(const DataPtr& dest, const DataPtr& src)
-{
-    //
-    // Execute the type's transform (if any). Non-nil objects need special consideration,
-    // for two reasons:
-    //
-    // 1. The dest and src arguments are ObjectRef instances whose getType()
-    //    function returns the formal type, which may not match the actual type
-    //    if inheritance is being used. Therefore, we need to look for the
-    //    transform of the actual type of the object.
-    //
-    // 2. It's not sufficient to execute only the transform for the actual type;
-    //    the transform descriptors for base types must also be executed (if not
-    //    explicitly precluded).
-    //
-    // The algorithm goes like this:
-    //
-    // 1. If a transform exists for the actual type, execute it.
-    // 2. If the transform doesn't exist, or if it does exist and does not preclude
-    //    the execution of the base transform, then obtain the base type. If the
-    //    type has no user-defined base class, use Object.
-    // 3. If a base type was found and a transform exists for the base type, execute it.
-    // 4. Repeat step 2.
-    //
-    ObjectRefPtr obj = ObjectRefPtr::dynamicCast(dest);
-    if(obj && obj->getValue())
-    {
-        ObjectDataPtr data = obj->getValue();
-        Slice::TypePtr cls = data->getType(); // Actual type: may be Builtin (Object) or ClassDecl
-        bool transformBase = true;
-        while(cls)
-        {
-            string type = typeToString(cls);
-            TransformMap::const_iterator p = transformMap.find(type);
-            if(p != transformMap.end())
-            {
-                SymbolTablePtr sym = new SymbolTableI(this, symbolTable);
-                sym->add("new", dest);
-                sym->add("old", src);
-                p->second->execute(sym);
-                transformBase = p->second->doBaseTransform();
-            }
-            Slice::ClassDeclPtr decl = Slice::ClassDeclPtr::dynamicCast(cls);
-            cls = 0;
-            if(transformBase && decl)
-            {
-                Slice::ClassDefPtr def = decl->definition();
-                assert(def);
-                Slice::ClassList bases = def->bases();
-                if(!bases.empty() && !bases.front()->isInterface())
-                {
-                    cls = bases.front()->declaration();
-                }
-                else
-                {
-                    cls = newUnit->builtin(Slice::Builtin::KindObject);
-                }
-            }
-        }
-    }
-    else
-    {
-        string type = typeToString(dest->getType());
-        TransformMap::const_iterator p = transformMap.find(type);
-        if(p != transformMap.end())
-        {
-            SymbolTablePtr sym = new SymbolTableI(this, symbolTable);
-            sym->add("new", dest);
-            sym->add("old", src);
-            p->second->execute(sym);
-        }
-    }
-}
-
-string
-FreezeScript::TransformInfoI::facetName()
-{
-    return facet;
-}
-
-bool
-FreezeScript::TransformInfoI::purgeObjects()
-{
-    return purge;
-}
-
-FreezeScript::ObjectDataMap&
-FreezeScript::TransformInfoI::getObjectDataMap()
-{
-    return objectDataMap;
-}
-
-//
-// DescriptorHandler
-//
-FreezeScript::DescriptorHandler::DescriptorHandler(const TransformInfoIPtr& info) :
-    _info(info)
-{
-}
-
-void
-FreezeScript::DescriptorHandler::startElement(const string& name, const IceXML::Attributes& attributes, int line,
-                                              int /*column*/)
-{
-    DescriptorPtr d;
-
-    if(name == "transformdb")
-    {
-        if(_current)
-        {
-            _info->errorReporter->descriptorError("<transformdb> must be the top-level element", line);
-        }
-
-        _descriptor = new TransformDBDescriptor(line, _info, attributes);
-        d = _descriptor;
-    }
-    else if(name == "database")
-    {
-        if(!_current)
-        {
-            _info->errorReporter->descriptorError("<database> must be a child of <transformdb>", line);
-        }
-
-        d = new DatabaseDescriptor(_current, line, _info, attributes);
-    }
-    else if(name == "record")
-    {
-        if(!_current)
-        {
-            _info->errorReporter->descriptorError("<record> must be a child of <database>", line);
-        }
-
-        d = new RecordDescriptor(_current, line, _info, attributes);
-    }
-    else if(name == "transform")
-    {
-        if(!_current)
-        {
-            _info->errorReporter->descriptorError("<transform> must be a child of <transformdb>", line);
-        }
-
-        d = new TransformDescriptor(_current, line, _info, attributes);
-    }
-    else if(name == "init")
-    {
-        if(!_current)
-        {
-            _info->errorReporter->descriptorError("<init> must be a child of <transformdb>", line);
-        }
-
-        d = new InitDescriptor(_current, line, _info, attributes);
-    }
-    else if(name == "set")
-    {
-        if(!_current)
-        {
-            _info->errorReporter->descriptorError("<set> cannot be a top-level element", line);
-        }
-
-        d = new SetDescriptor(_current, line, _info, attributes);
-    }
-    else if(name == "define")
-    {
-        if(!_current)
-        {
-            _info->errorReporter->descriptorError("<define> cannot be a top-level element", line);
-        }
-
-        d = new DefineDescriptor(_current, line, _info, attributes);
-    }
-    else if(name == "add")
-    {
-        if(!_current)
-        {
-            _info->errorReporter->descriptorError("<add> cannot be a top-level element", line);
-        }
-
-        d = new AddDescriptor(_current, line, _info, attributes);
-    }
-    else if(name == "remove")
-    {
-        if(!_current)
-        {
-            _info->errorReporter->descriptorError("<remove> cannot be a top-level element", line);
-        }
-
-        d = new RemoveDescriptor(_current, line, _info, attributes);
-    }
-    else if(name == "delete")
-    {
-        if(!_current)
-        {
-            _info->errorReporter->descriptorError("<delete> cannot be a top-level element", line);
-        }
-
-        d = new DeleteDescriptor(_current, line, _info, attributes);
-    }
-    else if(name == "fail")
-    {
-        if(!_current)
-        {
-            _info->errorReporter->descriptorError("<fail> cannot be a top-level element", line);
-        }
-
-        d = new FailDescriptor(_current, line, _info, attributes);
-    }
-    else if(name == "echo")
-    {
-        if(!_current)
-        {
-            _info->errorReporter->descriptorError("<echo> cannot be a top-level element", line);
-        }
-
-        d = new EchoDescriptor(_current, line, _info, attributes);
-    }
-    else if(name == "if")
-    {
-        if(!_current)
-        {
-            _info->errorReporter->descriptorError("<if> cannot be a top-level element", line);
-        }
-
-        d = new IfDescriptor(_current, line, _info, attributes);
-    }
-    else if(name == "iterate")
-    {
-        if(!_current)
-        {
-            _info->errorReporter->descriptorError("<iterate> cannot be a top-level element", line);
-        }
-
-        d = new IterateDescriptor(_current, line, _info, attributes);
-    }
-    else
-    {
-        _info->errorReporter->descriptorError("unknown descriptor `" + name + "'", line);
-    }
-
-    if(_current)
-    {
-        _current->addChild(d);
-    }
-    _current = d;
-}
-
-void
-FreezeScript::DescriptorHandler::endElement(const string&, int, int)
-{
-    assert(_current);
-    _current = _current->parent();
-}
-
-void
-FreezeScript::DescriptorHandler::characters(const string&, int, int)
-{
-}
-
-void
-FreezeScript::DescriptorHandler::error(const string& msg, int line, int)
-{
-    _info->errorReporter->descriptorError(msg, line);
-}
-
-FreezeScript::TransformDBDescriptorPtr
-FreezeScript::DescriptorHandler::descriptor() const
-{
-    return _descriptor;
-}
-
-//
-// assignOrTransform
-//
-void
-FreezeScript::assignOrTransform(const DataPtr& dest, const DataPtr& src, bool convert, const TransformInfoPtr& info)
-{
-    Slice::TypePtr destType = dest->getType();
-    Slice::TypePtr srcType = src->getType();
-    Slice::BuiltinPtr b1 = Slice::BuiltinPtr::dynamicCast(destType);
-    Slice::BuiltinPtr b2 = Slice::BuiltinPtr::dynamicCast(srcType);
-
-    if(!b1 && !b2 && dest->getType()->unit().get() != src->getType()->unit().get())
-    {
-        TransformVisitor v(src, info);
-        dest->visit(v);
-    }
-    else
-    {
-        AssignVisitor v(src, info->getDataFactory(), info->getErrorReporter(), convert);
-        dest->visit(v);
-    }
-}
-
-void
-FreezeScript::transformDatabase(const Ice::CommunicatorPtr& communicator,
-                                const FreezeScript::ObjectFactoryPtr& objectFactory,
-                                const Slice::UnitPtr& oldUnit, const Slice::UnitPtr& newUnit,
-                                Db* oldDb, Db* newDb, DbTxn* newDbTxn, const Freeze::ConnectionPtr& connection,
-                                const string& newDbName, const string& facetName, bool purgeObjects, ostream& errors,
-                                bool suppress, istream& is)
-{
-
-    TransformInfoIPtr info = new TransformInfoI;
-    info->communicator = communicator;
-    info->objectFactory = objectFactory;
-    info->oldUnit = oldUnit;
-    info->newUnit = newUnit;
-    info->oldDb = oldDb;
-    info->newDb = newDb;
-    info->newDbTxn = newDbTxn;
-    info->connection = connection;
-    info->newDbName = newDbName;
-    info->facet = facetName;
-    info->purge = purgeObjects;
-    info->errorReporter = new ErrorReporter(errors, suppress);
-    info->factory = new TransformDataFactory(communicator, newUnit, info->errorReporter);
-    info->symbolTable = new SymbolTableI(info);
-
-    try
-    {
-        DescriptorHandler dh(info);
-        IceXML::Parser::parse(is, dh);
-        TransformDBDescriptorPtr descriptor = dh.descriptor();
-        descriptor->validate();
-        descriptor->execute(info->symbolTable);
-    }
-    catch(const IceXML::ParserException& ex)
-    {
-        info->errorReporter->error(ex.reason());
-    }
-}
diff --git a/cpp/src/FreezeScript/Transformer.h b/cpp/src/FreezeScript/Transformer.h
deleted file mode 100644
index d69865c4083..00000000000
--- a/cpp/src/FreezeScript/Transformer.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_SCRIPT_TRANSFORMER_H
-#define FREEZE_SCRIPT_TRANSFORMER_H
-
-#include <Ice/Ice.h>
-#include <Slice/Parser.h>
-#include <Freeze/Connection.h>
-#include <FreezeScript/Data.h>
-
-class Db;
-class DbTxn;
-
-namespace FreezeScript
-{
-
-void
-transformDatabase(const Ice::CommunicatorPtr&,
-                  const FreezeScript::ObjectFactoryPtr& objectFactory,
-                  const Slice::UnitPtr&, const Slice::UnitPtr&,
-                  Db*, Db*, DbTxn*, const Freeze::ConnectionPtr&, const std::string&, const std::string&, bool,
-                  std::ostream&, bool, std::istream&);
-
-} // End of namespace FreezeScript
-
-#endif
diff --git a/cpp/src/FreezeScript/Util.cpp b/cpp/src/FreezeScript/Util.cpp
deleted file mode 100644
index a6607b79bad..00000000000
--- a/cpp/src/FreezeScript/Util.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/Util.h>
-#include <FreezeScript/Exception.h>
-#include <Freeze/Catalog.h>
-#include <Freeze/Connection.h>
-#include <Freeze/Initialize.h>
-#include <Slice/Preprocessor.h>
-#include <db_cxx.h>
-#include <sys/stat.h>
-
-using namespace std;
-using namespace Slice;
-
-string
-FreezeScript::typeToString(const TypePtr& type)
-{
-    BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-    ContainedPtr c = ContainedPtr::dynamicCast(type);
-    if(b)
-    {
-        return b->kindAsString();
-    }
-    else if(c)
-    {
-        return c->scoped();
-    }
-    else
-    {
-        ProxyPtr p = ProxyPtr::dynamicCast(type);
-        assert(p);
-        return p->_class()->scoped() + "*";
-    }
-}
-
-bool
-FreezeScript::ignoreType(const string& type)
-{
-    //
-    // Suppress descriptors for the following pre-defined types. Must be kept in ascending alphabetical order.
-    //
-    static const string ignoreTypeList[] =
-    {
-        "::Freeze::ObjectRecord",
-        "::Freeze::Statistics",
-        "::Ice::Identity"
-    };
-
-    return binary_search(&ignoreTypeList[0], &ignoreTypeList[sizeof(ignoreTypeList) / sizeof(*ignoreTypeList)], type);
-}
-
-void
-FreezeScript::createEvictorSliceTypes(const Slice::UnitPtr& u)
-{
-    Slice::TypeList l;
-    Slice::ContainedList c;
-
-    //
-    // Create the Ice module if necessary.
-    //
-    c = u->lookupContained("Ice", false);
-    Slice::ModulePtr ice;
-    if(c.empty())
-    {
-        ice = u->createModule("Ice");
-    }
-    else
-    {
-        ice = Slice::ModulePtr::dynamicCast(c.front());
-        if(!ice)
-        {
-            throw FailureException(__FILE__, __LINE__, "the symbol `::Ice' is defined in Slice but is not a module");
-        }
-    }
-
-    //
-    // Create the Slice definition for Ice::Identity if it doesn't exist.
-    //
-    string scoped = "::Ice::Identity";
-    l = u->lookupTypeNoBuiltin(scoped, false);
-    Slice::StructPtr identity;
-    if(l.empty())
-    {
-        identity = ice->createStruct("Identity", false);
-        Slice::TypePtr str = u->builtin(Slice::Builtin::KindString);
-        identity->createDataMember("name", str, false, 0, 0, "", "");
-        identity->createDataMember("category", str, false, 0, 0, "", "");
-    }
-    else
-    {
-        identity = Slice::StructPtr::dynamicCast(l.front());
-        if(!identity)
-        {
-            throw FailureException(__FILE__, __LINE__,
-                                   "the symbol `::Ice::Identity' is defined in Slice but is not a struct");
-        }
-    }
-
-    //
-    // Create the Freeze module if necessary.
-    //
-    c = u->lookupContained("Freeze", false);
-    Slice::ModulePtr freeze;
-    if(c.empty())
-    {
-        freeze = u->createModule("Freeze");
-    }
-    else
-    {
-        freeze = Slice::ModulePtr::dynamicCast(c.front());
-        if(!freeze)
-        {
-            throw FailureException(__FILE__, __LINE__,
-                                   "the symbol `::Freeze' is defined in Slice but is not a module");
-        }
-    }
-
-    //
-    // Create the Slice definition for Freeze::Statistics if it doesn't exist.
-    //
-    scoped = "::Freeze::Statistics";
-    l = u->lookupTypeNoBuiltin(scoped, false);
-    Slice::StructPtr stats;
-    if(l.empty())
-    {
-        stats = freeze->createStruct("Statistics", false);
-        Slice::TypePtr tl = u->builtin(Slice::Builtin::KindLong);
-        stats->createDataMember("creationTime", tl, false, 0, 0, "", "");
-        stats->createDataMember("lastSaveTime", tl, false, 0, 0, "", "");
-        stats->createDataMember("avgSaveTime", tl, false, 0, 0, "", "");
-    }
-    else
-    {
-        stats = Slice::StructPtr::dynamicCast(l.front());
-        if(!stats)
-        {
-            throw FailureException(__FILE__, __LINE__, "the symbol `::Freeze::Statistics' is defined in "
-                                   "Slice but is not a struct");
-        }
-    }
-
-    //
-    // Create the Slice definition for Freeze::ObjectRecord if it doesn't exist.
-    //
-    scoped = "::Freeze::ObjectRecord";
-    l = u->lookupTypeNoBuiltin(scoped, false);
-    if(l.empty())
-    {
-        Slice::StructPtr rec = freeze->createStruct("ObjectRecord", false);
-        Slice::TypePtr obj = u->builtin(Slice::Builtin::KindObject);
-        rec->createDataMember("servant", obj, false, 0, 0, "", "");
-        rec->createDataMember("stats", stats, false, 0, 0, "", "");
-    }
-    else
-    {
-        if(!Slice::StructPtr::dynamicCast(l.front()))
-        {
-            throw FailureException(__FILE__, __LINE__, "the symbol `::Freeze::ObjectRecord' is defined in "
-                                   "Slice but is not a struct");
-        }
-    }
-}
-
-bool
-FreezeScript::parseSlice(const string& n, const Slice::UnitPtr& u, const vector<string>& files,
-                         const vector<string>& cppArgs, bool debug, const std::string& extraArgs)
-{
-    //
-    // Parse the Slice files.
-    //
-    for(vector<string>::const_iterator p = files.begin(); p != files.end(); ++p)
-    {
-        PreprocessorPtr icecpp = Preprocessor::create(n, *p, cppArgs);
-
-        FILE* cppHandle = icecpp->preprocess(false, extraArgs);
-
-        if(cppHandle == 0)
-        {
-            return false;
-        }
-
-        int status = u->parse(*p, cppHandle, debug);
-
-        if(!icecpp->close())
-        {
-            return false;            
-        }
-
-        if(status != EXIT_SUCCESS)
-        {
-            return false;
-        }
-    }
-
-    u->mergeModules();
-
-    return true;
-}
-
-FreezeScript::CatalogDataMap
-FreezeScript::readCatalog(const Ice::CommunicatorPtr& communicator, const string& dbEnvName)
-{
-    CatalogDataMap result;
-
-    DbEnv dbEnv(0);
-    try
-    {
-#ifdef _WIN32
-        //
-        // Berkeley DB may use a different C++ runtime.
-        //
-        dbEnv.set_alloc(::malloc, ::realloc, ::free);
-#endif
-
-        //
-        // Open the database environment.
-        //
-        {
-            u_int32_t flags = DB_THREAD | DB_CREATE | DB_INIT_TXN | DB_INIT_MPOOL;
-            dbEnv.open(dbEnvName.c_str(), flags, 0);
-        }
-
-        Freeze::ConnectionPtr connection = Freeze::createConnection(communicator, dbEnvName, dbEnv);
-        Freeze::Catalog catalog(connection, Freeze::catalogName());
-        for(Freeze::Catalog::const_iterator p = catalog.begin(); p != catalog.end(); ++p)
-        {
-            result.insert(make_pair(p->first, p->second));
-        }
-    }
-    catch(const DbException& ex)
-    {
-        dbEnv.close(0);
-        throw FailureException(__FILE__, __LINE__, string("database error: ") + ex.what());
-    }
-    catch(const IceUtil::FileLockException&)
-    {
-        dbEnv.close(0);
-        throw FailureException(__FILE__, __LINE__, "environment `" + dbEnvName + "' is locked");
-    }
-    catch(...)
-    {
-        dbEnv.close(0);
-        throw;
-    }
-
-    dbEnv.close(0);
-
-    return result;
-}
-
-string
-FreezeScript::CompactIdResolverI::resolve(Ice::Int id) const
-{
-    string type;
-    map<Ice::Int, string>::const_iterator p = _ids.find(id);
-    if(p != _ids.end())
-    {
-        type = p->second;
-    }
-    return type;
-}
-
-void
-FreezeScript::CompactIdResolverI::add(Ice::Int id, const string& type)
-{
-#ifndef NDEBUG
-    map<Ice::Int, string>::const_iterator p = _ids.find(id);
-#else
-    _ids.find(id);
-#endif
-    assert(p == _ids.end());
-
-    _ids[id] = type;
-}
-
-void
-FreezeScript::collectCompactIds(const UnitPtr& unit, const FreezeScript::CompactIdResolverIPtr& r)
-{
-    class Visitor : public ParserVisitor
-    {
-    public:
-
-        Visitor(const FreezeScript::CompactIdResolverIPtr& resolver) : _r(resolver)
-        {
-        }
-
-        virtual bool visitClassDefStart(const ClassDefPtr& p)
-        {
-            if(p->compactId() != -1)
-            {
-                _r->add(p->compactId(), p->scoped());
-            }
-            return true;
-        }
-
-        FreezeScript::CompactIdResolverIPtr _r;
-    };
-
-    Visitor v(r);
-    unit->visit(&v, false);
-}
diff --git a/cpp/src/FreezeScript/Util.h b/cpp/src/FreezeScript/Util.h
deleted file mode 100644
index 12acd35c44b..00000000000
--- a/cpp/src/FreezeScript/Util.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef FREEZE_SCRIPT_UTIL_H
-#define FREEZE_SCRIPT_UTIL_H
-
-#include <Slice/Parser.h>
-#include <Ice/Initialize.h>
-#include <Freeze/CatalogData.h>
-
-namespace FreezeScript
-{
-
-template<class T>
-class Destroyer
-{
-public:
-
-    Destroyer() {}
-    Destroyer(T p) : _p(p) {}
-    ~Destroyer()
-    {
-        if(_p)
-        {
-            _p->destroy();
-        }
-    }
-
-    void set(T p)
-    {
-        if(_p)
-        {
-            _p->destroy();
-        }
-        _p = p;
-    }
-
-    void release()
-    {
-        _p = 0;
-    }
-
-private:
-
-    T _p;
-};
-
-std::string typeName(const Slice::TypePtr&);
-std::string typeToString(const Slice::TypePtr&);
-bool ignoreType(const std::string&);
-void createEvictorSliceTypes(const Slice::UnitPtr&);
-bool parseSlice(const std::string&, const Slice::UnitPtr&, const std::vector<std::string>&, 
-                const std::vector<std::string>&, bool, const std::string&);
-
-typedef std::map<std::string, Freeze::CatalogData> CatalogDataMap;
-
-CatalogDataMap readCatalog(const Ice::CommunicatorPtr&, const std::string&);
-
-class CompactIdResolverI : public Ice::CompactIdResolver
-{
-public:
-
-    virtual std::string resolve(Ice::Int) const;
-
-    void add(Ice::Int, const std::string&);
-
-private:
-
-    std::map<Ice::Int, std::string> _ids;
-};
-typedef IceUtil::Handle<CompactIdResolverI> CompactIdResolverIPtr;
-
-void collectCompactIds(const Slice::UnitPtr&, const CompactIdResolverIPtr&);
-
-} // End of namespace FreezeScript
-
-#endif
diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp
deleted file mode 100644
index fa9e0cc1c78..00000000000
--- a/cpp/src/FreezeScript/transformdb.cpp
+++ /dev/null
@@ -1,1022 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <FreezeScript/Transformer.h>
-#include <FreezeScript/TransformAnalyzer.h>
-#include <FreezeScript/Exception.h>
-#include <FreezeScript/Util.h>
-#include <Freeze/Initialize.h>
-#include <Freeze/Transaction.h>
-#include <Freeze/Catalog.h>
-#include <IceUtil/Options.h>
-#include <IceUtil/FileUtil.h>
-#include <db_cxx.h>
-#include <sys/stat.h>
-#include <algorithm>
-
-using namespace std;
-
-#ifdef _WIN32
-#   define FREEZE_SCRIPT_DB_MODE 0
-#else
-#   define FREEZE_SCRIPT_DB_MODE (S_IRUSR | S_IWUSR)
-#endif
-
-static void
-usage(const std::string& n)
-{
-    cerr << "Usage:\n";
-    cerr << "\n";
-    cerr << n << " -o FILE [-i] [slice-options] [type-options]\n";
-    cerr << "  Generates descriptors in FILE for a database.\n";
-    cerr << "\n";
-    cerr << n << " -o FILE [-i] [slice-options] DBENV\n";
-    cerr << "  Generates descriptors in FILE for all databases in the environment DBENV.\n";
-    cerr << "\n";
-    cerr << n << " [options] [slice-options] [type-options] DBENV DB NEWDBENV\n";
-    cerr << "  Transform the database DB in the environment DBENV. A database of the\n";
-    cerr << "  same name is created in the environment NEWDBENV.\n";
-    cerr << "\n";
-    cerr << n << " [options] [slice-options] DBENV NEWDBENV\n";
-    cerr << "  Transform all databases from the environment DBENV into the\n";
-    cerr << "  environment NEWDBENV.\n";
-    cerr << "\n";
-    cerr <<
-        "Slice Options:\n"
-        "-DNAME                Define NAME as 1.\n"
-        "-DNAME=DEF            Define NAME as DEF.\n"
-        "-UNAME                Remove any definition for NAME.\n"
-        "-d, --debug           Print debug messages.\n"
-        "--underscore          Permit underscores in Slice identifiers.\n"
-        "--include-old DIR     Put DIR in the include file search path for old Slice\n"
-        "                      definitions.\n"
-        "--include-new DIR     Put DIR in the include file search path for new Slice\n"
-        "                      definitions.\n"
-        "--old SLICE           Load old Slice definitions from the file SLICE.\n"
-        "--new SLICE           Load new Slice definitions from the file SLICE.\n"
-        ;
-    cerr << "\n";
-    cerr <<
-        "Type Options:\n"
-        "-e                    Indicates the database is an Evictor database.\n"
-        "--key TYPE[,TYPE]     Specifies the Slice types of the database key. If the\n"
-        "                      type names have not changed, only one needs to be\n"
-        "                      specified. Otherwise, the type names are specified as\n"
-        "                      old-type,new-type.\n"
-        "--value TYPE[,TYPE]   Specifies the Slice types of the database value. If the\n"
-        "                      type names have not changed, only one needs to be\n"
-        "                      specified. Otherwise, the type names are specified as\n"
-        "                      old-type,new-type.\n"
-        ;
-    cerr << "\n";
-    cerr <<
-        "Options:\n"
-        "-h, --help            Show this message.\n"
-        "-v, --version         Display the Ice version.\n"
-        "-i                    Ignore incompatible type changes.\n"
-        "-p                    Purge objects whose types no longer exist.\n"
-        "-c                    Use catastrophic recovery on the old database environment.\n"
-        "-w                    Suppress duplicate warnings during migration.\n"
-        "-f FILE               Execute the transformation descriptors in the file FILE.\n"
-        ;
-}
-
-static Slice::TypePtr
-findType(const Slice::UnitPtr& u, const string& type)
-{
-    Slice::TypeList l;
-
-    string t;
-    if(type == "::Ice::Object")
-    {
-        t = "Object";
-    }
-    else if(type == "::Ice::Object*")
-    {
-        t = "Object*";
-    }
-    else
-    {
-        t = type;
-    }
-
-    l = u->lookupType(t, false);
-    if(l.empty())
-    {
-        return 0;
-    }
-
-    return l.front();
-}
-
-static void
-transformDb(bool evictor,  const Ice::CommunicatorPtr& communicator,
-            const FreezeScript::ObjectFactoryPtr& objectFactory,
-            DbEnv& dbEnv, DbEnv& dbEnvNew, const string& dbName,
-            const Freeze::ConnectionPtr& connectionNew, vector<Db*>& dbs,
-            const Slice::UnitPtr& oldUnit, const Slice::UnitPtr& newUnit,
-            DbTxn* txnNew, bool purgeObjects, bool suppress, string descriptors)
-{
-    if(evictor)
-    {
-        //
-        // The evictor database file contains multiple databases. We must first
-        // determine the names of those databases, ignoring any whose names
-        // begin with "$index:". Each database represents a separate facet, with
-        // the facet name used as the database name. The database named "$default"
-        // represents the main object.
-        //
-        vector<string> dbNames;
-        {
-            Db db(&dbEnv, 0);
-            db.open(0, dbName.c_str(), 0, DB_UNKNOWN, DB_RDONLY, 0);
-            Dbt dbKey, dbValue;
-            dbKey.set_flags(DB_DBT_MALLOC);
-            dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
-
-            Dbc* dbc = 0;
-            db.cursor(0, &dbc, 0);
-
-            while(dbc->get(&dbKey, &dbValue, DB_NEXT) == 0)
-            {
-                string s(static_cast<char*>(dbKey.get_data()), dbKey.get_size());
-                if(s.find("$index:") != 0)
-                {
-                    dbNames.push_back(s);
-                }
-                free(dbKey.get_data());
-            }
-
-            dbc->close();
-            db.close(0);
-        }
-
-        //
-        // Transform each database. We must delay closing the new databases
-        // until after the transaction is committed or aborted.
-        //
-        for(vector<string>::iterator p = dbNames.begin(); p != dbNames.end(); ++p)
-        {
-            string name = p->c_str();
-
-            Db db(&dbEnv, 0);
-            db.open(0, dbName.c_str(), name.c_str(), DB_BTREE, DB_RDONLY, FREEZE_SCRIPT_DB_MODE);
-
-            Db* dbNew = new Db(&dbEnvNew, 0);
-            dbs.push_back(dbNew);
-            dbNew->open(txnNew, dbName.c_str(), name.c_str(), DB_BTREE, DB_CREATE | DB_EXCL, FREEZE_SCRIPT_DB_MODE);
-
-            //
-            // Execute the transformation descriptors.
-            //
-            istringstream istr(descriptors);
-            string facet = (name == "$default" ? string("") : name);
-            FreezeScript::transformDatabase(communicator, objectFactory, oldUnit, newUnit, &db, dbNew, txnNew, 0,
-                                            dbName, facet, purgeObjects, cerr, suppress, istr);
-
-            db.close(0);
-        }
-
-        Freeze::Catalog catalogNew(connectionNew, Freeze::catalogName());
-        Freeze::CatalogData catalogData = { true, "::Ice::Identity", "Object" };
-        catalogNew.put(Freeze::Catalog::value_type(dbName, catalogData));
-    }
-    else
-    {
-        //
-        // Transform a map database.
-        //
-        Db db(&dbEnv, 0);
-        db.open(0, dbName.c_str(), 0, DB_BTREE, DB_RDONLY, FREEZE_SCRIPT_DB_MODE);
-
-        Db* dbNew = new Db(&dbEnvNew, 0);
-        dbs.push_back(dbNew);
-        dbNew->open(txnNew, dbName.c_str(), 0, DB_BTREE, DB_CREATE | DB_EXCL, FREEZE_SCRIPT_DB_MODE);
-
-        //
-        // Execute the transformation descriptors.
-        //
-        istringstream istr(descriptors);
-        FreezeScript::transformDatabase(communicator, objectFactory, oldUnit, newUnit, &db, dbNew, txnNew,
-                                        connectionNew, dbName, "", purgeObjects, cerr, suppress, istr);
-
-        db.close(0);
-    }
-}
-
-static int
-run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator,
-    const FreezeScript::CompactIdResolverIPtr& resolver)
-{
-    vector<string> oldCppArgs;
-    vector<string> newCppArgs;
-    bool debug;
-    bool ice = true; // Needs to be true in order to create default definitions.
-    bool underscore;
-    string outputFile;
-    bool ignoreTypeChanges;
-    bool purgeObjects;
-    bool catastrophicRecover;
-    bool suppress;
-    string inputFile;
-    vector<string> oldSlice;
-    vector<string> newSlice;
-    bool evictor;
-    string keyTypeNames;
-    string valueTypeNames;
-    string dbEnvName, dbName, dbEnvNameNew;
-    bool allDb = false;
-
-    IceUtilInternal::Options opts;
-    opts.addOpt("h", "help");
-    opts.addOpt("v", "version");
-    opts.addOpt("D", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("U", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("d", "debug");
-    opts.addOpt("", "underscore");
-    opts.addOpt("o", "", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("i");
-    opts.addOpt("p");
-    opts.addOpt("c");
-    opts.addOpt("w");
-    opts.addOpt("f", "", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "include-old", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("", "include-new", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("", "old", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("", "new", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("a");
-    opts.addOpt("e");
-    opts.addOpt("", "key", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "value", IceUtilInternal::Options::NeedArg);
-
-    const string appName = originalArgs[0];
-    vector<string> args;
-    try
-    {
-        args = opts.parse(originalArgs);
-    }
-    catch(const IceUtilInternal::BadOptException& e)
-    {
-        cerr << appName << ": " << e.reason << endl;
-        usage(appName);
-        return EXIT_FAILURE;
-    }
-
-    if(opts.isSet("help"))
-    {
-        usage(appName);
-        return EXIT_SUCCESS;
-    }
-    if(opts.isSet("version"))
-    {
-        cout << ICE_STRING_VERSION << endl;
-        return EXIT_SUCCESS;
-    }
-    if(opts.isSet("D"))
-    {
-        vector<string> optargs = opts.argVec("D");
-        for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-        {
-            oldCppArgs.push_back("-D" + *i);
-            newCppArgs.push_back("-D" + *i);
-        }
-    }
-    if(opts.isSet("U"))
-    {
-        vector<string> optargs = opts.argVec("U");
-        for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-        {
-            oldCppArgs.push_back("-U" + *i);
-            newCppArgs.push_back("-U" + *i);
-        }
-    }
-    debug = opts.isSet("debug");
-
-    underscore = opts.isSet("underscore");
-
-    if(opts.isSet("o"))
-    {
-        outputFile = opts.optArg("o");
-    }
-    ignoreTypeChanges = opts.isSet("i");
-    purgeObjects = opts.isSet("p");
-    catastrophicRecover = opts.isSet("c");
-    suppress = opts.isSet("w");
-
-    if(opts.isSet("f"))
-    {
-        inputFile = opts.optArg("f");
-    }
-    if(opts.isSet("include-old"))
-    {
-        vector<string> optargs = opts.argVec("include-old");
-        for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-        {
-            oldCppArgs.push_back("-I" + *i);
-        }
-    }
-    if(opts.isSet("include-new"))
-    {
-        vector<string> optargs = opts.argVec("include-new");
-        for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-        {
-            newCppArgs.push_back("-I" + *i);
-        }
-    }
-    if(opts.isSet("old"))
-    {
-        vector<string> optargs = opts.argVec("old");
-        for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-        {
-            oldSlice.push_back(*i);
-        }
-    }
-    if(opts.isSet("new"))
-    {
-        vector<string> optargs = opts.argVec("new");
-        for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-        {
-            newSlice.push_back(*i);
-        }
-    }
-    evictor = opts.isSet("e");
-    if(opts.isSet("key"))
-    {
-        keyTypeNames = opts.optArg("key");
-    }
-    if(opts.isSet("value"))
-    {
-        valueTypeNames = opts.optArg("value");
-    }
-
-    if(outputFile.empty())
-    {
-        if(args.size() == 2)
-        {
-            allDb = true;
-        }
-        else if(args.size() != 3)
-        {
-            usage(appName);
-            return EXIT_FAILURE;
-        }
-    }
-    else
-    {
-        if(args.size() == 1)
-        {
-            allDb = true;
-        }
-        else if(args.size() != 0)
-        {
-            usage(appName);
-            return EXIT_FAILURE;
-        }
-    }
-
-    if(allDb && (!keyTypeNames.empty() || !valueTypeNames.empty()))
-    {
-        usage(appName);
-        return EXIT_FAILURE;
-    }
-
-    if(inputFile.empty() && !allDb && !evictor && (keyTypeNames.empty() || valueTypeNames.empty()))
-    {
-        usage(appName);
-        return EXIT_FAILURE;
-    }
-
-    if(args.size() > 0)
-    {
-        dbEnvName = args[0];
-    }
-    if(args.size() > 1)
-    {
-        if(allDb)
-        {
-            dbEnvNameNew = args[1];
-        }
-        else
-        {
-            dbName = args[1];
-        }
-    }
-    if(args.size() > 2)
-    {
-        dbEnvNameNew = args[2];
-    }
-    if(args.size() > 3)
-    {
-        cerr << appName << ": too many arguments" << endl;
-        usage(appName);
-        return EXIT_FAILURE;
-    }
-
-    //
-    // Freeze creates a lock file by default to prevent multiple processes from opening
-    // the same database environment simultaneously. In the case of a read-only program
-    // such as transformdb, however, we still want to be able to open the environment despite
-    // the lock. This assumes of course that the other process has opened the environment
-    // with DbPrivate=0. If DbPrivate=0 is also set for dumpdb, we disable the lock.
-    //
-    if(!catastrophicRecover && outputFile.empty())
-    {
-        Ice::PropertiesPtr props = communicator->getProperties();
-        string prefix = "Freeze.DbEnv." + args[0];
-        if(props->getPropertyAsIntWithDefault(prefix + ".DbPrivate", 1) <= 0)
-        {
-            props->setProperty(prefix + ".LockFile", "0");
-        }
-    }
-
-    Slice::UnitPtr oldUnit = Slice::Unit::createUnit(true, true, ice, underscore);
-    FreezeScript::Destroyer<Slice::UnitPtr> oldD(oldUnit);
-    if(!FreezeScript::parseSlice(appName, oldUnit, oldSlice, oldCppArgs, debug, "-D__TRANSFORMDB__"))
-    {
-        return EXIT_FAILURE;
-    }
-
-    FreezeScript::collectCompactIds(oldUnit, resolver);
-
-    Slice::UnitPtr newUnit = Slice::Unit::createUnit(true, true, ice, underscore);
-    FreezeScript::Destroyer<Slice::UnitPtr> newD(newUnit);
-    if(!FreezeScript::parseSlice(appName, newUnit, newSlice, newCppArgs, debug, "-D__TRANSFORMDB__"))
-    {
-        return EXIT_FAILURE;
-    }
-
-    //
-    // Install the evictor types in the Slice units.
-    //
-    FreezeScript::createEvictorSliceTypes(oldUnit);
-    FreezeScript::createEvictorSliceTypes(newUnit);
-
-    //
-    // Read the catalog if necessary.
-    //
-    FreezeScript::CatalogDataMap catalog;
-    if(allDb)
-    {
-        try
-        {
-            catalog = FreezeScript::readCatalog(communicator, dbEnvName);
-        }
-        catch(const FreezeScript::FailureException& ex)
-        {
-            cerr << appName << ": " << ex.reason() << endl;
-            return EXIT_FAILURE;
-        }
-        if(catalog.empty())
-        {
-            cerr << appName << ": no databases in environment `" << dbEnvName << "'" << endl;
-            return EXIT_FAILURE;
-        }
-    }
-
-    //
-    // If no input file was provided, then we need to analyze the Slice types.
-    //
-    string descriptors;
-
-    if(inputFile.empty())
-    {
-        ostringstream out;
-        vector<string> missingTypes;
-        vector<string> analyzeErrors;
-
-        FreezeScript::TransformAnalyzer analyzer(oldUnit, newUnit, ignoreTypeChanges, out, missingTypes, analyzeErrors);
-
-        const string evictorKeyName = "::Ice::Identity";
-        const string oldEvictorValueName = "::Freeze::ObjectRecord";
-        const string newEvictorValueName = "Object";
-
-        if(allDb)
-        {
-            //
-            // Add a <database> element for each database in the catalog.
-            //
-            for(FreezeScript::CatalogDataMap::iterator p = catalog.begin(); p != catalog.end(); ++p)
-            {
-                string keyName, valueName;
-
-                if(p->second.evictor)
-                {
-                    keyName = p->second.key;
-                    valueName = p->second.value;
-
-                    if(keyName.empty())
-                    {
-                        keyName = evictorKeyName;
-                    }
-                    if(valueName.empty())
-                    {
-                        valueName = oldEvictorValueName;
-                    }
-                }
-                else
-                {
-                    keyName = p->second.key;
-                    valueName = p->second.value;
-                }
-
-                //
-                // Look up the key and value types in the old and new Slice definitions.
-                //
-                Slice::TypePtr oldKeyType = findType(oldUnit, keyName);
-                if(!oldKeyType)
-                {
-                    cerr << appName << ": type `" << keyName << "' from database `" << p->first
-                         << "' not found in old Slice definitions" << endl;
-                }
-                Slice::TypePtr newKeyType = findType(newUnit, keyName);
-                if(!newKeyType)
-                {
-                    cerr << appName << ": type `" << keyName << "' from database `" << p->first
-                         << "' not found in new Slice definitions" << endl;
-                }
-                Slice::TypePtr oldValueType = findType(oldUnit, valueName);
-                if(!oldValueType)
-                {
-                    cerr << appName << ": type `" << valueName << "' from database `" << p->first
-                         << "' not found in old Slice definitions" << endl;
-                }
-
-                Slice::TypePtr newValueType;
-                if(p->second.evictor)
-                {
-                    //
-                    // The new evictor does not keep stats
-                    //
-                    newValueType = findType(newUnit, newEvictorValueName);
-                }
-                else
-                {
-                    newValueType = findType(newUnit, valueName);
-                }
-
-                if(!newValueType)
-                {
-                    cerr << appName << ": type `" << valueName << "' from database `" << p->first
-                         << "' not found in new Slice definitions" << endl;
-                }
-
-                //
-                // If we are generating an output file, we do not consider a missing type to be
-                // an error. Since the type information comes from the catalog of the old
-                // environment, it's possible that the key or value types are not present in
-                // the new Slice definitions. Rather than abort at this point, we simply emit
-                // a partially-defined <database> element that must be edited by the user.
-                //
-                // If we are not generating an output file, we have to stop now.
-                //
-                if(outputFile.empty() && (!oldKeyType || !newKeyType || !oldValueType || !newValueType))
-                {
-                    return EXIT_FAILURE;
-                }
-
-                analyzer.addDatabase(p->first, oldKeyType, newKeyType, oldValueType, newValueType);
-            }
-        }
-        else
-        {
-            string oldKeyName, newKeyName, oldValueName, newValueName;
-
-            string::size_type pos;
-
-            if(!evictor && (keyTypeNames.empty() || valueTypeNames.empty()))
-            {
-                usage(appName);
-                return EXIT_FAILURE;
-            }
-
-            if(!keyTypeNames.empty())
-            {
-                pos = keyTypeNames.find(',');
-                if(pos == 0 || pos == keyTypeNames.size())
-                {
-                    usage(appName);
-                    return EXIT_FAILURE;
-                }
-                if(pos == string::npos)
-                {
-                    oldKeyName = keyTypeNames;
-                    newKeyName = keyTypeNames;
-                }
-                else
-                {
-                    oldKeyName = keyTypeNames.substr(0, pos);
-                    newKeyName = keyTypeNames.substr(pos + 1);
-                }
-            }
-
-            if(!valueTypeNames.empty())
-            {
-                pos = valueTypeNames.find(',');
-                if(pos == 0 || pos == valueTypeNames.size())
-                {
-                    usage(appName);
-                    return EXIT_FAILURE;
-                }
-                if(pos == string::npos)
-                {
-                    oldValueName = valueTypeNames;
-                    newValueName = valueTypeNames;
-                }
-                else
-                {
-                    oldValueName = valueTypeNames.substr(0, pos);
-                    newValueName = valueTypeNames.substr(pos + 1);
-                }
-            }
-
-            if(evictor)
-            {
-                if(oldKeyName.empty())
-                {
-                    oldKeyName = evictorKeyName;
-                }
-                if(newKeyName.empty())
-                {
-                    newKeyName = evictorKeyName;
-                }
-                if(oldValueName.empty())
-                {
-                    oldValueName = newEvictorValueName;
-                }
-                if(newValueName.empty())
-                {
-                    newValueName = newEvictorValueName;
-                }
-            }
-
-            //
-            // Look up the key and value types in the old and new Slice definitions.
-            //
-            Slice::TypePtr oldKeyType = findType(oldUnit, oldKeyName);
-            if(!oldKeyType)
-            {
-                cerr << appName << ": type `" << oldKeyName << "' not found in old Slice definitions" << endl;
-            }
-            Slice::TypePtr newKeyType = findType(newUnit, newKeyName);
-            if(!newKeyType)
-            {
-                cerr << appName << ": type `" << newKeyName << "' not found in new Slice definitions" << endl;
-            }
-            Slice::TypePtr oldValueType = findType(oldUnit, oldValueName);
-            if(!oldValueType)
-            {
-                cerr << appName << ": type `" << oldValueName << "' not found in old Slice definitions" << endl;
-            }
-            Slice::TypePtr newValueType = findType(newUnit, newValueName);
-            if(!newValueType)
-            {
-                cerr << appName << ": type `" << newValueName << "' not found in new Slice definitions" << endl;
-            }
-
-            //
-            // Stop now if any of the types could not be found.
-            //
-            if(!oldKeyType || !newKeyType || !oldValueType || !newValueType)
-            {
-                return EXIT_FAILURE;
-            }
-
-            analyzer.addDatabase("", oldKeyType, newKeyType, oldValueType, newValueType);
-        }
-
-        analyzer.finish();
-
-        if(!analyzeErrors.empty())
-        {
-            for(vector<string>::const_iterator p = analyzeErrors.begin(); p != analyzeErrors.end(); ++p)
-            {
-                cerr << appName << ": " << *p << endl;
-            }
-        }
-
-        if(!missingTypes.empty())
-        {
-            sort(missingTypes.begin(), missingTypes.end());
-            unique(missingTypes.begin(), missingTypes.end());
-            if(!analyzeErrors.empty())
-            {
-                cerr << endl;
-            }
-            cerr << "The following types had no matching definitions in the new Slice:" << endl;
-            for(vector<string>::const_iterator p = missingTypes.begin(); p != missingTypes.end(); ++p)
-            {
-                cerr << "  " << *p << endl;
-            }
-        }
-
-        if(!analyzeErrors.empty())
-        {
-            return EXIT_FAILURE;
-        }
-
-        descriptors = out.str();
-
-        if(!outputFile.empty())
-        {
-            IceUtilInternal::ofstream of(outputFile);
-            if(!of.good())
-            {
-                cerr << appName << ": unable to open file `" << outputFile << "'" << endl;
-                return EXIT_FAILURE;
-            }
-            of << descriptors;
-            of.close();
-            return EXIT_SUCCESS;
-        }
-    }
-    else
-    {
-        //
-        // Read the input file.
-        //
-        IceUtilInternal::ifstream in(inputFile);
-        char buff[1024];
-        while(true)
-        {
-            in.read(buff, 1024);
-            descriptors.append(buff, static_cast<size_t>(in.gcount()));
-            if(in.gcount() < 1024)
-            {
-                break;
-            }
-        }
-        in.close();
-    }
-
-    if(dbEnvName == dbEnvNameNew)
-    {
-        cerr << appName << ": database environment names must be different" << endl;
-        return EXIT_FAILURE;
-    }
-
-    FreezeScript::ObjectFactoryPtr objectFactory = new FreezeScript::ObjectFactory;
-    communicator->addObjectFactory(objectFactory, "");
-
-    //
-    // Transform the database.
-    //
-    DbEnv dbEnv(0);
-    DbEnv dbEnvNew(0);
-    Freeze::TransactionPtr txNew;
-    Freeze::ConnectionPtr connection;
-    Freeze::ConnectionPtr connectionNew;
-    vector<Db*> dbs;
-    int status = EXIT_SUCCESS;
-    try
-    {
-#ifdef _WIN32
-        //
-        // Berkeley DB may use a different C++ runtime.
-        //
-        dbEnv.set_alloc(::malloc, ::realloc, ::free);
-        dbEnvNew.set_alloc(::malloc, ::realloc, ::free);
-#endif
-
-        //
-        // Open the old database environment. Use DB_RECOVER_FATAL if -c is specified.
-        // No transaction is created for the old environment.
-        //
-        // DB_THREAD is for compatibility with Freeze (the catalog)
-        //
-        {
-            u_int32_t flags = DB_THREAD | DB_CREATE | DB_INIT_TXN | DB_INIT_MPOOL;
-            if(catastrophicRecover)
-            {
-                flags |= DB_INIT_LOG | DB_RECOVER_FATAL;
-            }
-            dbEnv.open(dbEnvName.c_str(), flags, FREEZE_SCRIPT_DB_MODE);
-        }
-
-        //
-        // We're creating a connection just to make sure the database environment
-        // isn't locked.
-        //
-        connection = Freeze::createConnection(communicator, dbEnvName, dbEnv);
-
-        //
-        // Open the new database environment and start a transaction.
-        //
-        //
-        // DB_THREAD is for compatibility with Freeze (the catalog)
-        //
-        {
-            u_int32_t flags = DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_RECOVER | DB_CREATE | DB_THREAD;
-            dbEnvNew.open(dbEnvNameNew.c_str(), flags, FREEZE_SCRIPT_DB_MODE);
-        }
-
-        //
-        // TODO: handle properly DbHome config (currently it will break if it's set for the new env)
-        //
-
-        //
-        // Open the catalog of the new environment, and start a transaction.
-        //
-        connectionNew = Freeze::createConnection(communicator, dbEnvNameNew, dbEnvNew);
-        txNew = connectionNew->beginTransaction();
-        DbTxn* txnNew = Freeze::getTxn(txNew);
-
-        if(allDb)
-        {
-            //
-            // Transform all databases in the old catalog.
-            //
-            for(FreezeScript::CatalogDataMap::iterator p = catalog.begin(); p != catalog.end(); ++p)
-            {
-                transformDb(p->second.evictor, communicator, objectFactory, dbEnv, dbEnvNew, p->first, connectionNew,
-                            dbs, oldUnit, newUnit, txnNew, purgeObjects, suppress, descriptors);
-            }
-        }
-        else
-        {
-            transformDb(evictor, communicator, objectFactory, dbEnv, dbEnvNew, dbName, connectionNew, dbs,
-                        oldUnit, newUnit, txnNew, purgeObjects, suppress, descriptors);
-        }
-    }
-    catch(const DbException& ex)
-    {
-        cerr << appName << ": database error: " << ex.what() << endl;
-        status = EXIT_FAILURE;
-    }
-    catch(const IceUtil::FileLockException&)
-    {
-        cerr << appName << ": error: database environment is locked" << endl;
-        status = EXIT_FAILURE;
-    }
-    catch(...)
-    {
-        try
-        {
-            if(txNew != 0)
-            {
-                txNew->rollback();
-                txNew = 0;
-            }
-            if(connectionNew)
-            {
-                connectionNew->close();
-                connectionNew = 0;
-            }
-            if(connection)
-            {
-                connection->close();
-                connection = 0;
-            }
-            for(vector<Db*>::iterator p = dbs.begin(); p != dbs.end(); ++p)
-            {
-                Db* db = *p;
-                db->close(0);
-                delete db;
-            }
-            try
-            {
-                dbEnv.close(0);
-            }
-            catch(const DbException&)
-            {
-            }
-            try
-            {
-                dbEnvNew.close(0);
-            }
-            catch(const DbException&)
-            {
-            }
-        }
-        catch(const DbException& ex)
-        {
-            cerr << appName << ": database error: " << ex.what() << endl;
-        }
-        throw;
-    }
-
-    if(txNew != 0)
-    {
-        try
-        {
-            if(status == EXIT_FAILURE)
-            {
-                txNew->rollback();
-            }
-            else
-            {
-                txNew->commit();
-
-                //
-                // Checkpoint to migrate changes from the log to the database(s).
-                //
-                dbEnvNew.txn_checkpoint(0, 0, DB_FORCE);
-            }
-
-            for(vector<Db*>::iterator p = dbs.begin(); p != dbs.end(); ++p)
-            {
-                Db* db = *p;
-                db->close(0);
-                delete db;
-            }
-        }
-        catch(const DbException& ex)
-        {
-            cerr << appName << ": database error: " << ex.what() << endl;
-            status = EXIT_FAILURE;
-        }
-    }
-    // Clear the transaction before closing the database environment.
-    txNew = 0;
-
-    if(connectionNew)
-    {
-        connectionNew->close();
-        connectionNew = 0;
-    }
-
-    if(connection)
-    {
-        connection->close();
-        connection = 0;
-    }
-
-    try
-    {
-        dbEnv.close(0);
-    }
-    catch(const DbException&)
-    {
-    }
-
-    try
-    {
-        dbEnvNew.close(0);
-    }
-    catch(const DbException&)
-    {
-    }
-
-    return status;
-}
-
-#ifdef _WIN32
-
-int
-wmain(int argc, wchar_t* argv[])
-
-#else
-
-int
-main(int argc, char* argv[])
-#endif
-{
-    Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
-    assert(args.size() > 0);
-    const string appName = args[0];
-
-    Ice::InitializationData initData;
-    FreezeScript::CompactIdResolverIPtr resolver = new FreezeScript::CompactIdResolverI;
-    initData.compactIdResolver = resolver;
-
-    Ice::CommunicatorPtr communicator;
-    int status = EXIT_SUCCESS;
-    try
-    {
-        communicator = Ice::initialize(args, initData);
-        status = run(args, communicator, resolver);
-    }
-    catch(const FreezeScript::FailureException& ex)
-    {
-        string reason = ex.reason();
-        cerr << appName << ": " << reason;
-        if(reason[reason.size() - 1] != '\n')
-        {
-            cerr << endl;
-        }
-        status = EXIT_FAILURE;
-    }
-    catch(const std::exception& ex)
-    {
-        cerr << appName << ": " << ex.what() << endl;
-        status = EXIT_FAILURE;
-    }
-    catch(...)
-    {
-        cerr << appName << ": unknown exception" << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
-
diff --git a/cpp/src/Glacier2/.depend.mak b/cpp/src/Glacier2/.depend.mak
deleted file mode 100755
index dbbebc99a67..00000000000
--- a/cpp/src/Glacier2/.depend.mak
+++ /dev/null
@@ -1,1754 +0,0 @@
-
-Instrumentation.h: \
-    Instrumentation.ice \
-    "$(slicedir)/Ice/Instrumentation.ice" \
-    "$(slicedir)/Ice/EndpointF.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice"
-
-Blobject.obj: \
-	Blobject.cpp \
-    "Blobject.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "RequestQueue.h" \
-    "Instrumentation.h" \
-    "Instance.h" \
-    "ProxyVerifier.h" \
-    "SessionRouterI.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-
-ClientBlobject.obj: \
-	ClientBlobject.cpp \
-    "ClientBlobject.h" \
-    "Blobject.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "RequestQueue.h" \
-    "Instrumentation.h" \
-    "Instance.h" \
-    "ProxyVerifier.h" \
-    "SessionRouterI.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "FilterManager.h" \
-    "FilterI.h" \
-    "RoutingTable.h" \
-
-FilterI.obj: \
-	FilterI.cpp \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "FilterI.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-
-FilterManager.obj: \
-	FilterManager.cpp \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "FilterManager.h" \
-    "Instance.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "RequestQueue.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Instrumentation.h" \
-    "ProxyVerifier.h" \
-    "SessionRouterI.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "FilterI.h" \
-
-Glacier2Router.obj: \
-	Glacier2Router.cpp \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Instance.h" \
-    "RequestQueue.h" \
-    "Instrumentation.h" \
-    "ProxyVerifier.h" \
-    "SessionRouterI.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "RouterI.h" \
-    "ClientBlobject.h" \
-    "Blobject.h" \
-    "ServerBlobject.h" \
-    "$(includedir)\Glacier2\NullPermissionsVerifier.h" \
-
-Instance.obj: \
-	Instance.cpp \
-    "SessionRouterI.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "Instrumentation.h" \
-    "Instance.h" \
-    "RequestQueue.h" \
-    "ProxyVerifier.h" \
-    "InstrumentationI.h" \
-    "$(includedir)\Ice\MetricsObserverI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\Ice\MetricsAdminI.h" \
-    "$(includedir)\Ice\MetricsFunctional.h" \
-    "$(includedir)\Glacier2\Metrics.h" \
-    "..\..\src\Ice\InstrumentationI.h" \
-
-InstrumentationI.obj: \
-	InstrumentationI.cpp \
-    "InstrumentationI.h" \
-    "$(includedir)\Ice\MetricsObserverI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\MetricsAdminI.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\MetricsFunctional.h" \
-    "Instrumentation.h" \
-    "$(includedir)\Glacier2\Metrics.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "..\..\src\Ice\InstrumentationI.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-ProxyVerifier.obj: \
-	ProxyVerifier.cpp \
-    "ProxyVerifier.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-
-RequestQueue.obj: \
-	RequestQueue.cpp \
-    "RequestQueue.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Instrumentation.h" \
-    "Instance.h" \
-    "ProxyVerifier.h" \
-    "SessionRouterI.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-
-RouterI.obj: \
-	RouterI.cpp \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "FilterManager.h" \
-    "Instance.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "RequestQueue.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Instrumentation.h" \
-    "ProxyVerifier.h" \
-    "SessionRouterI.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "FilterI.h" \
-    "RoutingTable.h" \
-    "RouterI.h" \
-    "ClientBlobject.h" \
-    "Blobject.h" \
-    "ServerBlobject.h" \
-
-RoutingTable.obj: \
-	RoutingTable.cpp \
-    "RoutingTable.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "ProxyVerifier.h" \
-    "Instrumentation.h" \
-
-ServerBlobject.obj: \
-	ServerBlobject.cpp \
-    "ServerBlobject.h" \
-    "Blobject.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "RequestQueue.h" \
-    "Instrumentation.h" \
-    "Instance.h" \
-    "ProxyVerifier.h" \
-    "SessionRouterI.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-
-SessionRouterI.obj: \
-	SessionRouterI.cpp \
-    "SessionRouterI.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "Instrumentation.h" \
-    "FilterManager.h" \
-    "Instance.h" \
-    "RequestQueue.h" \
-    "ProxyVerifier.h" \
-    "FilterI.h" \
-    "RouterI.h" \
-    "ClientBlobject.h" \
-    "Blobject.h" \
-    "ServerBlobject.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceSSL\IceSSL.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "$(includedir)\IceSSL\EndpointInfo.h" \
-
-Instrumentation.obj: \
-	Instrumentation.cpp \
-    "Instrumentation.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
diff --git a/cpp/src/Glacier2/.gitignore b/cpp/src/Glacier2/.gitignore
deleted file mode 100644
index 093e464bbf3..00000000000
--- a/cpp/src/Glacier2/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
-Instrumentation.cpp
-Instrumentation.h
diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc
index 2d5801f077c..289e5299cbf 100644
--- a/cpp/src/Glacier2/Glacier2Router.rc
+++ b/cpp/src/Glacier2/Glacier2Router.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Glacier2 Router\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "glacier2router\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "glacier2router.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2/Instance.cpp b/cpp/src/Glacier2/Instance.cpp
index e21f265775b..2f1b83d49f4 100644
--- a/cpp/src/Glacier2/Instance.cpp
+++ b/cpp/src/Glacier2/Instance.cpp
@@ -25,7 +25,7 @@ const string clientBuffered = "Glacier2.Client.Buffered";
 
 }
 
-Glacier2::Instance::Instance(const Ice::CommunicatorPtr& communicator, const Ice::ObjectAdapterPtr& clientAdapter, 
+Glacier2::Instance::Instance(const Ice::CommunicatorPtr& communicator, const Ice::ObjectAdapterPtr& clientAdapter,
                              const Ice::ObjectAdapterPtr& serverAdapter) :
     _communicator(communicator),
     _properties(communicator->getProperties()),
@@ -69,12 +69,12 @@ Glacier2::Instance::Instance(const Ice::CommunicatorPtr& communicator, const Ice
     // If an Ice metrics observer is setup on the communicator, also
     // enable metrics for IceStorm.
     //
-    IceInternal::CommunicatorObserverIPtr o = 
+    IceInternal::CommunicatorObserverIPtr o =
         IceInternal::CommunicatorObserverIPtr::dynamicCast(communicator->getObserver());
     if(o)
     {
-        const_cast<Glacier2::Instrumentation::RouterObserverPtr&>(_observer) = 
-            new RouterObserverI(o->getFacet(), 
+        const_cast<Glacier2::Instrumentation::RouterObserverPtr&>(_observer) =
+            new RouterObserverI(o->getFacet(),
                                 _properties->getPropertyWithDefault("Glacier2.InstanceName", "Glacier2"));
     }
 }
@@ -90,7 +90,7 @@ Glacier2::Instance::destroy()
     {
         _clientRequestQueueThread->destroy();
     }
-    
+
     if(_serverRequestQueueThread)
     {
         _serverRequestQueueThread->destroy();
diff --git a/cpp/src/Glacier2/Makefile b/cpp/src/Glacier2/Makefile
deleted file mode 100644
index 461dda303fa..00000000000
--- a/cpp/src/Glacier2/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-ROUTER		= $(bindir)/glacier2router
-TARGETS         = $(ROUTER)
-
-SLICE_OBJS      = Instrumentation.o
-
-OBJS		= Blobject.o \
-		  ClientBlobject.o \
-		  FilterI.o \
-		  FilterManager.o \
-		  Glacier2Router.o \
-		  Instance.o \
-		  InstrumentationI.o \
-		  ProxyVerifier.o \
-		  RequestQueue.o \
-		  RouterI.o \
-		  RoutingTable.o \
-		  ServerBlobject.o \
-		  SessionRouterI.o \
-                  $(SLICE_OBJS)
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I.. $(CPPFLAGS)
-SLICE2CPPFLAGS	:= --include-dir Glacier2 $(SLICE2CPPFLAGS)
-
-$(ROUTER): $(OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) -lGlacier2 $(LIBS) -lIceSSL $(OPENSSL_RPATH_LINK)
-
-install:: all
-	$(call installprogram,$(ROUTER),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/glacier2router.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/Glacier2/Makefile.mak b/cpp/src/Glacier2/Makefile.mak
deleted file mode 100644
index 2a72c23db4d..00000000000
--- a/cpp/src/Glacier2/Makefile.mak
+++ /dev/null
@@ -1,66 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-ROUTER		= $(top_srcdir)\bin\glacier2router.exe
-TARGETS         = $(ROUTER)
-
-SLICE_OBJS      = .\Instrumentation.obj
-
-OBJS		= .\Blobject.obj \
-		  .\ClientBlobject.obj \
-		  .\FilterI.obj \
-		  .\FilterManager.obj \
-		  .\Glacier2Router.obj \
-		  .\Instance.obj \
-		  .\InstrumentationI.obj \
-		  .\ProxyVerifier.obj \
-		  .\RequestQueue.obj \
-		  .\RouterI.obj \
-		  .\RoutingTable.obj \
-		  .\ServerBlobject.obj \
-		  .\SessionRouterI.obj \
-		  $(SLICE_OBJS)
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-SLICE2CPPFLAGS	= --include-dir Glacier2 $(SLICE2CPPFLAGS)
-
-LINKWITH 	= $(LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(ROUTER:.exe=.pdb)
-!endif
-
-RES_FILE       = Glacier2Router.res
-
-$(ROUTER): $(OBJS) Glacier2Router.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-        -del /q Instrumentation.cpp Instrumentation.h
-	-del /q Glacier2Router.res
-	-del /q $(ROUTER:.exe=.*)
-
-install:: all
-	copy $(ROUTER) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(ROUTER:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/Glacier2/Makefile.mk b/cpp/src/Glacier2/Makefile.mk
new file mode 100644
index 00000000000..f9842010231
--- /dev/null
+++ b/cpp/src/Glacier2/Makefile.mk
@@ -0,0 +1,17 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_programs		:= glacier2router
+$(project)_sliceflags		:= --include-dir Glacier2
+$(project)_generated_includedir := $(project)/generated/Glacier2
+$(project)_dependencies		:= Glacier2 IceSSL Ice
+
+glacier2router_targetdir	:= $(bindir)
+
+projects += $(project)
diff --git a/cpp/src/Glacier2/RouterI.h b/cpp/src/Glacier2/RouterI.h
index b8fed02fc33..67944d6524e 100644
--- a/cpp/src/Glacier2/RouterI.h
+++ b/cpp/src/Glacier2/RouterI.h
@@ -38,8 +38,8 @@ public:
 
     void destroy(const Callback_Session_destroyPtr&);
 
-    virtual Ice::ObjectPrx getClientProxy(const Ice::Current& = Ice::Current()) const;
-    virtual Ice::ObjectPrx getServerProxy(const Ice::Current& = Ice::Current()) const;
+    virtual Ice::ObjectPrx getClientProxy(const Ice::Current& = Ice::noExplicitCurrent) const;
+    virtual Ice::ObjectPrx getServerProxy(const Ice::Current& = Ice::noExplicitCurrent) const;
     virtual Ice::ObjectProxySeq addProxies(const Ice::ObjectProxySeq&, const Ice::Current&);
     virtual std::string getCategoryForClient(const Ice::Current&) const;
     virtual void createSession_async(const AMD_Router_createSessionPtr&, const std::string&, const std::string&,
diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp
index 4de4a8888d1..4d46d210726 100644
--- a/cpp/src/Glacier2/SessionRouterI.cpp
+++ b/cpp/src/Glacier2/SessionRouterI.cpp
@@ -1,3 +1,4 @@
+
 // **********************************************************************
 //
 // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
@@ -36,7 +37,7 @@ public:
 
     void
     finished(const Ice::AsyncResultPtr& r)
-    {  
+    {
         Ice::ObjectPrx o = r->getProxy();
         try
         {
@@ -68,7 +69,7 @@ public:
 
     void
     finished(const Ice::AsyncResultPtr& r)
-    {  
+    {
         Ice::ObjectPrx o = r->getProxy();
         try
         {
@@ -84,12 +85,27 @@ public:
             _router->destroySession(_connection);
         }
     }
-    
+
 private:
 
     const SessionRouterIPtr _router;
     const Ice::ConnectionPtr _connection;
 };
+
+Ice::IPConnectionInfoPtr
+getIPConnectionInfo(const Ice::ConnectionInfoPtr& info)
+{
+    for(Ice::ConnectionInfoPtr p = info; p; p = p->underlying)
+    {
+        Ice::IPConnectionInfoPtr ipInfo = Ice::IPConnectionInfoPtr::dynamicCast(p);
+        if(ipInfo)
+        {
+            return ipInfo;
+        }
+    }
+    return ICE_NULLPTR;
+}
+
 }
 
 namespace Glacier2
@@ -99,7 +115,7 @@ class SessionControlI : public SessionControl
 {
 public:
 
-    SessionControlI(const SessionRouterIPtr& sessionRouter, const ConnectionPtr& connection, 
+    SessionControlI(const SessionRouterIPtr& sessionRouter, const ConnectionPtr& connection,
                     const FilterManagerPtr& filterManager) :
         _sessionRouter(sessionRouter),
         _connection(connection),
@@ -122,7 +138,7 @@ public:
     virtual IdentitySetPrx
     identities(const Current&)
     {
-        return _filters->identitiesPrx(); 
+        return _filters->identitiesPrx();
     }
 
     virtual int
@@ -130,7 +146,7 @@ public:
     {
         return static_cast<int>(_sessionRouter->getSessionTimeout(current));
     }
-    
+
     virtual void
     destroy(const Current&)
     {
@@ -153,7 +169,7 @@ public:
         _sessionRouter(sessionRouter)
     {
     }
-    
+
     virtual ObjectPtr
     locate(const Current& current, LocalObjectPtr&)
     {
@@ -183,7 +199,7 @@ public:
         _sessionRouter(sessionRouter)
     {
     }
-    
+
     virtual ObjectPtr
     locate(const Current& current, LocalObjectPtr&)
     {
@@ -209,14 +225,14 @@ class UserPasswordCreateSession : public CreateSession
 {
 public:
 
-    UserPasswordCreateSession(const AMD_Router_createSessionPtr& amdCB, const string& user, const string& password, 
+    UserPasswordCreateSession(const AMD_Router_createSessionPtr& amdCB, const string& user, const string& password,
                               const Ice::Current& current, const SessionRouterIPtr& sessionRouter) :
         CreateSession(sessionRouter, user, current),
-        _amdCB(amdCB), 
+        _amdCB(amdCB),
         _password(password)
     {
     }
-    
+
 
     void
     checkPermissionsResponse(bool ok, const string& reason)
@@ -251,7 +267,7 @@ public:
 
         Ice::Context ctx = _current.ctx;
         ctx.insert(_context.begin(), _context.end());
-        
+
         _sessionRouter->_verifier->begin_checkPermissions(_user, _password, ctx,
                                                           newCallback_PermissionsVerifier_checkPermissions(this,
                                                                 &UserPasswordCreateSession::checkPermissionsResponse,
@@ -272,10 +288,10 @@ public:
         _sessionRouter->_sessionManager->begin_create(_user, _control, ctx,
                                                       newCallback_SessionManager_create(
                                                                         static_cast<CreateSession*>(this),
-                                                                        &CreateSession::sessionCreated, 
+                                                                        &CreateSession::sessionCreated,
                                                                         &CreateSession::createException));
     }
-    
+
     virtual void
     finished(const SessionPrx& session)
     {
@@ -298,14 +314,14 @@ class SSLCreateSession : public CreateSession
 {
 public:
 
-    SSLCreateSession(const AMD_Router_createSessionFromSecureConnectionPtr& amdCB, const string& user, 
+    SSLCreateSession(const AMD_Router_createSessionFromSecureConnectionPtr& amdCB, const string& user,
                      const SSLInfo& sslInfo, const Ice::Current& current, const SessionRouterIPtr& sessionRouter) :
         CreateSession(sessionRouter, user, current),
-        _amdCB(amdCB), 
+        _amdCB(amdCB),
         _sslInfo(sslInfo)
     {
     }
-    
+
     void
     authorizeResponse(bool ok, const string& reason)
     {
@@ -339,9 +355,9 @@ public:
 
         Ice::Context ctx = _current.ctx;
         ctx.insert(_context.begin(), _context.end());
-        _sessionRouter->_sslVerifier->begin_authorize(_sslInfo, ctx, 
+        _sessionRouter->_sslVerifier->begin_authorize(_sslInfo, ctx,
                                                       newCallback_SSLPermissionsVerifier_authorize(this,
-                                                                             &SSLCreateSession::authorizeResponse, 
+                                                                             &SSLCreateSession::authorizeResponse,
                                                                              &SSLCreateSession::authorizeException));
     }
 
@@ -359,10 +375,10 @@ public:
         _sessionRouter->_sslSessionManager->begin_create(_sslInfo, _control, ctx,
                                                          newCallback_SSLSessionManager_create(
                                                                         static_cast<CreateSession*>(this),
-                                                                        &CreateSession::sessionCreated, 
+                                                                        &CreateSession::sessionCreated,
                                                                         &CreateSession::createException));
     }
-    
+
     virtual void
     finished(const SessionPrx& session)
     {
@@ -381,32 +397,45 @@ private:
     const SSLInfo _sslInfo;
 };
 
-class ConnectionCallbackI : public Ice::ConnectionCallback
+class CloseCallbackI : public Ice::CloseCallback
 {
 public:
 
-    ConnectionCallbackI(const SessionRouterIPtr& sessionRouter) : _sessionRouter(sessionRouter)
+    CloseCallbackI(const SessionRouterIPtr& sessionRouter) : _sessionRouter(sessionRouter)
     {
     }
-    
+
     virtual void
-    heartbeat(const Ice::ConnectionPtr& connection)
+    closed(const Ice::ConnectionPtr& connection)
     {
         try
         {
-            _sessionRouter->refreshSession(connection);
+            _sessionRouter->destroySession(connection);
         }
         catch(const Ice::Exception&)
         {
         }
     }
 
+private:
+
+    const SessionRouterIPtr _sessionRouter;
+};
+
+class HeartbeatCallbackI : public Ice::HeartbeatCallback
+{
+public:
+
+    HeartbeatCallbackI(const SessionRouterIPtr& sessionRouter) : _sessionRouter(sessionRouter)
+    {
+    }
+
     virtual void
-    closed(const Ice::ConnectionPtr& connection)
+    heartbeat(const Ice::ConnectionPtr& connection)
     {
         try
         {
-            _sessionRouter->destroySession(connection);
+            _sessionRouter->refreshSession(connection);
         }
         catch(const Ice::Exception&)
         {
@@ -430,7 +459,7 @@ CreateSession::CreateSession(const SessionRouterIPtr& sessionRouter, const strin
     {
         _context["_con.type"] = current.con->type();
         {
-            Ice::IPConnectionInfoPtr info = Ice::IPConnectionInfoPtr::dynamicCast(current.con->getInfo());
+            Ice::IPConnectionInfoPtr info = getIPConnectionInfo(current.con->getInfo());
             if(info)
             {
                 ostringstream os;
@@ -571,7 +600,7 @@ CreateSession::sessionCreated(const SessionPrx& session)
     // Notify the router that the creation is finished.
     //
     try
-    {    
+    {
         _sessionRouter->finishCreateSession(_current.con, router);
         finished(session);
     }
@@ -601,13 +630,13 @@ void
 CreateSession::exception(const Ice::Exception& ex)
 {
     try
-    {    
+    {
         _sessionRouter->finishCreateSession(_current.con, 0);
     }
     catch(const Ice::Exception&)
     {
     }
-        
+
     finished(ex);
 
     if(_control)
@@ -640,7 +669,8 @@ SessionRouterI::SessionRouterI(const InstancePtr& instance,
     _sslVerifier(sslVerifier),
     _sslSessionManager(sslSessionManager),
     _sessionTimeout(IceUtil::Time::seconds(_instance->properties()->getPropertyAsInt("Glacier2.SessionTimeout"))),
-    _connectionCallback(new ConnectionCallbackI(this)),
+    _closeCallback(new CloseCallbackI(this)),
+    _heartbeatCallback(new HeartbeatCallbackI(this)),
     _sessionThread(_sessionTimeout > IceUtil::Time() ? new SessionThread(this, _sessionTimeout) : 0),
     _routersByConnectionHint(_routersByConnection.end()),
     _routersByCategoryHint(_routersByCategory.end()),
@@ -671,7 +701,7 @@ SessionRouterI::SessionRouterI(const InstancePtr& instance,
         // a router servant based on connection information.
         //
         _instance->clientObjectAdapter()->addServantLocator(new ClientLocator(this), "");
-        
+
         //
         // If there is a server object adapter, all calls on this adapter
         // are dispatched to a router servant based on the category field
@@ -709,21 +739,22 @@ SessionRouterI::destroy()
     Callback_Session_destroyPtr destroyCallback;
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
-        
+
         assert(!_destroy);
         _destroy = true;
         notify();
-        
+
         _routersByConnection.swap(routers);
         _routersByConnectionHint = _routersByConnection.end();
-        
+
         _routersByCategory.clear();
         _routersByCategoryHint = _routersByCategory.end();
-        
+
         sessionThread = _sessionThread;
         _sessionThread = 0;
 
-        _connectionCallback = 0;
+        _closeCallback = 0;
+        _heartbeatCallback = 0;
 
         swap(destroyCallback, _sessionDestroyCallback); // Break cyclic reference count.
     }
@@ -780,7 +811,7 @@ SessionRouterI::getCategoryForClient(const Ice::Current& current) const
 }
 
 void
-SessionRouterI::createSession_async(const AMD_Router_createSessionPtr& amdCB, const std::string& userId, 
+SessionRouterI::createSession_async(const AMD_Router_createSessionPtr& amdCB, const std::string& userId,
                                               const std::string& password, const Current& current)
 {
     if(!_verifier)
@@ -817,10 +848,11 @@ SessionRouterI::createSessionFromSecureConnection_async(
             amdCB->ice_exception(PermissionDeniedException("not ssl connection"));
             return;
         }
-        sslinfo.remotePort = info->remotePort;
-        sslinfo.remoteHost = info->remoteAddress;
-        sslinfo.localPort = info->localPort;
-        sslinfo.localHost = info->localAddress;
+        Ice::IPConnectionInfoPtr ipInfo = getIPConnectionInfo(info);
+        sslinfo.remotePort = ipInfo->remotePort;
+        sslinfo.remoteHost = ipInfo->remoteAddress;
+        sslinfo.localPort = ipInfo->localPort;
+        sslinfo.localHost = ipInfo->localAddress;
         sslinfo.cipher = info->cipher;
         sslinfo.certs = info->certs;
         if(info->certs.size() > 0)
@@ -913,14 +945,14 @@ SessionRouterI::destroySession(const ConnectionPtr& connection)
 
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
-        
+
         if(_destroy)
         {
             throw ObjectNotExistException(__FILE__, __LINE__);
         }
-        
-        map<ConnectionPtr, RouterIPtr>::iterator p;    
-        
+
+        map<ConnectionPtr, RouterIPtr>::iterator p;
+
         if(_routersByConnectionHint != _routersByConnection.end() && _routersByConnectionHint->first == connection)
         {
             p = _routersByConnectionHint;
@@ -929,17 +961,17 @@ SessionRouterI::destroySession(const ConnectionPtr& connection)
         {
             p = _routersByConnection.find(connection);
         }
-        
+
         if(p == _routersByConnection.end())
         {
             throw SessionNotExistException();
         }
-        
+
         router = p->second;
 
         _routersByConnection.erase(p++);
         _routersByConnectionHint = p;
-        
+
         if(_instance->serverObjectAdapter())
         {
             string category = router->getServerProxy(Current())->ice_getIdentity().category;
@@ -973,7 +1005,7 @@ SessionRouterI::getACMTimeout(const Ice::Current& current) const
     return current.con->getACM().timeout;
 }
 
-void 
+void
 SessionRouterI::updateSessionObservers()
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
@@ -984,7 +1016,7 @@ SessionRouterI::updateSessionObservers()
     for(map<ConnectionPtr, RouterIPtr>::iterator p = _routersByConnection.begin(); p != _routersByConnection.end(); ++p)
     {
         p->second->updateObserver(observer);
-    }   
+    }
 }
 
 RouterIPtr
@@ -1017,7 +1049,7 @@ SessionRouterI::getServerBlobject(const string& category) const
     {
         return _routersByCategoryHint->second->getServerBlobject();
     }
-    
+
     map<string, RouterIPtr>::iterator p = routers.find(category);
 
     if(p != routers.end())
@@ -1035,30 +1067,30 @@ void
 SessionRouterI::expireSessions()
 {
     vector<RouterIPtr> routers;
-    
+
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
-        
+
         if(_destroy)
         {
             return;
         }
-        
+
         assert(_sessionTimeout > IceUtil::Time());
         IceUtil::Time minTimestamp = IceUtil::Time::now(IceUtil::Time::Monotonic) - _sessionTimeout;
-        
+
         map<ConnectionPtr, RouterIPtr>::iterator p = _routersByConnection.begin();
-        
+
         while(p != _routersByConnection.end())
         {
             if(p->second->getTimestamp() < minTimestamp)
             {
                 RouterIPtr router = p->second;
                 routers.push_back(router);
-                
+
                 _routersByConnection.erase(p++);
                 _routersByConnectionHint = p;
-                
+
                 if(_instance->serverObjectAdapter())
                 {
                     string category = router->getServerProxy(Current())->ice_getIdentity().category;
@@ -1073,7 +1105,7 @@ SessionRouterI::expireSessions()
             }
         }
     }
-    
+
     //
     // We destroy the expired routers outside the thread
     // synchronization, to avoid deadlocks.
@@ -1104,7 +1136,7 @@ SessionRouterI::getRouterImpl(const ConnectionPtr& connection, const Ice::Identi
         _routersByConnectionHint->second->updateTimestamp();
         return _routersByConnectionHint->second;
     }
-    
+
     map<ConnectionPtr, RouterIPtr>::iterator p = routers.find(connection);
 
     if(p != routers.end())
@@ -1141,7 +1173,7 @@ bool
 SessionRouterI::startCreateSession(const CreateSessionPtr& cb, const ConnectionPtr& connection)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
-        
+
     if(_destroy)
     {
         CannotCreateSessionException exc;
@@ -1153,7 +1185,7 @@ SessionRouterI::startCreateSession(const CreateSessionPtr& cb, const ConnectionP
     // Check whether a session already exists for the connection.
     //
     {
-        map<ConnectionPtr, RouterIPtr>::iterator p;    
+        map<ConnectionPtr, RouterIPtr>::iterator p;
         if(_routersByConnectionHint != _routersByConnection.end() &&
            _routersByConnectionHint->first == connection)
         {
@@ -1163,7 +1195,7 @@ SessionRouterI::startCreateSession(const CreateSessionPtr& cb, const ConnectionP
         {
             p = _routersByConnection.find(connection);
         }
-            
+
         if(p != _routersByConnection.end())
         {
             CannotCreateSessionException exc;
@@ -1198,14 +1230,14 @@ void
 SessionRouterI::finishCreateSession(const ConnectionPtr& connection, const RouterIPtr& router)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
-    
+
     //
     // Signal other threads that we are done with trying to
     // establish a session for our connection;
     //
     _pending.erase(connection);
     notify();
-    
+
     if(!router)
     {
         return;
@@ -1219,21 +1251,22 @@ SessionRouterI::finishCreateSession(const ConnectionPtr& connection, const Route
         exc.reason = "router is shutting down";
         throw exc;
     }
-    
+
     _routersByConnectionHint = _routersByConnection.insert(
         _routersByConnectionHint, pair<const ConnectionPtr, RouterIPtr>(connection, router));
-    
+
     if(_instance->serverObjectAdapter())
     {
         string category = router->getServerProxy()->ice_getIdentity().category;
         assert(!category.empty());
-        pair<map<string, RouterIPtr>::iterator, bool> rc = 
+        pair<map<string, RouterIPtr>::iterator, bool> rc =
             _routersByCategory.insert(pair<const string, RouterIPtr>(category, router));
         assert(rc.second);
         _routersByCategoryHint = rc.first;
     }
 
-    connection->setCallback(_connectionCallback);
+    connection->setCloseCallback(_closeCallback);
+    connection->setHeartbeatCallback(_heartbeatCallback);
 
     if(_sessionTraceLevel >= 1)
     {
@@ -1277,7 +1310,7 @@ SessionRouterI::SessionThread::run()
             {
                 return;
             }
-            
+
             assert(_sessionTimeout > IceUtil::Time());
             timedWait(_sessionTimeout / 4);
 
diff --git a/cpp/src/Glacier2/SessionRouterI.h b/cpp/src/Glacier2/SessionRouterI.h
index 21267a5ba4d..1280a38af6a 100644
--- a/cpp/src/Glacier2/SessionRouterI.h
+++ b/cpp/src/Glacier2/SessionRouterI.h
@@ -148,7 +148,8 @@ private:
     const SSLSessionManagerPrx _sslSessionManager;
 
     IceUtil::Time _sessionTimeout;
-    Ice::ConnectionCallbackPtr _connectionCallback;
+    Ice::CloseCallbackPtr _closeCallback;
+    Ice::HeartbeatCallbackPtr _heartbeatCallback;
 
     class SessionThread : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex>
     {
diff --git a/cpp/src/Glacier2/msbuild/glacier2router.vcxproj b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj
new file mode 100644
index 00000000000..5a539906a45
--- /dev/null
+++ b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{541CF1D6-95FD-4499-AB02-75CCCEE660B0}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\Glacier2</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>Glacier2</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Glacier2Router.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\Instrumentation.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Blobject.cpp" />
+    <ClCompile Include="..\ClientBlobject.cpp" />
+    <ClCompile Include="..\FilterI.cpp" />
+    <ClCompile Include="..\FilterManager.cpp" />
+    <ClCompile Include="..\Glacier2Router.cpp" />
+    <ClCompile Include="..\Instance.cpp" />
+    <ClCompile Include="..\InstrumentationI.cpp" />
+    <ClCompile Include="..\ProxyVerifier.cpp" />
+    <ClCompile Include="..\RequestQueue.cpp" />
+    <ClCompile Include="..\RouterI.cpp" />
+    <ClCompile Include="..\RoutingTable.cpp" />
+    <ClCompile Include="..\ServerBlobject.cpp" />
+    <ClCompile Include="..\SessionRouterI.cpp" />
+    <ClCompile Include="Win32\Debug\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Blobject.h" />
+    <ClInclude Include="..\ClientBlobject.h" />
+    <ClInclude Include="..\FilterI.h" />
+    <ClInclude Include="..\FilterManager.h" />
+    <ClInclude Include="..\Instance.h" />
+    <ClInclude Include="..\InstrumentationI.h" />
+    <ClInclude Include="..\ProxyVerifier.h" />
+    <ClInclude Include="..\RequestQueue.h" />
+    <ClInclude Include="..\RouterI.h" />
+    <ClInclude Include="..\RoutingTable.h" />
+    <ClInclude Include="..\ServerBlobject.h" />
+    <ClInclude Include="..\SessionRouterI.h" />
+    <ClInclude Include="Win32\Debug\Glacier2\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\Glacier2\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\Glacier2\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\Glacier2\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+</Project>
\ No newline at end of file
diff --git a/cpp/src/Glacier2/msbuild/glacier2router.vcxproj.filters b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj.filters
new file mode 100644
index 00000000000..32d1b35d555
--- /dev/null
+++ b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj.filters
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{2c792cd9-46aa-4014-b0cb-6b9ec531b082}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{a2437d6c-f081-4431-bcf3-19386733a887}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{45adecc6-30b2-4c0f-b0af-8a3277d622a9}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{6f4234e4-0b95-4729-8684-9120bbbf5333}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{ad61a23c-7903-43d5-8f8d-5c9e64240b7f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{4a916c42-a3d5-4304-9041-30f0dc408f7e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{1b6508f4-16e4-4c61-a197-c0a6b62ec409}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{2ba5dc85-03c9-4d87-916b-8ea8de5efe45}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{e9f4b7da-ad28-44d4-b9eb-eca89e8a4523}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{68aa0c72-1316-4517-af28-15b70488e2f9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{1d44817e-252e-4717-8d52-a4e5494f6c31}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{6dd437da-b9f4-44ab-ba8e-ca1b39bca1a5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{783856ad-9729-44ed-8574-8a43fa4c4545}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{fc1387ee-6e8c-4a94-a113-efdc1ad60d42}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{128d03e6-4af9-4798-972d-e04d97412c83}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{eb1f0832-078d-4eb1-b6e6-16604ea60007}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Glacier2Router.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\Instrumentation.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Blobject.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ClientBlobject.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\FilterI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\FilterManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Glacier2Router.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="..\ProxyVerifier.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\RequestQueue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\RouterI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\RoutingTable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ServerBlobject.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\SessionRouterI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Instrumentation.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Instrumentation.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Instrumentation.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Instrumentation.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Blobject.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ClientBlobject.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\FilterI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\FilterManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Instance.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\InstrumentationI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ProxyVerifier.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\RequestQueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\RouterI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\RoutingTable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ServerBlobject.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\SessionRouterI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\Glacier2\Instrumentation.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\Glacier2\Instrumentation.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\Glacier2\Instrumentation.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\Glacier2\Instrumentation.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak
deleted file mode 100755
index 04379acb469..00000000000
--- a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak
+++ /dev/null
@@ -1,135 +0,0 @@
-
-CryptPermissionsVerifierI.obj: \
-	CryptPermissionsVerifierI.cpp \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/.gitignore b/cpp/src/Glacier2CryptPermissionsVerifier/.gitignore
deleted file mode 100644
index 720f44c7047..00000000000
--- a/cpp/src/Glacier2CryptPermissionsVerifier/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc
index 3d7ba3eacc8..b20db50977c 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Glacier2CryptPermissionsVerifier C++ Plug-in\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile
deleted file mode 100644
index ebd42abf31e..00000000000
--- a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME     = $(call mklibfilename,Glacier2CryptPermissionsVerifier,$(VERSION))
-SONAME          = $(call mksoname,Glacier2CryptPermissionsVerifier,$(SOVERSION))  
-LIBNAME		= $(call mklibname,Glacier2CryptPermissionsVerifier)
-
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-
-OBJS		= CryptPermissionsVerifierI.o
-
-SRCS		= $(OBJS:.o=.cpp)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I.. $(CPPFLAGS) -DCRYPT_PERMISSIONS_VERIFIER_API_EXPORTS
-
-LINKWITH        := $(BZIP2_RPATH_LINK) -lIce -lIceUtil -lGlacier2 $(CRYPT_OS_LIBS) $(CXXLIBS)
-
-$(libdir)/$(LIBFILENAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	@mkdir -p $(libdir)$(cpp11libdirsuffix)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mak b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mak
deleted file mode 100644
index 76107d90611..00000000000
--- a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mak
+++ /dev/null
@@ -1,55 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME		= $(top_srcdir)\lib\glacier2cryptpermissionsverifier$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\glacier2cryptpermissionsverifier$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-OBJS		= .\CryptPermissionsVerifierI.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -DCRYPT_PERMISSIONS_VERIFIER_API_EXPORTS
-
-LINKWITH	= $(LIBS) crypt32.lib bcrypt.lib
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS	= /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE	= CryptPermissionsVerifier.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) CryptPermissionsVerifier.res
-	$(LINK) $(BASE):0x2D000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	-del /q CryptPermissionsVerifier.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
new file mode 100644
index 00000000000..928325bcb79
--- /dev/null
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
@@ -0,0 +1,16 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries 				+= Glacier2CryptPermissionsVerifier
+
+Glacier2CryptPermissionsVerifier_targetdir	:= $(libdir)
+Glacier2CryptPermissionsVerifier_dependencies	:= Glacier2 Ice
+Glacier2CryptPermissionsVerifier_cppflags	:= -DCRYPT_PERMISSIONS_VERIFIER_API_EXPORTS
+
+projects += $(project)
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier.vcxproj b/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier.vcxproj
new file mode 100644
index 00000000000..d3c49eac23f
--- /dev/null
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier.vcxproj
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}</ProjectGuid>
+    <RootNamespace>Glacier2CryptPermissionsVerifier</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>CRYPT_PERMISSIONS_VERIFIER_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>crypt32.lib;bcrypt.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>CRYPT_PERMISSIONS_VERIFIER_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>crypt32.lib;bcrypt.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>CRYPT_PERMISSIONS_VERIFIER_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>crypt32.lib;bcrypt.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>CRYPT_PERMISSIONS_VERIFIER_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>crypt32.lib;bcrypt.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\CryptPermissionsVerifierI.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\CryptPermissionsVerifier.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier.vcxproj.filters b/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier.vcxproj.filters
new file mode 100644
index 00000000000..da61870bc3c
--- /dev/null
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier.vcxproj.filters
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{a7b5adff-15af-48c2-9491-a6fbe9b5ed99}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{7bcfbb57-99ea-410a-be73-9059546f3b4d}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{6c7fbad5-7deb-4d8b-b0c7-4452a2cb7ed0}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\CryptPermissionsVerifierI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\CryptPermissionsVerifier.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/Glacier2Lib/.depend.mak b/cpp/src/Glacier2Lib/.depend.mak
deleted file mode 100755
index 86d87da9935..00000000000
--- a/cpp/src/Glacier2Lib/.depend.mak
+++ /dev/null
@@ -1,945 +0,0 @@
-
-Metrics.h: \
-    "$(slicedir)\Glacier2\Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-PermissionsVerifierF.h: \
-    "$(slicedir)\Glacier2\PermissionsVerifierF.ice"
-
-PermissionsVerifier.h: \
-    "$(slicedir)\Glacier2\PermissionsVerifier.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-Router.h: \
-    "$(slicedir)\Glacier2\Router.ice" \
-    "$(slicedir)/Ice/Router.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/Glacier2/PermissionsVerifier.ice"
-
-RouterF.h: \
-    "$(slicedir)\Glacier2\RouterF.ice"
-
-Session.h: \
-    "$(slicedir)\Glacier2\Session.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice"
-
-SSLInfo.h: \
-    "$(slicedir)\Glacier2\SSLInfo.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-Application.obj: \
-	Application.cpp \
-    "$(includedir)\Glacier2\Application.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "..\..\src\IceUtil\ArgVector.h" \
-
-NullPermissionsVerifier.obj: \
-	NullPermissionsVerifier.cpp \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\NullPermissionsVerifier.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-
-SessionHelper.obj: \
-	SessionHelper.cpp \
-    "$(includedir)\Glacier2\SessionHelper.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-Metrics.obj: \
-	Metrics.cpp \
-    "$(includedir)\Glacier2\Metrics.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-PermissionsVerifierF.obj: \
-	PermissionsVerifierF.cpp \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-PermissionsVerifier.obj: \
-	PermissionsVerifier.cpp \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-
-Router.obj: \
-	Router.cpp \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-
-RouterF.obj: \
-	RouterF.cpp \
-    "$(includedir)\Glacier2\RouterF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-Session.obj: \
-	Session.cpp \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-
-SSLInfo.obj: \
-	SSLInfo.cpp \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
diff --git a/cpp/src/Glacier2Lib/.gitignore b/cpp/src/Glacier2Lib/.gitignore
deleted file mode 100644
index 95b4c5cf67d..00000000000
--- a/cpp/src/Glacier2Lib/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
-Metrics.cpp
-PermissionsVerifierF.cpp
-PermissionsVerifier.cpp
-Router.cpp
-RouterF.cpp
-Session.cpp
-SSLInfo.cpp
-Metrics.h
-PermissionsVerifierF.h
-PermissionsVerifier.h
-Router.h
-RouterF.h
-Session.h
-SSLInfo.h
diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp
index 2ac15f71f0b..b9598c21ceb 100644
--- a/cpp/src/Glacier2Lib/Application.cpp
+++ b/cpp/src/Glacier2Lib/Application.cpp
@@ -13,53 +13,50 @@
 
 using namespace std;
 using namespace Ice;
-    
+
 Ice::ObjectAdapterPtr Glacier2::Application::_adapter;
-Glacier2::RouterPrx Glacier2::Application::_router;
-Glacier2::SessionPrx Glacier2::Application::_session;
+Glacier2::RouterPrxPtr Glacier2::Application::_router;
+Glacier2::SessionPrxPtr Glacier2::Application::_session;
 bool Glacier2::Application::_createdSession = false;
 string Glacier2::Application::_category;
 
 namespace
 {
-
-class ConnectionCallbackI : public Ice::ConnectionCallback
+#ifndef ICE_CPP11_MAPPING // C++98
+class CloseCallbackI : public Ice::CloseCallback
 {
 public:
 
-    ConnectionCallbackI(Glacier2::Application* app) : _app(app)
+    CloseCallbackI(Glacier2::Application* app) : _app(app)
     {
     }
 
     virtual void
-    heartbeat(const Ice::ConnectionPtr&)
-    {
-    }
-
-    virtual void 
     closed(const Ice::ConnectionPtr&)
     {
         _app->sessionDestroyed();
     }
-    
+
 private:
 
     Glacier2::Application* _app;
 };
-    
+#endif
 }
 
 string
-Glacier2::RestartSessionException::ice_name() const
+Glacier2::RestartSessionException::ice_id() const
 {
-    return "RestartSessionException";
+    return "::Glacier2::RestartSessionException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 Glacier2::RestartSessionException*
 Glacier2::RestartSessionException::ice_clone() const
 {
     return new RestartSessionException(*this);
 }
+#endif
 
 void
 Glacier2::RestartSessionException::ice_throw() const
@@ -85,7 +82,7 @@ Glacier2::Application::objectAdapter()
     return _adapter;
 }
 
-Ice::ObjectPrx
+Ice::ObjectPrxPtr
 Glacier2::Application::addWithUUID(const Ice::ObjectPtr& servant)
 {
     return objectAdapter()->add(servant, createCallbackIdentity(IceUtil::generateUUID()));
@@ -153,8 +150,8 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat
     try
     {
         IceInternal::Application::_communicator = Ice::initialize(args, initData);
-        _router = Glacier2::RouterPrx::uncheckedCast(communicator()->getDefaultRouter());
-        
+        _router = ICE_UNCHECKED_CAST(Glacier2::RouterPrx, communicator()->getDefaultRouter());
+
         if(!_router)
         {
             Error out(getProcessLogger());
@@ -188,7 +185,7 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat
             {
                 Ice::Int acmTimeout = 0;
                 try
-                { 
+                {
                     acmTimeout = _router->getACMTimeout();
                 }
                 catch(const Ice::OperationNotExistException&)
@@ -204,7 +201,20 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat
                     Ice::ConnectionPtr connection = _router->ice_getCachedConnection();
                     assert(connection);
                     connection->setACM(acmTimeout, IceUtil::None, Ice::HeartbeatAlways);
-                    connection->setCallback(new ConnectionCallbackI(this));
+#ifdef ICE_CPP11_MAPPING
+                    auto self = weak_from_this();
+                    connection->setCloseCallback(
+                        [self](Ice::ConnectionPtr)
+                        {
+                            auto s = self.lock();
+                            if(s)
+                            {
+                                s->sessionDestroyed();
+                            }
+                        });
+#else
+                    connection->setCloseCallback(ICE_MAKE_SHARED(CloseCallbackI, this));
+#endif
                 }
 
                 _category = _router->getCategoryForClient();
diff --git a/cpp/src/Glacier2Lib/Glacier2.rc b/cpp/src/Glacier2Lib/Glacier2.rc
index b382e90dd67..d922408f57f 100644
--- a/cpp/src/Glacier2Lib/Glacier2.rc
+++ b/cpp/src/Glacier2Lib/Glacier2.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "glacier236d\0"
- #define ORIGINALFILENAME "glacier236d.dll\0"
+ #define INTERNALNAME "glacier237a2d\0"
+ #define ORIGINALFILENAME "glacier237a2d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "glacier236\0"
- #define ORIGINALFILENAME "glacier236.dll\0"
+ #define INTERNALNAME "glacier237a2\0"
+ #define ORIGINALFILENAME "glacier237a2.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Glacier2 C++ Client Library\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2Lib/Makefile b/cpp/src/Glacier2Lib/Makefile
deleted file mode 100644
index d9ee3d28461..00000000000
--- a/cpp/src/Glacier2Lib/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME	= $(call mklibfilename,Glacier2,$(VERSION))
-SONAME		= $(call mksoname,Glacier2,$(SOVERSION))
-LIBNAME		= $(call mklibname,Glacier2)
-
-TARGETS 	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-
-SLICE_OBJS      = Metrics.o \
-		  PermissionsVerifierF.o \
-		  PermissionsVerifier.o \
-		  Router.o \
-		  RouterF.o \
-		  Session.o \
-		  SSLInfo.o
-
-OBJS		= Application.o \
-		  NullPermissionsVerifier.o \
-		  SessionHelper.o \
-                  $(SLICE_OBJS)
-
-HDIR		= $(headerdir)/Glacier2
-SDIR		= $(slicedir)/Glacier2
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I.. $(CPPFLAGS) $(OPENSSL_FLAGS) -DGLACIER2_API_EXPORTS
-SLICE2CPPFLAGS	:= --ice --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS)
-LINKWITH        := $(BZIP2_RPATH_LINK) -lIce -lIceUtil
-
-$(libdir)/$(LIBFILENAME): $(OBJS) $(HDIR)/PermissionsVerifierF.h $(HDIR)/RouterF.h
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	@mkdir -p $(libdir)$(cpp11libdirsuffix)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/Glacier2Lib/Makefile.mak b/cpp/src/Glacier2Lib/Makefile.mak
deleted file mode 100644
index e6637fcaa33..00000000000
--- a/cpp/src/Glacier2Lib/Makefile.mak
+++ /dev/null
@@ -1,75 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME		= $(top_srcdir)\lib\glacier2$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\glacier2$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-TARGETS 	= $(LIBNAME) $(DLLNAME)
-
-SLICE_OBJS	= .\Metrics.obj \
-		  .\PermissionsVerifierF.obj \
-		  .\PermissionsVerifier.obj \
-		  .\Router.obj \
-		  .\RouterF.obj \
-		  .\Session.obj \
-		  .\SSLInfo.obj
-
-OBJS		= .\Application.obj \
-		  .\NullPermissionsVerifier.obj \
-		  .\SessionHelper.obj \
-		  $(SLICE_OBJS)
-
-HDIR		= $(headerdir)\Glacier2
-SDIR		= $(slicedir)\Glacier2
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DGLACIER2_API_EXPORTS -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = Glacier2.res
-
-SLICE2CPPFLAGS	= --ice --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS)
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) Glacier2.res $(HDIR)\PermissionsVerifierF.h $(HDIR)\RouterF.h
-	$(LINK) $(BASE):0x27000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-		$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	-del /q PermissionsVerifierF.cpp $(HDIR)\PermissionsVerifierF.h
-	-del /q PermissionsVerifier.cpp $(HDIR)\PermissionsVerifier.h
-	-del /q RouterF.cpp $(HDIR)\RouterF.h
-	-del /q Router.cpp $(HDIR)\Router.h
-	-del /q Session.cpp $(HDIR)\Session.h
-	-del /q SSLInfo.cpp $(HDIR)\SSLInfo.h
-	-del /q Metrics.cpp $(HDIR)\Metrics.h
-	-del /q Glacier2.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/Glacier2Lib/Makefile.mk b/cpp/src/Glacier2Lib/Makefile.mk
new file mode 100644
index 00000000000..9e6c2e72ffd
--- /dev/null
+++ b/cpp/src/Glacier2Lib/Makefile.mk
@@ -0,0 +1,17 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries	:= Glacier2
+
+Glacier2_targetdir		:= $(libdir)
+Glacier2_dependencies		:= Ice
+Glacier2_cppflags	 	:= -DGLACIER2_API_EXPORTS
+Glacier2_sliceflags		:= --include-dir Glacier2 --dll-export GLACIER2_API
+
+projects += $(project)
diff --git a/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp b/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
index 1fca1dc70d5..abc76a3b6e8 100644
--- a/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
+++ b/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
@@ -21,7 +21,11 @@ class NullPermissionsVerifier : public Glacier2::PermissionsVerifier
 {
 public:
 
+#ifdef ICE_CPP11_MAPPING
+    bool checkPermissions(string, string, string&, const Current&) const
+#else
     bool checkPermissions(const string&, const string&, string&, const Current&) const
+#endif
     {
         return true;
     }
@@ -31,8 +35,13 @@ class NullSSLPermissionsVerifier : public Glacier2::SSLPermissionsVerifier
 {
 public:
 
+#ifdef ICE_CPP11_MAPPING
     virtual bool
-    authorize(const Glacier2::SSLInfo&, std::string&, const Ice::Current&) const
+    authorize(Glacier2::SSLInfo, string&, const Ice::Current&) const
+#else
+    virtual bool
+    authorize(const Glacier2::SSLInfo&, string&, const Ice::Current&) const
+#endif
     {
         return true;
     }
@@ -91,7 +100,7 @@ Init::checkPermissionVerifier(const string& val)
     // Check if it's in proxy format
     try
     {
-        ObjectPrx prx  = _communicator->stringToProxy(val);
+        ObjectPrxPtr prx  = _communicator->stringToProxy(val);
         if(prx->ice_getIdentity() == _nullPVId || prx->ice_getIdentity() == _nullSSLPVId)
         {
             createObjects();
@@ -124,8 +133,8 @@ Init::createObjects()
     if(!_adapter)
     {
         _adapter = _communicator->createObjectAdapter(""); // colloc-only adapter           
-        _adapter->add(new NullPermissionsVerifier, _nullPVId);
-        _adapter->add(new NullSSLPermissionsVerifier, _nullSSLPVId);
+        _adapter->add(ICE_MAKE_SHARED(NullPermissionsVerifier), _nullPVId);
+        _adapter->add(ICE_MAKE_SHARED(NullSSLPermissionsVerifier), _nullSSLPVId);
         _adapter->activate();
     }
 }
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index e5bb0aa0777..6204bd89126 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -10,6 +10,7 @@
 #include <Glacier2/SessionHelper.h>
 
 #include <IceUtil/IceUtil.h>
+#include <IceUtil/CountDownLatch.h>
 #include <Ice/Ice.h>
 
 #include <algorithm> // required by max
@@ -19,7 +20,7 @@ using namespace std;
 namespace Glacier2
 {
 
-class SessionThreadCallback : public IceUtil::Shared
+class SessionThreadCallback : public Ice::EnableSharedFromThis<SessionThreadCallback>
 {
 public:
 
@@ -37,21 +38,24 @@ private:
 
     const Glacier2::SessionFactoryHelperPtr _factory;
 };
-typedef IceUtil::Handle<SessionThreadCallback> SessionThreadCallbackPtr;
+ICE_DEFINE_PTR(SessionThreadCallbackPtr, SessionThreadCallback);
 
 };
 
 namespace
 {
 
-class ConnectStrategy : public Ice::LocalObject
+class ConnectStrategy
+#ifndef ICE_CPP11_MAPPING
+    : public Ice::LocalObject
+#endif
 {
 
 public:
 
-    virtual Glacier2::SessionPrx connect(const Glacier2::RouterPrx& router) = 0;
+    virtual Glacier2::SessionPrxPtr connect(const Glacier2::RouterPrxPtr& router) = 0;
 };
-typedef IceUtil::Handle< ConnectStrategy> ConnectStrategyPtr;
+ICE_DEFINE_PTR(ConnectStrategyPtr, ConnectStrategy);
 
 class Disconnected : public Ice::DispatcherCall
 {
@@ -78,7 +82,7 @@ private:
     const Glacier2::SessionCallbackPtr _callback;
 };
 
-class SessionHelperI : public Glacier2::SessionHelper
+class SessionHelperI : public Glacier2::SessionHelper, public Ice::EnableSharedFromThis<SessionHelperI>
 {
 
 public:
@@ -88,8 +92,8 @@ public:
     void destroy();
     Ice::CommunicatorPtr communicator() const;
     std::string categoryForClient() const;
-    Ice::ObjectPrx addWithUUID(const Ice::ObjectPtr&);
-    Glacier2::SessionPrx session() const;
+    Ice::ObjectPrxPtr addWithUUID(const Ice::ObjectPtr&);
+    Glacier2::SessionPrxPtr session() const;
     bool isConnected() const;
     Ice::ObjectAdapterPtr objectAdapter();
 
@@ -102,7 +106,7 @@ public:
 private:
 
     Ice::ObjectAdapterPtr internalObjectAdapter();
-    void connected(const Glacier2::RouterPrx&, const Glacier2::SessionPrx&);
+    void connected(const Glacier2::RouterPrxPtr&, const Glacier2::SessionPrxPtr&);
     void destroyInternal(const Ice::DispatcherCallPtr&);
     void destroyCommunicator();
     void connectFailed();
@@ -117,8 +121,8 @@ private:
     IceUtil::Mutex _mutex;
     Ice::CommunicatorPtr _communicator;
     Ice::ObjectAdapterPtr _adapter;
-    Glacier2::RouterPrx _router;
-    Glacier2::SessionPrx _session;
+    Glacier2::RouterPrxPtr _router;
+    Glacier2::SessionPrxPtr _session;
     std::string _category;
     bool _connected;
     bool _destroy;
@@ -128,7 +132,7 @@ private:
     const string _finder;
     const bool _useCallbacks;
 };
-typedef IceUtil::Handle<SessionHelperI> SessionHelperIPtr;
+ICE_DEFINE_PTR(SessionHelperIPtr, SessionHelperI);
 
 class DestroyInternal : public IceUtil::Thread
 {
@@ -220,17 +224,17 @@ SessionHelperI::destroy()
         // We destroy the communicator to trigger the immediate
         // failure of the connection establishment.
         //
-        IceUtil::ThreadPtr destroyCommunicator = new DestroyCommunicator(this);
-        _threadCB = 0;
+        IceUtil::ThreadPtr destroyCommunicator = new DestroyCommunicator(shared_from_this());
+        _threadCB = ICE_NULLPTR;
         destroyCommunicator->start();
         return;
     }
 
-    IceUtil::ThreadPtr destroyInternal = new DestroyInternal(this, _threadCB, _callback);
+    IceUtil::ThreadPtr destroyInternal = new DestroyInternal(shared_from_this(), _threadCB, _callback);
 
-    _session = 0;
+    _session = ICE_NULLPTR;
     _connected = false;
-    _threadCB = 0;
+    _threadCB = ICE_NULLPTR;
 
     //
     // Run destroyInternal in a thread because it makes remote invocations.
@@ -256,7 +260,7 @@ SessionHelperI::categoryForClient() const
     return _category;
 }
 
-Ice::ObjectPrx
+Ice::ObjectPrxPtr
 SessionHelperI::addWithUUID(const Ice::ObjectPtr& servant)
 {
     IceUtil::Mutex::Lock sync(_mutex);
@@ -270,7 +274,7 @@ SessionHelperI::addWithUUID(const Ice::ObjectPtr& servant)
     return internalObjectAdapter()->add(servant, id);
 }
 
-Glacier2::SessionPrx
+Glacier2::SessionPrxPtr
 SessionHelperI::session() const
 {
     IceUtil::Mutex::Lock sync(_mutex);
@@ -295,6 +299,12 @@ SessionHelperI::objectAdapter()
     return internalObjectAdapter();
 }
 
+
+Glacier2::SessionHelper::~SessionHelper()
+{
+    // Out of line to avoid weak vtable
+}
+
 bool
 Glacier2::SessionHelper::operator==(const Glacier2::SessionHelper& other) const
 {
@@ -322,6 +332,12 @@ SessionHelperI::internalObjectAdapter()
     return _adapter;
 }
 
+Glacier2::SessionCallback::~SessionCallback()
+{
+    // Out of line to avoid weak vtable
+}
+
+
 namespace
 {
 
@@ -335,8 +351,8 @@ public:
     {
     }
 
-    virtual Glacier2::SessionPrx
-    connect(const Glacier2::RouterPrx& router)
+    virtual Glacier2::SessionPrxPtr
+    connect(const Glacier2::RouterPrxPtr& router)
     {
         return router->createSessionFromSecureConnection(_context);
     }
@@ -358,8 +374,8 @@ public:
     {
     }
 
-    virtual Glacier2::SessionPrx
-    connect(const Glacier2::RouterPrx& router)
+    virtual Glacier2::SessionPrxPtr
+    connect(const Glacier2::RouterPrxPtr& router)
     {
         return router->createSession(_user, _password, _context);
     }
@@ -377,14 +393,14 @@ void
 SessionHelperI::connect(const map<string, string>& context)
 {
     IceUtil::Mutex::Lock sync(_mutex);
-    connectImpl(new ConnectStrategySecureConnection(context));
+    connectImpl(ICE_MAKE_SHARED(ConnectStrategySecureConnection, context));
 }
 
 void
 SessionHelperI::connect(const string& user, const string& password, const map<string, string>& context)
 {
     IceUtil::Mutex::Lock sync(_mutex);
-    connectImpl(new ConnectStrategyUserPassword(user, password, context));
+    connectImpl(ICE_MAKE_SHARED(ConnectStrategyUserPassword, user, password, context));
 }
 
 void
@@ -392,11 +408,11 @@ SessionHelperI::destroyInternal(const Ice::DispatcherCallPtr& disconnected)
 {
     assert(_destroy);
     Ice::CommunicatorPtr communicator;
-    Glacier2::RouterPrx router;
+    Glacier2::RouterPrxPtr router;
     {
         IceUtil::Mutex::Lock sync(_mutex);
         router = _router;
-        _router = 0;
+        _router = ICE_NULLPTR;
         _connected = false;
 
         communicator = _communicator;
@@ -442,9 +458,9 @@ SessionHelperI::destroyInternal(const Ice::DispatcherCallPtr& disconnected)
         catch(...)
         {
         }
-        communicator = 0;
+        communicator = ICE_NULLPTR;
     }
-    dispatchCallback(disconnected, 0);
+    dispatchCallback(disconnected, ICE_NULLPTR);
 }
 
 void
@@ -465,7 +481,7 @@ SessionHelperI::destroyCommunicator()
         catch(...)
         {
         }
-        communicator = 0;
+        communicator = ICE_NULLPTR;
     }
 }
 
@@ -503,21 +519,36 @@ public:
         _callback(callback),
         _session(session)
     {
-        _ex.reset(ex.ice_clone());
+        ICE_RESET_EXCEPTION(_ex, ex.ice_clone());
     }
 
     virtual void
     run()
     {
+#ifdef ICE_CPP11_MAPPING
+        try
+        {
+            rethrow_exception(_ex);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            _callback->connectFailed(_session, ex);
+        }
+#else
         const Ice::Exception* ex(_ex.get());
         _callback->connectFailed(_session, *ex);
+#endif
     }
 
 private:
 
     const Glacier2::SessionCallbackPtr _callback;
     const Glacier2::SessionHelperPtr _session;
+#ifdef ICE_CPP11_MAPPING
+    std::exception_ptr _ex;
+#else
     IceUtil::UniquePtr<Ice::Exception> _ex;
+#endif
 };
 
 class CreatedCommunicator : public Ice::DispatcherCall
@@ -566,8 +597,8 @@ public:
         {
             if(!_communicator->getDefaultRouter())
             {
-                Ice::RouterFinderPrx finder =
-                    Ice::RouterFinderPrx::uncheckedCast(_communicator->stringToProxy(_finder));
+                Ice::RouterFinderPrxPtr finder =
+                    ICE_UNCHECKED_CAST(Ice::RouterFinderPrx, _communicator->stringToProxy(_finder));
                 try
                 {
                     _communicator->setDefaultRouter(finder->getRouter());
@@ -586,12 +617,12 @@ public:
                     Ice::Identity ident;
                     ident.category = "Glacier2";
                     ident.name = "router";
-                    _communicator->setDefaultRouter(Ice::RouterPrx::uncheckedCast(finder->ice_identity(ident)));
+                    _communicator->setDefaultRouter(ICE_UNCHECKED_CAST(Ice::RouterPrx, finder->ice_identity(ident)));
                 }
             }
             _session->dispatchCallbackAndWait(new CreatedCommunicator(_callback, _session), 0);
-            Glacier2::RouterPrx routerPrx = Glacier2::RouterPrx::uncheckedCast(_communicator->getDefaultRouter());
-            Glacier2::SessionPrx session = _factory->connect(routerPrx);
+            Glacier2::RouterPrxPtr routerPrx = ICE_UNCHECKED_CAST(Glacier2::RouterPrx, _communicator->getDefaultRouter());
+            Glacier2::SessionPrxPtr session = _factory->connect(routerPrx);
             _session->connected(routerPrx, session);
         }
         catch(const Ice::Exception& ex)
@@ -635,7 +666,7 @@ public:
     virtual void run()
     {
         _session->dispatchCallback(_call, _conn);
-        _session = 0;
+        _session = ICE_NULLPTR;
     }
 
 private:
@@ -659,13 +690,13 @@ SessionHelperI::connectImpl(const ConnectStrategyPtr& factory)
     catch(const Ice::LocalException& ex)
     {
         _destroy = true;
-        IceUtil::ThreadPtr thread = new DispatchCallThread(this, new ConnectFailed(_callback, this, ex), 0);
+        IceUtil::ThreadPtr thread = new DispatchCallThread(shared_from_this(), new ConnectFailed(_callback, shared_from_this(), ex), 0);
         _threadCB->add(this, thread);
         thread->start();
         return;
     }
 
-    IceUtil::ThreadPtr thread = new ConnectThread(_callback, this, factory, _communicator, _finder);
+    IceUtil::ThreadPtr thread = new ConnectThread(_callback, shared_from_this(), factory, _communicator, _finder);
     _threadCB->add(this, thread);
     thread->start();
 }
@@ -703,16 +734,12 @@ private:
     const Glacier2::SessionHelperPtr _session;
 };
 
-class ConnectionCallbackI : public Ice::ConnectionCallback
+#ifndef ICE_CPP11_MAPPING // C++98
+class CloseCallbackI : public Ice::CloseCallback
 {
 public:
 
-    ConnectionCallbackI(const SessionHelperIPtr& sessionHelper) : _sessionHelper(sessionHelper)
-    {
-    }
-
-    virtual void
-    heartbeat(const Ice::ConnectionPtr&)
+    CloseCallbackI(const SessionHelperIPtr& sessionHelper) : _sessionHelper(sessionHelper)
     {
     }
 
@@ -726,11 +753,12 @@ private:
 
     SessionHelperIPtr _sessionHelper;
 };
+#endif
 
 }
 
 void
-SessionHelperI::connected(const Glacier2::RouterPrx& router, const Glacier2::SessionPrx& session)
+SessionHelperI::connected(const Glacier2::RouterPrxPtr& router, const Glacier2::SessionPrxPtr& session)
 {
     //
     // Remote invocation should be done without acquiring a mutex lock.
@@ -788,7 +816,15 @@ SessionHelperI::connected(const Glacier2::RouterPrx& router, const Glacier2::Ses
                 Ice::ConnectionPtr connection = _router->ice_getCachedConnection();
                 assert(connection);
                 connection->setACM(acmTimeout, IceUtil::None, Ice::HeartbeatAlways);
-                connection->setCallback(new ConnectionCallbackI(this));
+#ifdef ICE_CPP11_MAPPING
+                auto self = shared_from_this();
+                connection->setCloseCallback([self](Ice::ConnectionPtr)
+                {
+                    self->destroy();
+                });
+#else
+                connection->setCloseCallback(ICE_MAKE_SHARED(CloseCallbackI, shared_from_this()));
+#endif
             }
         }
     }
@@ -799,11 +835,11 @@ SessionHelperI::connected(const Glacier2::RouterPrx& router, const Glacier2::Ses
         // connected() is only called from the ConnectThread so it is ok to
         // call destroyInternal here.
         //
-        destroyInternal(new Disconnected(this, _callback));
+        destroyInternal(new Disconnected(shared_from_this(), _callback));
     }
     else
     {
-        dispatchCallback(new Connected(_callback, this), conn);
+        dispatchCallback(new Connected(_callback, shared_from_this()), conn);
     }
 }
 
@@ -812,7 +848,15 @@ SessionHelperI::dispatchCallback(const Ice::DispatcherCallPtr& call, const Ice::
 {
     if(_initData.dispatcher)
     {
+#ifdef ICE_CPP11_MAPPING
+        _initData.dispatcher([call]()
+            {
+                call->run();
+            },
+            conn);
+#else
         _initData.dispatcher->dispatch(call, conn);
+#endif
     }
     else
     {
@@ -856,7 +900,15 @@ SessionHelperI::dispatchCallbackAndWait(const Ice::DispatcherCallPtr& call, cons
     {
         IceUtilInternal::CountDownLatch cdl(1);
         Ice::DispatcherCallPtr callWait = new DispatcherCallWait(cdl, call);
+#ifdef ICE_CPP11_MAPPING
+        _initData.dispatcher([call]()
+            {
+                call->run();
+            },
+            conn);
+#else
         _initData.dispatcher->dispatch(callWait, conn);
+#endif
         cdl.await();
     }
     else
@@ -1095,8 +1147,12 @@ Glacier2::SessionFactoryHelper::connect()
     map<string, string> context;
     {
         IceUtil::Mutex::Lock sync(_mutex);
-        session = new SessionHelperI(new SessionThreadCallback(this), _callback, createInitData(),
-                                     getRouterFinderStr(), _useCallbacks);
+        session = ICE_MAKE_SHARED(SessionHelperI,
+                                  ICE_MAKE_SHARED(SessionThreadCallback, shared_from_this()),
+                                  _callback,
+                                  createInitData(),
+                                  getRouterFinderStr(),
+                                  _useCallbacks);
         context = _context;
     }
     session->connect(context);
@@ -1110,8 +1166,12 @@ Glacier2::SessionFactoryHelper::connect(const string& user,  const string& passw
     map<string, string> context;
     {
         IceUtil::Mutex::Lock sync(_mutex);
-        session = new SessionHelperI(new SessionThreadCallback(this), _callback, createInitData(),
-                                     getRouterFinderStr(), _useCallbacks);
+        session = ICE_MAKE_SHARED(SessionHelperI,
+                                  ICE_MAKE_SHARED(SessionThreadCallback, shared_from_this()),
+                                  _callback,
+                                  createInitData(),
+                                  getRouterFinderStr(),
+                                  _useCallbacks);
         context = _context;
     }
     session->connect(user, password, _context);
@@ -1162,17 +1222,7 @@ string
 Glacier2::SessionFactoryHelper::createProxyStr(const Ice::Identity& ident)
 {
     ostringstream os;
-    os << "\"";
-    //
-    // TODO replace with identityToString, we cannot use the Communicator::identityToString
-    // current implementation because we need to do that before the communicator has been
-    // initialized.
-    //
-    if(!ident.category.empty())
-    {
-        os << ident.category << "/";
-    }
-    os << ident.name << "\":" << _protocol << " -p " << getPortInternal() << " -h \"" << _routerHost << "\"";
+    os << "\"" << Ice::identityToString(ident) << "\":" << _protocol << " -p " << getPortInternal() << " -h \"" << _routerHost << "\"";
     if(_timeout > 0)
     {
         os << " -t " << _timeout;
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj
new file mode 100644
index 00000000000..9bf5a617918
--- /dev/null
+++ b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2940A3C2-A9BA-44AA-AF65-00479C783407}</ProjectGuid>
+    <RootNamespace>Glacier2</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Glacier2\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>Glacier2</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderDLLExport>GLACIER2_API</IceBuilderDLLExport>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>GLACIER2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>GLACIER2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>GLACIER2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>GLACIER2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Metrics.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\PermissionsVerifierF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Router.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\RouterF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Session.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\SSLInfo.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Application.cpp" />
+    <ClCompile Include="..\..\NullPermissionsVerifier.cpp" />
+    <ClCompile Include="..\..\SessionHelper.cpp" />
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PermissionsVerifier.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PermissionsVerifierF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SSLInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PermissionsVerifier.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PermissionsVerifierF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SSLInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PermissionsVerifier.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PermissionsVerifierF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SSLInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PermissionsVerifier.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PermissionsVerifierF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SSLInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Glacier2\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Glacier2\PermissionsVerifier.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Glacier2\PermissionsVerifierF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Glacier2\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Glacier2\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Glacier2\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Glacier2\SSLInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Glacier2\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Glacier2\PermissionsVerifier.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Glacier2\PermissionsVerifierF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Glacier2\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Glacier2\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Glacier2\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Glacier2\SSLInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Glacier2\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Glacier2\PermissionsVerifier.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Glacier2\PermissionsVerifierF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Glacier2\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Glacier2\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Glacier2\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Glacier2\SSLInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Glacier2\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Glacier2\PermissionsVerifier.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Glacier2\PermissionsVerifierF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Glacier2\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Glacier2\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Glacier2\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Glacier2\SSLInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\Glacier2\Application.h" />
+    <ClInclude Include="..\..\..\..\include\Glacier2\Config.h" />
+    <ClInclude Include="..\..\..\..\include\Glacier2\Glacier2.h" />
+    <ClInclude Include="..\..\..\..\include\Glacier2\NullPermissionsVerifier.h" />
+    <ClInclude Include="..\..\..\..\include\Glacier2\SessionHelper.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\Glacier2.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj.filters b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj.filters
new file mode 100644
index 00000000000..d2740fa2567
--- /dev/null
+++ b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj.filters
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{19067830-5e84-4162-af65-26ef2415cad2}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{30dab033-f9de-4a4e-a655-6c3811814a3b}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{051b77b0-3b86-458b-9c9e-3cc24b1078fe}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{00cd6ee0-25d3-456b-aa33-0a7367a74bb9}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{546d2186-061f-493e-86ed-1f270e422965}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{84ab636b-a0a9-463d-8fde-62f90f8c0426}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{443526eb-a840-4516-a351-4026c1f65ad1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{983aa4d5-0aaf-4b62-b3ba-94e69b726806}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{70b58eb5-32ce-4593-ac95-d4c4a28050cd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{d7638a16-c644-40ae-a13d-588b9bcabc56}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{c01c1098-f126-4621-ae7b-d6fc50917bc2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{b27c1b4c-5b23-4bdc-8cef-9bd339d7271d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{4029b63e-ecaf-4c53-a39b-4bee08f9821d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{7569fa48-5b83-4413-854f-88e7d23bfae1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{dae76d01-7739-43c5-88df-15fe9bb84fef}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{1205887c-b371-498b-8026-13f21d32fc65}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Metrics.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\PermissionsVerifierF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Router.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\RouterF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Session.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\SSLInfo.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Application.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NullPermissionsVerifier.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SessionHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PermissionsVerifier.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PermissionsVerifierF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Router.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RouterF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Session.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SSLInfo.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PermissionsVerifier.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PermissionsVerifierF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Router.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RouterF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Session.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SSLInfo.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PermissionsVerifier.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PermissionsVerifierF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Router.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RouterF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Session.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SSLInfo.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PermissionsVerifier.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PermissionsVerifierF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Router.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RouterF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Session.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SSLInfo.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\Glacier2\Application.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\Glacier2\Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\Glacier2\Glacier2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\Glacier2\NullPermissionsVerifier.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\Glacier2\SessionHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Glacier2\Metrics.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Glacier2\PermissionsVerifier.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Glacier2\PermissionsVerifierF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Glacier2\Router.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Glacier2\RouterF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Glacier2\Session.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Glacier2\SSLInfo.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Glacier2\Metrics.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Glacier2\PermissionsVerifier.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Glacier2\PermissionsVerifierF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Glacier2\Router.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Glacier2\RouterF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Glacier2\Session.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Glacier2\SSLInfo.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Glacier2\Metrics.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Glacier2\PermissionsVerifier.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Glacier2\PermissionsVerifierF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Glacier2\Router.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Glacier2\RouterF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Glacier2\Session.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Glacier2\SSLInfo.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Glacier2\Metrics.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Glacier2\PermissionsVerifier.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Glacier2\PermissionsVerifierF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Glacier2\Router.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Glacier2\RouterF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Glacier2\Session.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Glacier2\SSLInfo.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\Glacier2.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj
new file mode 100644
index 00000000000..377ca8e94f8
--- /dev/null
+++ b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj
@@ -0,0 +1,405 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C7223CC8-0AAA-470B-ACB3-12B9DE75525C}</ProjectGuid>
+    <RootNamespace>Glacier2</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Glacier2\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>Glacier2</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderDLLExport>GLACIER2_API</IceBuilderDLLExport>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>GLACIER2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>GLACIER2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>GLACIER2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>GLACIER2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Application.cpp" />
+    <ClCompile Include="..\..\NullPermissionsVerifier.cpp" />
+    <ClCompile Include="..\..\SessionHelper.cpp" />
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PermissionsVerifier.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PermissionsVerifierF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SSLInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PermissionsVerifier.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PermissionsVerifierF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SSLInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PermissionsVerifier.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PermissionsVerifierF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SSLInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PermissionsVerifier.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PermissionsVerifierF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SSLInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Glacier2\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Glacier2\PermissionsVerifier.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Glacier2\PermissionsVerifierF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Glacier2\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Glacier2\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Glacier2\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Glacier2\SSLInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Glacier2\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Glacier2\PermissionsVerifier.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Glacier2\PermissionsVerifierF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Glacier2\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Glacier2\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Glacier2\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Glacier2\SSLInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Glacier2\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Glacier2\PermissionsVerifier.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Glacier2\PermissionsVerifierF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Glacier2\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Glacier2\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Glacier2\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Glacier2\SSLInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Glacier2\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Glacier2\PermissionsVerifier.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Glacier2\PermissionsVerifierF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Glacier2\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Glacier2\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Glacier2\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Glacier2\SSLInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\Glacier2\Application.h" />
+    <ClInclude Include="..\..\..\..\include\Glacier2\Config.h" />
+    <ClInclude Include="..\..\..\..\include\Glacier2\Glacier2.h" />
+    <ClInclude Include="..\..\..\..\include\Glacier2\NullPermissionsVerifier.h" />
+    <ClInclude Include="..\..\..\..\include\Glacier2\SessionHelper.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\Glacier2.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Metrics.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\PermissionsVerifierF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Router.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\RouterF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Session.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\SSLInfo.ice" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets" />
+</Project>
\ No newline at end of file
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj.filters b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj.filters
new file mode 100644
index 00000000000..b05194b2f2b
--- /dev/null
+++ b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj.filters
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{d8ddbb38-543d-4e82-8cbe-4cdd9971966f}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{ce98c867-959c-4577-85ca-940185ef4b00}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{beb330f3-4855-45cb-bb28-77931f8022a3}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{1b8a0147-4859-413e-834a-038af874c117}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{630bf322-3330-4c2b-94fc-5c05a1463962}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{6aa96f95-cba4-4904-ac92-e1992206bbc2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{e06fea05-8bac-432c-a1da-383979467f67}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{4ff3f38c-1db8-42d6-8d31-ec709264051a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{65a63895-3be3-4aa6-8466-fb6d1ea70f96}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{c95abf0c-bc38-469e-a894-499539748b51}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{2039ed87-1be6-4b02-945c-bffd761f01c6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{31ccbc79-5e18-456b-8d88-5eb6c27678a1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{40aba19a-d5d9-41f8-a338-15d809b47d8f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{429fe5b3-e2c9-40f1-ae08-dbe1437d65d9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{56019336-6ae8-443a-b6ab-9975700bfb2f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{11bc22e9-501e-410f-8fda-6d55b2a59681}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Application.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NullPermissionsVerifier.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SessionHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PermissionsVerifier.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PermissionsVerifierF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Router.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RouterF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Session.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SSLInfo.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PermissionsVerifier.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PermissionsVerifierF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Router.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RouterF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Session.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SSLInfo.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PermissionsVerifier.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PermissionsVerifierF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Router.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RouterF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Session.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SSLInfo.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PermissionsVerifier.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PermissionsVerifierF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Router.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RouterF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Session.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SSLInfo.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\Glacier2\Application.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\Glacier2\Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\Glacier2\Glacier2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\Glacier2\NullPermissionsVerifier.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\Glacier2\SessionHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Glacier2\Metrics.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Glacier2\PermissionsVerifier.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Glacier2\PermissionsVerifierF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Glacier2\Router.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Glacier2\RouterF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Glacier2\Session.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Glacier2\SSLInfo.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Glacier2\Metrics.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Glacier2\PermissionsVerifier.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Glacier2\PermissionsVerifierF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Glacier2\Router.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Glacier2\RouterF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Glacier2\Session.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Glacier2\SSLInfo.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Glacier2\Metrics.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Glacier2\PermissionsVerifier.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Glacier2\PermissionsVerifierF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Glacier2\Router.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Glacier2\RouterF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Glacier2\Session.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Glacier2\SSLInfo.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Glacier2\Metrics.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Glacier2\PermissionsVerifier.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Glacier2\PermissionsVerifierF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Glacier2\Router.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Glacier2\RouterF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Glacier2\Session.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Glacier2\SSLInfo.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\Glacier2.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Metrics.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\PermissionsVerifierF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Router.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\RouterF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Session.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\SSLInfo.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj
new file mode 100644
index 00000000000..63a293747bc
--- /dev/null
+++ b/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj
@@ -0,0 +1,740 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{41C92ABD-AE22-4103-8334-3EBF3452E32E}</ProjectGuid>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WindowsAppContainer>true</WindowsAppContainer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\Glacier2\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>Glacier2</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_GLACIER2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_GLACIER2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_GLACIER2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_GLACIER2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_GLACIER2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_GLACIER2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Metrics.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\PermissionsVerifierF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Router.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\RouterF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Session.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\SSLInfo.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\SessionHelper.cpp" />
+    <ClCompile Include="ARM\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\PermissionsVerifier.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\PermissionsVerifierF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\SSLInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\PermissionsVerifier.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\PermissionsVerifierF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\SSLInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PermissionsVerifier.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PermissionsVerifierF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SSLInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PermissionsVerifier.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PermissionsVerifierF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SSLInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PermissionsVerifier.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PermissionsVerifierF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SSLInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PermissionsVerifier.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PermissionsVerifierF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SSLInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Glacier2\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Glacier2\PermissionsVerifier.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Glacier2\PermissionsVerifierF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Glacier2\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Glacier2\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Glacier2\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Glacier2\SSLInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Glacier2\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Glacier2\PermissionsVerifier.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Glacier2\PermissionsVerifierF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Glacier2\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Glacier2\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Glacier2\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Glacier2\SSLInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Glacier2\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Glacier2\PermissionsVerifier.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Glacier2\PermissionsVerifierF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Glacier2\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Glacier2\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Glacier2\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Glacier2\SSLInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Glacier2\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Glacier2\PermissionsVerifier.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Glacier2\PermissionsVerifierF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Glacier2\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Glacier2\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Glacier2\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Glacier2\SSLInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Glacier2\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Glacier2\PermissionsVerifier.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Glacier2\PermissionsVerifierF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Glacier2\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Glacier2\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Glacier2\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Glacier2\SSLInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Glacier2\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Glacier2\PermissionsVerifier.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Glacier2\PermissionsVerifierF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Glacier2\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Glacier2\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Glacier2\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Glacier2\SSLInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj.filters b/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj.filters
new file mode 100644
index 00000000000..d7353f2473c
--- /dev/null
+++ b/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj.filters
@@ -0,0 +1,351 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{7493574d-acfc-47e8-81d5-b6ac4522ae28}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{aa7e6f54-fd8c-4440-90e5-bb47b71869e3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{dc435988-e8a2-46b9-acb9-0138c2deb900}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{2341507d-8522-453f-aeec-a5126513f90f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{236046bf-2fdb-49cc-8bd9-e2bca2cac2f4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{1512d886-65d7-433e-b7dd-87ef19fc5639}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{21447c33-a78b-4cd0-b367-3133a87054e0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM">
+      <UniqueIdentifier>{11c97874-2a8c-4606-8e70-50f9423b8b72}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Debug">
+      <UniqueIdentifier>{3439232f-2672-43b6-ac40-c49d8b21f7cd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM">
+      <UniqueIdentifier>{3bc05b8c-12da-4a15-826f-ee66768227ff}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Debug">
+      <UniqueIdentifier>{b2f0856d-46c3-4371-aa65-d262a93a4d97}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{9d22f0e4-a9ee-48d3-80f7-2bae503d65f3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{5e6d08ec-fe7a-4180-9714-eb72a4ab8528}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{1cf6581c-3325-485f-8285-c1730d94fe5c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{eb31eeb2-c378-41e8-af51-c2486631241b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{e2e0d023-43e8-4d3f-82ba-484b0bbd66e7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{b0d87895-2a6d-4142-8dbc-8c07b086466b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Release">
+      <UniqueIdentifier>{e0675252-d017-4e17-b677-189cda23d8eb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Release">
+      <UniqueIdentifier>{d83407c2-9988-41c5-b0d3-54c38a07596c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{945a86a1-2328-4f76-804c-77a44471d18a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{2ab9c6c2-9218-46b5-a0d1-3bfac661ae9a}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Metrics.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\PermissionsVerifier.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\PermissionsVerifierF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Router.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\RouterF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\Session.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Glacier2\SSLInfo.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\SessionHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PermissionsVerifier.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PermissionsVerifierF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Router.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RouterF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Session.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SSLInfo.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Metrics.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\PermissionsVerifier.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\PermissionsVerifierF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Router.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\RouterF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Session.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\SSLInfo.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PermissionsVerifier.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PermissionsVerifierF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Router.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RouterF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Session.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SSLInfo.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PermissionsVerifier.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PermissionsVerifierF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Router.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RouterF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Session.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SSLInfo.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Metrics.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\PermissionsVerifier.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\PermissionsVerifierF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Router.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\RouterF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Session.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\SSLInfo.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PermissionsVerifier.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PermissionsVerifierF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Router.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RouterF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Session.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SSLInfo.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Glacier2\Metrics.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Glacier2\PermissionsVerifier.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Glacier2\PermissionsVerifierF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Glacier2\Router.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Glacier2\RouterF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Glacier2\Session.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Glacier2\SSLInfo.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Glacier2\Metrics.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Glacier2\PermissionsVerifier.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Glacier2\PermissionsVerifierF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Glacier2\Router.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Glacier2\RouterF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Glacier2\Session.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Glacier2\SSLInfo.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Glacier2\Metrics.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Glacier2\PermissionsVerifier.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Glacier2\PermissionsVerifierF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Glacier2\Router.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Glacier2\RouterF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Glacier2\Session.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Glacier2\SSLInfo.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Glacier2\Metrics.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Glacier2\PermissionsVerifier.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Glacier2\PermissionsVerifierF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Glacier2\Router.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Glacier2\RouterF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Glacier2\Session.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Glacier2\SSLInfo.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Glacier2\Metrics.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Glacier2\PermissionsVerifier.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Glacier2\PermissionsVerifierF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Glacier2\Router.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Glacier2\RouterF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Glacier2\Session.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Glacier2\SSLInfo.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Glacier2\Metrics.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Glacier2\PermissionsVerifier.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Glacier2\PermissionsVerifierF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Glacier2\Router.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Glacier2\RouterF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Glacier2\Session.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Glacier2\SSLInfo.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/Glacier2Lib/winrt/.depend.mak b/cpp/src/Glacier2Lib/winrt/.depend.mak
deleted file mode 100755
index 9eaf8985ee2..00000000000
--- a/cpp/src/Glacier2Lib/winrt/.depend.mak
+++ /dev/null
@@ -1,616 +0,0 @@
-
-..\Metrics.h: \
-    "$(slicedir)\Glacier2\Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-..\PermissionsVerifier.h: \
-    "$(slicedir)\Glacier2\PermissionsVerifier.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-..\PermissionsVerifierF.h: \
-    "$(slicedir)\Glacier2\PermissionsVerifierF.ice"
-
-..\Router.h: \
-    "$(slicedir)\Glacier2\Router.ice" \
-    "$(slicedir)/Ice/Router.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/Glacier2/PermissionsVerifier.ice"
-
-..\RouterF.h: \
-    "$(slicedir)\Glacier2\RouterF.ice"
-
-..\Session.h: \
-    "$(slicedir)\Glacier2\Session.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice"
-
-..\SSLInfo.h: \
-    "$(slicedir)\Glacier2\SSLInfo.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-$(ARCH)\$(CONFIG)\Metrics.obj: \
-	..\Metrics.cpp \
-    "$(includedir)\Glacier2\Metrics.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-$(ARCH)\$(CONFIG)\PermissionsVerifier.obj: \
-	..\PermissionsVerifier.cpp \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-
-$(ARCH)\$(CONFIG)\Router.obj: \
-	..\Router.cpp \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-
-$(ARCH)\$(CONFIG)\Session.obj: \
-	..\Session.cpp \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-
-$(ARCH)\$(CONFIG)\SessionHelper.obj: \
-	..\SessionHelper.cpp \
-    "$(includedir)\Glacier2\SessionHelper.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-$(ARCH)\$(CONFIG)\SSLInfo.obj: \
-	..\SSLInfo.cpp \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\RouterF.obj: \
-	..\RouterF.cpp \
-    "$(includedir)\Glacier2\RouterF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
diff --git a/cpp/src/Glacier2Lib/winrt/Makefile.mak b/cpp/src/Glacier2Lib/winrt/Makefile.mak
deleted file mode 100644
index 1944a31ec60..00000000000
--- a/cpp/src/Glacier2Lib/winrt/Makefile.mak
+++ /dev/null
@@ -1,66 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-LIBNAME		= $(SDK_LIBRARY_PATH)\glacier2.lib
-TARGETS		= $(LIBNAME)
-SOURCE_DIR	= ..
-
-TARGETS         = $(LIBNAME)
-
-OBJS		= $(ARCH)\$(CONFIG)\Metrics.obj \
-		  $(ARCH)\$(CONFIG)\PermissionsVerifier.obj \
-		  $(ARCH)\$(CONFIG)\Router.obj \
-		  $(ARCH)\$(CONFIG)\Session.obj \
-		  $(ARCH)\$(CONFIG)\SessionHelper.obj \
-		  $(ARCH)\$(CONFIG)\SSLInfo.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-SRCS		= $(SRCS:x86\=)
-SRCS		= $(SRCS:x64\=)
-SRCS		= $(SRCS:arm\=)
-SRCS		= $(SRCS:Retail\=..\)
-SRCS		= $(SRCS:Debug\=..\)
-
-SRCS		= $(SRCS) \
-		..\RouterF.cpp
-
-HDIR		= $(headerdir)\Glacier2
-SDIR		= $(slicedir)\Glacier2
-
-SLICE_SRCS	= Glacier2\Metrics.ice \
-		  Glacier2\PermissionsVerifier.ice \
-		  Glacier2\PermissionsVerifierF.ice \
-		  Glacier2\Router.ice \
-		  Glacier2\RouterF.ice \
-		  Glacier2\Session.ice \
-		  Glacier2\SSLInfo.ice
-
-PDBNAME		= $(LIBNAME:.lib=.pdb)
-CPPFLAGS	= /Fd$(PDBNAME) -I..\.. $(CPPFLAGS) -DICE_BUILDING_GLACIER2 -DWIN32_LEAN_AND_MEAN
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-SLICE2CPPFLAGS	= --ice --include-dir Glacier2 $(SLICE2CPPFLAGS)
-
-$(LIBNAME): $(OBJS) $(HDIR)\PermissionsVerifierF.h $(HDIR)\RouterF.h sdks
-	$(AR) $(ARFLAGS) $(OBJS) /out:$(LIBNAME)
-
-clean::
-	-del /q $(SOURCE_DIR)\PermissionsVerifierF.cpp $(HDIR)\PermissionsVerifierF.h
-	-del /q $(SOURCE_DIR)\PermissionsVerifier.cpp $(HDIR)\PermissionsVerifier.h
-	-del /q $(SOURCE_DIR)\RouterF.cpp $(HDIR)\RouterF.h
-	-del /q $(SOURCE_DIR)\Router.cpp $(HDIR)\Router.h
-	-del /q $(SOURCE_DIR)\Session.cpp $(HDIR)\Session.h
-	-del /q $(SOURCE_DIR)\SSLInfo.cpp $(HDIR)\SSLInfo.h
-	-del /q $(SOURCE_DIR)\Metrics.cpp $(HDIR)\Metrics.h
-	-del /q $(ARCH)\$(CONFIG)\*.obj
-	-del /q $(PDBNAME)
-
-install:: all
diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak
deleted file mode 100755
index 729802a005d..00000000000
--- a/cpp/src/Ice/.depend.mak
+++ /dev/null
@@ -1,11420 +0,0 @@
-
-BuiltinSequences.h: \
-    "$(slicedir)\Ice\BuiltinSequences.ice"
-
-Communicator.h: \
-    "$(slicedir)\Ice\Communicator.ice" \
-    "$(slicedir)/Ice/LoggerF.ice" \
-    "$(slicedir)/Ice/InstrumentationF.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ObjectFactoryF.ice" \
-    "$(slicedir)/Ice/RouterF.ice" \
-    "$(slicedir)/Ice/LocatorF.ice" \
-    "$(slicedir)/Ice/PluginF.ice" \
-    "$(slicedir)/Ice/ImplicitContextF.ice" \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/FacetMap.ice"
-
-CommunicatorF.h: \
-    "$(slicedir)\Ice\CommunicatorF.ice"
-
-Connection.h: \
-    "$(slicedir)\Ice\Connection.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Endpoint.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/EndpointF.ice"
-
-ConnectionF.h: \
-    "$(slicedir)\Ice\ConnectionF.ice"
-
-Current.h: \
-    "$(slicedir)\Ice\Current.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice"
-
-Endpoint.h: \
-    "$(slicedir)\Ice\Endpoint.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/EndpointF.ice"
-
-EndpointF.h: \
-    "$(slicedir)\Ice\EndpointF.ice"
-
-EndpointTypes.h: \
-    "$(slicedir)\Ice\EndpointTypes.ice"
-
-FacetMap.h: \
-    "$(slicedir)\Ice\FacetMap.ice"
-
-Identity.h: \
-    "$(slicedir)\Ice\Identity.ice"
-
-ImplicitContext.h: \
-    "$(slicedir)\Ice\ImplicitContext.ice" \
-    "$(slicedir)/Ice/LocalException.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice"
-
-ImplicitContextF.h: \
-    "$(slicedir)\Ice\ImplicitContextF.ice"
-
-Instrumentation.h: \
-    "$(slicedir)\Ice\Instrumentation.ice" \
-    "$(slicedir)/Ice/EndpointF.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice"
-
-InstrumentationF.h: \
-    "$(slicedir)\Ice\InstrumentationF.ice"
-
-LocalException.h: \
-    "$(slicedir)\Ice\LocalException.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-Locator.h: \
-    "$(slicedir)\Ice\Locator.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/ProcessF.ice"
-
-LocatorF.h: \
-    "$(slicedir)\Ice\LocatorF.ice"
-
-Logger.h: \
-    "$(slicedir)\Ice\Logger.ice"
-
-LoggerF.h: \
-    "$(slicedir)\Ice\LoggerF.ice"
-
-Metrics.h: \
-    "$(slicedir)\Ice\Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-ObjectAdapter.h: \
-    "$(slicedir)\Ice\ObjectAdapter.ice" \
-    "$(slicedir)/Ice/CommunicatorF.ice" \
-    "$(slicedir)/Ice/ServantLocatorF.ice" \
-    "$(slicedir)/Ice/LocatorF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/FacetMap.ice" \
-    "$(slicedir)/Ice/Endpoint.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/EndpointF.ice"
-
-ObjectAdapterF.h: \
-    "$(slicedir)\Ice\ObjectAdapterF.ice"
-
-ObjectFactory.h: \
-    "$(slicedir)\Ice\ObjectFactory.ice"
-
-ObjectFactoryF.h: \
-    "$(slicedir)\Ice\ObjectFactoryF.ice"
-
-Plugin.h: \
-    "$(slicedir)\Ice\Plugin.ice" \
-    "$(slicedir)/Ice/LoggerF.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-PluginF.h: \
-    "$(slicedir)\Ice\PluginF.ice"
-
-Process.h: \
-    "$(slicedir)\Ice\Process.ice"
-
-ProcessF.h: \
-    "$(slicedir)\Ice\ProcessF.ice"
-
-Properties.h: \
-    "$(slicedir)\Ice\Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-PropertiesAdmin.h: \
-    "$(slicedir)\Ice\PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-PropertiesF.h: \
-    "$(slicedir)\Ice\PropertiesF.ice"
-
-RemoteLogger.h: \
-    "$(slicedir)\Ice\RemoteLogger.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-Router.h: \
-    "$(slicedir)\Ice\Router.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-RouterF.h: \
-    "$(slicedir)\Ice\RouterF.ice"
-
-ServantLocator.h: \
-    "$(slicedir)\Ice\ServantLocator.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice"
-
-ServantLocatorF.h: \
-    "$(slicedir)\Ice\ServantLocatorF.ice"
-
-SliceChecksumDict.h: \
-    "$(slicedir)\Ice\SliceChecksumDict.ice"
-
-Version.h: \
-    "$(slicedir)\Ice\Version.ice"
-
-Acceptor.obj: \
-	Acceptor.cpp \
-    "Acceptor.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "AcceptorF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "TransceiverF.h" \
-    "EndpointIF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ProtocolInstanceF.h" \
-
-ACM.obj: \
-	ACM.cpp \
-    "ACM.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ConnectionI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "TransceiverF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "EndpointIF.h" \
-    "ConnectorF.h" \
-    "TraceLevelsF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "ProtocolInstanceF.h" \
-    "RequestHandler.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-
-Application.obj: \
-	Application.cpp \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "LoggerI.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "..\..\src\IceUtil\ArgVector.h" \
-
-AsyncResult.obj: \
-	AsyncResult.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "ThreadPool.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "ProtocolInstanceF.h" \
-    "Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "RequestHandler.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-
-Base64.obj: \
-	Base64.cpp \
-    "Base64.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-BasicStream.obj: \
-	BasicStream.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "DefaultsAndOverrides.h" \
-    "DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ProtocolInstanceF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "ProxyFactory.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "ObjectFactoryManager.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "TraceUtil.h" \
-    "TraceLevels.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-
-BatchRequestQueue.obj: \
-	BatchRequestQueue.cpp \
-    "BatchRequestQueue.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-
-Buffer.obj: \
-	Buffer.cpp \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-CollocatedRequestHandler.obj: \
-	CollocatedRequestHandler.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "CollocatedRequestHandler.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "RequestHandler.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "TraceLevelsF.h" \
-    "ObjectAdapterI.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "RouterInfoF.h" \
-    "EndpointIF.h" \
-    "LocatorInfoF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "ACM.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "ThreadPool.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "ProtocolInstanceF.h" \
-    "Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "Reference.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "Instance.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "DefaultsAndOverridesF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Process.h" \
-    "TraceLevels.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "TraceUtil.h" \
-
-CommunicatorI.obj: \
-	CommunicatorI.cpp \
-    "CommunicatorI.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "Instance.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Process.h" \
-    "ConnectionFactory.h" \
-    "ConnectionI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "TransceiverF.h" \
-    "EndpointIF.h" \
-    "ConnectorF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "Network.h" \
-    "ProtocolInstanceF.h" \
-    "RequestHandler.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "AcceptorF.h" \
-    "EndpointI.h" \
-    "ReferenceFactory.h" \
-    "Reference.h" \
-    "BatchRequestQueue.h" \
-    "SharedContext.h" \
-    "ProxyFactory.h" \
-    "ObjectFactoryManager.h" \
-    "ObjectAdapterFactory.h" \
-    "ObjectAdapterI.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "DefaultsAndOverrides.h" \
-    "TraceLevels.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-ConnectionFactory.obj: \
-	ConnectionFactory.cpp \
-    "ConnectionFactory.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ConnectionI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "TransceiverF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "EndpointIF.h" \
-    "ConnectorF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "TraceLevelsF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "ProtocolInstanceF.h" \
-    "RequestHandler.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "AcceptorF.h" \
-    "RouterInfoF.h" \
-    "EndpointI.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "DefaultsAndOverridesF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "TraceLevels.h" \
-    "DefaultsAndOverrides.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "Transceiver.h" \
-    "Connector.h" \
-    "Acceptor.h" \
-    "ThreadPool.h" \
-    "Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "ObjectAdapterI.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "Reference.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "BatchRequestQueue.h" \
-    "SharedContext.h" \
-    "RouterInfo.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Random.h" \
-
-ConnectionI.obj: \
-	ConnectionI.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "ConnectionI.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "TransceiverF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "EndpointIF.h" \
-    "ConnectorF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "TraceLevelsF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "ProtocolInstanceF.h" \
-    "RequestHandler.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "TraceUtil.h" \
-    "TraceLevels.h" \
-    "DefaultsAndOverrides.h" \
-    "Transceiver.h" \
-    "ThreadPool.h" \
-    "Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "ObjectAdapterI.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "EndpointI.h" \
-    "AcceptorF.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "ReferenceFactory.h" \
-    "Reference.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "BatchRequestQueue.h" \
-    "SharedContext.h" \
-    "ProxyFactory.h" \
-
-ConnectionRequestHandler.obj: \
-	ConnectionRequestHandler.cpp \
-    "ConnectionRequestHandler.h" \
-    "RequestHandler.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "Reference.h" \
-    "ReferenceFactoryF.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "ConnectionI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "TraceLevelsF.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "ProtocolInstanceF.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "RouterInfo.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-
-Connector.obj: \
-	Connector.cpp \
-    "Connector.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "ConnectorF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "TransceiverF.h" \
-
-ConnectRequestHandler.obj: \
-	ConnectRequestHandler.cpp \
-    "ConnectRequestHandler.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "ConnectRequestHandlerF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "RequestHandler.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "Reference.h" \
-    "ReferenceFactoryF.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "RouterInfo.h" \
-    "ConnectionRequestHandler.h" \
-    "RequestHandlerFactory.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "ConnectionI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "Network.h" \
-    "ProtocolInstanceF.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "ThreadPool.h" \
-    "Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-DefaultsAndOverrides.obj: \
-	DefaultsAndOverrides.cpp \
-    "DefaultsAndOverrides.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ProtocolInstanceF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LocalException.h" \
-
-DeprecatedStringConverter.obj: \
-	DeprecatedStringConverter.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-
-DispatchInterceptor.obj: \
-	DispatchInterceptor.cpp \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "IncomingRequest.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-DynamicLibrary.obj: \
-	DynamicLibrary.cpp \
-    "$(includedir)\Ice\DynamicLibrary.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-
-EndpointFactory.obj: \
-	EndpointFactory.cpp \
-    "EndpointFactory.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "EndpointFactoryF.h" \
-    "ProtocolInstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "EndpointFactoryManager.h" \
-
-EndpointFactoryManager.obj: \
-	EndpointFactoryManager.cpp \
-    "EndpointFactoryManager.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "EndpointIF.h" \
-    "EndpointFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "OpaqueEndpointI.h" \
-    "EndpointI.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "AcceptorF.h" \
-    "EndpointFactory.h" \
-    "ProtocolInstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "DefaultsAndOverrides.h" \
-    "Network.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-EndpointI.obj: \
-	EndpointI.cpp \
-    "EndpointI.h" \
-    "EndpointIF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "AcceptorF.h" \
-
-EventHandler.obj: \
-	EventHandler.cpp \
-    "EventHandler.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "EventHandlerF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ProtocolInstanceF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-
-Exception.obj: \
-	Exception.cpp \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ProtocolInstanceF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-FactoryTable.obj: \
-	FactoryTable.cpp \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-
-FactoryTableInit.obj: \
-	FactoryTableInit.cpp \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-
-GCObject.obj: \
-	GCObject.cpp \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-
-HttpParser.obj: \
-	HttpParser.cpp \
-    "$(includedir)\IceUtil\Config.h" \
-    "HttpParser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-ImplicitContextI.obj: \
-	ImplicitContextI.cpp \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-
-Incoming.obj: \
-	Incoming.cpp \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "IncomingRequest.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "ServantManager.h" \
-    "ConnectionI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "TransceiverF.h" \
-    "EndpointIF.h" \
-    "ConnectorF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "TraceLevelsF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "ProtocolInstanceF.h" \
-    "RequestHandler.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "ReplyStatus.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-IncomingAsync.obj: \
-	IncomingAsync.cpp \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "ConnectionI.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "TransceiverF.h" \
-    "EndpointIF.h" \
-    "ConnectorF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "TraceLevelsF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "ProtocolInstanceF.h" \
-    "RequestHandler.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "ReplyStatus.h" \
-
-Initialize.obj: \
-	Initialize.cpp \
-    "..\..\src\IceUtil\ArgVector.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "CommunicatorI.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "PropertiesI.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "StreamI.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "LoggerI.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "Instance.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Process.h" \
-    "PluginManagerI.h" \
-
-Instance.obj: \
-	Instance.cpp \
-    "Instance.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "TraceLevels.h" \
-    "DefaultsAndOverrides.h" \
-    "Network.h" \
-    "ProtocolInstanceF.h" \
-    "RouterInfo.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "LocatorInfo.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "ReferenceFactory.h" \
-    "Reference.h" \
-    "BatchRequestQueue.h" \
-    "SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "ProxyFactory.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "ThreadPool.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "ConnectionFactory.h" \
-    "ConnectionI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "RequestHandler.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "AcceptorF.h" \
-    "EndpointI.h" \
-    "ObjectFactoryManager.h" \
-    "ObjectAdapterFactory.h" \
-    "ObjectAdapterI.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "PropertiesI.h" \
-    "PropertiesAdminI.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "LoggerI.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "NetworkProxy.h" \
-    "EndpointFactoryManager.h" \
-    "EndpointFactoryF.h" \
-    "IPEndpointI.h" \
-    "WSEndpoint.h" \
-    "EndpointFactory.h" \
-    "ProtocolInstance.h" \
-    "RequestHandlerFactory.h" \
-    "ConnectRequestHandlerF.h" \
-    "RetryQueue.h" \
-    "$(includedir)\Ice\DynamicLibrary.h" \
-    "PluginManagerI.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "InstrumentationI.h" \
-    "$(includedir)\Ice\MetricsObserverI.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\MetricsAdminI.h" \
-    "$(includedir)\Ice\MetricsFunctional.h" \
-    "LoggerAdminI.h" \
-    "RegisterPluginsInit.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-InstrumentationI.obj: \
-	InstrumentationI.cpp \
-    "InstrumentationI.h" \
-    "$(includedir)\Ice\MetricsObserverI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\MetricsAdminI.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\MetricsFunctional.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-IPEndpointI.obj: \
-	IPEndpointI.cpp \
-    "IPEndpointI.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "IPEndpointIF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "EndpointI.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "AcceptorF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ProtocolInstanceF.h" \
-    "ProtocolInstance.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "PropertiesI.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "HashUtil.h" \
-    "NetworkProxy.h" \
-
-LocalObject.obj: \
-	LocalObject.cpp \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-
-LocatorInfo.obj: \
-	LocatorInfo.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "LocatorInfo.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "LocatorInfoF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "TraceLevels.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "EndpointI.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "AcceptorF.h" \
-    "Reference.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "BatchRequestQueue.h" \
-    "SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-
-LoggerAdminI.obj: \
-	LoggerAdminI.cpp \
-    "LoggerAdminI.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-
-LoggerI.obj: \
-	LoggerI.cpp \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "LoggerI.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-LoggerUtil.obj: \
-	LoggerUtil.cpp \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-
-MetricsAdminI.obj: \
-	MetricsAdminI.cpp \
-    "$(includedir)\Ice\MetricsAdminI.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "InstrumentationI.h" \
-    "$(includedir)\Ice\MetricsObserverI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\MetricsFunctional.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-MetricsObserverI.obj: \
-	MetricsObserverI.cpp \
-    "$(includedir)\Ice\MetricsObserverI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\MetricsAdminI.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\MetricsFunctional.h" \
-
-Network.obj: \
-	Network.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "Network.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "NetworkF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ProtocolInstanceF.h" \
-    "NetworkProxy.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "ProtocolInstance.h" \
-    "EndpointIF.h" \
-    "ConnectorF.h" \
-    "IPEndpointIF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\IceUtil\Random.h" \
-
-NetworkProxy.obj: \
-	NetworkProxy.cpp \
-    "NetworkProxy.h" \
-    "Network.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "NetworkF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ProtocolInstanceF.h" \
-    "HttpParser.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-
-Object.obj: \
-	Object.cpp \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "IncomingRequest.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-
-ObjectAdapterFactory.obj: \
-	ObjectAdapterFactory.cpp \
-    "ObjectAdapterFactory.h" \
-    "ObjectAdapterI.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "RouterInfoF.h" \
-    "EndpointIF.h" \
-    "LocatorInfoF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "ACM.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-ObjectAdapterI.obj: \
-	ObjectAdapterI.cpp \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "ObjectAdapterI.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "RouterInfoF.h" \
-    "EndpointIF.h" \
-    "LocatorInfoF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "ACM.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ObjectAdapterFactory.h" \
-    "Instance.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "ReferenceFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "ProxyFactory.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "ReferenceFactory.h" \
-    "Reference.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "BatchRequestQueue.h" \
-    "SharedContext.h" \
-    "EndpointI.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "AcceptorF.h" \
-    "EndpointFactoryManager.h" \
-    "EndpointFactoryF.h" \
-    "ConnectionFactory.h" \
-    "ConnectionI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "Network.h" \
-    "ProtocolInstanceF.h" \
-    "RequestHandler.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "ServantManager.h" \
-    "RouterInfo.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "LocatorInfo.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "ThreadPool.h" \
-    "Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "DefaultsAndOverrides.h" \
-    "TraceLevels.h" \
-    "PropertyNames.h" \
-
-ObjectFactoryManager.obj: \
-	ObjectFactoryManager.cpp \
-    "ObjectFactoryManager.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-ObserverHelper.obj: \
-	ObserverHelper.cpp \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "Reference.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "ReferenceFactoryF.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-
-OpaqueEndpointI.obj: \
-	OpaqueEndpointI.cpp \
-    "OpaqueEndpointI.h" \
-    "EndpointI.h" \
-    "EndpointIF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "AcceptorF.h" \
-    "EndpointFactory.h" \
-    "EndpointFactoryF.h" \
-    "ProtocolInstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "DefaultsAndOverrides.h" \
-    "DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "Base64.h" \
-    "HashUtil.h" \
-    "$(includedir)\Ice\LocalException.h" \
-
-Outgoing.obj: \
-	Outgoing.cpp \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "ConnectionI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "TransceiverF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "EndpointIF.h" \
-    "ConnectorF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "TraceLevelsF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "ProtocolInstanceF.h" \
-    "RequestHandler.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "CollocatedRequestHandler.h" \
-    "Reference.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "ReplyStatus.h" \
-
-OutgoingAsync.obj: \
-	OutgoingAsync.cpp \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "ConnectionI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "TransceiverF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "EndpointIF.h" \
-    "ConnectorF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "TraceLevelsF.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "ProtocolInstanceF.h" \
-    "RequestHandler.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "CollocatedRequestHandler.h" \
-    "Reference.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "ReplyStatus.h" \
-    "ThreadPool.h" \
-    "Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "RetryQueue.h" \
-
-PluginManagerI.obj: \
-	PluginManagerI.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "PluginManagerI.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\Ice\DynamicLibrary.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Process.h" \
-
-PropertiesAdminI.obj: \
-	PropertiesAdminI.cpp \
-    "PropertiesAdminI.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Plugin.h" \
-
-PropertiesI.obj: \
-	PropertiesI.cpp \
-    "PropertiesI.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "PropertyNames.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-
-PropertyNames.obj: \
-	PropertyNames.cpp \
-    "PropertyNames.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-Protocol.obj: \
-	Protocol.cpp \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-ProtocolInstance.obj: \
-	ProtocolInstance.cpp \
-    "ProtocolInstance.h" \
-    "ProtocolInstanceF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "EndpointIF.h" \
-    "ConnectorF.h" \
-    "IPEndpointIF.h" \
-    "NetworkF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "IPEndpointI.h" \
-    "EndpointI.h" \
-    "TransceiverF.h" \
-    "AcceptorF.h" \
-    "Network.h" \
-    "DefaultsAndOverrides.h" \
-    "TraceLevels.h" \
-
-ProtocolPluginFacade.obj: \
-	ProtocolPluginFacade.cpp \
-    "ProtocolPluginFacade.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "ProtocolPluginFacadeF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "EndpointFactoryF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "EndpointIF.h" \
-    "NetworkF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "EndpointFactoryManager.h" \
-    "TraceLevels.h" \
-    "DefaultsAndOverrides.h" \
-    "Network.h" \
-    "ProtocolInstanceF.h" \
-
-Proxy.obj: \
-	Proxy.cpp \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "ProxyFactory.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "ReferenceFactory.h" \
-    "ReferenceFactoryF.h" \
-    "Reference.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "SharedContext.h" \
-    "ObjectAdapterFactory.h" \
-    "ObjectAdapterI.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "ACM.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "EndpointI.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "AcceptorF.h" \
-    "Instance.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Process.h" \
-    "RouterInfo.h" \
-    "LocatorInfo.h" \
-    "ConnectionI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "Network.h" \
-    "ProtocolInstanceF.h" \
-    "RequestHandler.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Stream.h" \
-
-ProxyFactory.obj: \
-	ProxyFactory.cpp \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "ProxyFactory.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "ReferenceFactory.h" \
-    "Reference.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "BatchRequestQueue.h" \
-    "SharedContext.h" \
-    "LocatorInfo.h" \
-    "RouterInfo.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "TraceLevels.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-
-Reference.obj: \
-	Reference.cpp \
-    "Reference.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "ReferenceFactoryF.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "ReferenceFactory.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "EndpointI.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "AcceptorF.h" \
-    "OpaqueEndpointI.h" \
-    "EndpointFactory.h" \
-    "EndpointFactoryF.h" \
-    "ProtocolInstanceF.h" \
-    "RouterInfo.h" \
-    "$(includedir)\Ice\Router.h" \
-    "LocatorInfo.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "ConnectionI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "Network.h" \
-    "RequestHandler.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "ConnectionFactory.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "TraceLevels.h" \
-    "HashUtil.h" \
-    "RequestHandlerFactory.h" \
-    "ConnectRequestHandlerF.h" \
-    "ConnectionRequestHandler.h" \
-    "DefaultsAndOverrides.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-
-ReferenceFactory.obj: \
-	ReferenceFactory.cpp \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "ReferenceFactory.h" \
-    "ReferenceFactoryF.h" \
-    "Reference.h" \
-    "EndpointIF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "SharedContext.h" \
-    "ProxyFactory.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Process.h" \
-    "EndpointI.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "AcceptorF.h" \
-    "ConnectionI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "Network.h" \
-    "ProtocolInstanceF.h" \
-    "RequestHandler.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "EndpointFactoryManager.h" \
-    "EndpointFactoryF.h" \
-    "RouterInfo.h" \
-    "$(includedir)\Ice\Router.h" \
-    "LocatorInfo.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "DefaultsAndOverrides.h" \
-    "PropertyNames.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-RegisterPluginsInit.obj: \
-	RegisterPluginsInit.cpp \
-    "RegisterPluginsInit.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-
-RequestHandler.obj: \
-	RequestHandler.cpp \
-    "RequestHandler.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "Reference.h" \
-    "ReferenceFactoryF.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-RequestHandlerFactory.obj: \
-	RequestHandlerFactory.cpp \
-    "RequestHandlerFactory.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "ConnectRequestHandlerF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "CollocatedRequestHandler.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "RequestHandler.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "TraceLevelsF.h" \
-    "ConnectRequestHandler.h" \
-    "Reference.h" \
-    "ReferenceFactoryF.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "RouterInfo.h" \
-    "ObjectAdapterFactory.h" \
-    "ObjectAdapterI.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "ACM.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "Instance.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "DefaultsAndOverridesF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Process.h" \
-
-ResponseHandler.obj: \
-	ResponseHandler.cpp \
-    "ResponseHandler.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-
-RetryQueue.obj: \
-	RetryQueue.cpp \
-    "RetryQueue.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "RequestHandler.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "TraceLevels.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-RouterInfo.obj: \
-	RouterInfo.cpp \
-    "RouterInfo.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "RouterInfoF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "Reference.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "LocatorInfoF.h" \
-    "BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-
-Selector.obj: \
-	Selector.cpp \
-    "Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "Network.h" \
-    "$(includedir)\Ice\Config.h" \
-    "NetworkF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ProtocolInstanceF.h" \
-    "EventHandlerF.h" \
-    "EventHandler.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-ServantManager.obj: \
-	ServantManager.cpp \
-    "ServantManager.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-Service.obj: \
-	Service.cpp \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\src\IceUtil\ArgVector.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "LoggerI.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "ImplicitContextI.h" \
-    "EventLoggerMsg.h" \
-
-SliceChecksums.obj: \
-	SliceChecksums.cpp \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-
-SlicedData.obj: \
-	SlicedData.cpp \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-Stream.obj: \
-	Stream.cpp \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-StreamI.obj: \
-	StreamI.cpp \
-    "StreamI.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "DefaultsAndOverrides.h" \
-    "Network.h" \
-    "ProtocolInstanceF.h" \
-
-StreamSocket.obj: \
-	StreamSocket.cpp \
-    "StreamSocket.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "Network.h" \
-    "$(includedir)\Ice\Config.h" \
-    "NetworkF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ProtocolInstanceF.h" \
-    "NetworkProxy.h" \
-    "ProtocolInstance.h" \
-    "EndpointIF.h" \
-    "ConnectorF.h" \
-    "IPEndpointIF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-
-StringConverterPlugin.obj: \
-	StringConverterPlugin.cpp \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-TcpAcceptor.obj: \
-	TcpAcceptor.cpp \
-    "TcpAcceptor.h" \
-    "TransceiverF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "ProtocolInstanceF.h" \
-    "Acceptor.h" \
-    "AcceptorF.h" \
-    "EndpointIF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "TcpTransceiver.h" \
-    "Transceiver.h" \
-    "StreamSocket.h" \
-    "WSTransceiver.h" \
-    "ProtocolInstance.h" \
-    "ConnectorF.h" \
-    "IPEndpointIF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "HttpParser.h" \
-    "TcpEndpointI.h" \
-    "IPEndpointI.h" \
-    "EndpointI.h" \
-    "EndpointFactory.h" \
-    "EndpointFactoryF.h" \
-    "WSEndpoint.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-TcpConnector.obj: \
-	TcpConnector.cpp \
-    "TcpConnector.h" \
-    "TransceiverF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "ProtocolInstanceF.h" \
-    "Connector.h" \
-    "ConnectorF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "TcpTransceiver.h" \
-    "Transceiver.h" \
-    "EndpointIF.h" \
-    "StreamSocket.h" \
-    "WSTransceiver.h" \
-    "ProtocolInstance.h" \
-    "IPEndpointIF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "HttpParser.h" \
-    "TcpEndpointI.h" \
-    "IPEndpointI.h" \
-    "EndpointI.h" \
-    "AcceptorF.h" \
-    "EndpointFactory.h" \
-    "EndpointFactoryF.h" \
-    "WSEndpoint.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "NetworkProxy.h" \
-
-TcpEndpointI.obj: \
-	TcpEndpointI.cpp \
-    "TcpEndpointI.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "IPEndpointI.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "IPEndpointIF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "EndpointI.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "AcceptorF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ProtocolInstanceF.h" \
-    "EndpointFactory.h" \
-    "EndpointFactoryF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "WSEndpoint.h" \
-    "ProtocolInstance.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "TcpAcceptor.h" \
-    "Acceptor.h" \
-    "TcpConnector.h" \
-    "Connector.h" \
-    "TcpTransceiver.h" \
-    "Transceiver.h" \
-    "StreamSocket.h" \
-    "WSTransceiver.h" \
-    "HttpParser.h" \
-    "HashUtil.h" \
-
-TcpTransceiver.obj: \
-	TcpTransceiver.cpp \
-    "TcpTransceiver.h" \
-    "ProtocolInstanceF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "Transceiver.h" \
-    "TransceiverF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "EndpointIF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "StreamSocket.h" \
-    "WSTransceiver.h" \
-    "ProtocolInstance.h" \
-    "ConnectorF.h" \
-    "IPEndpointIF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "HttpParser.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-ThreadPool.obj: \
-	ThreadPool.cpp \
-    "ThreadPool.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "EventHandler.h" \
-    "EventHandlerF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "ProtocolInstanceF.h" \
-    "Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "ObjectAdapterFactory.h" \
-    "ObjectAdapterI.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "TraceLevels.h" \
-
-TraceLevels.obj: \
-	TraceLevels.cpp \
-    "TraceLevels.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "TraceLevelsF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-TraceUtil.obj: \
-	TraceUtil.cpp \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "TraceUtil.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "TraceLevelsF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "IPEndpointIF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "TraceLevels.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "ReplyStatus.h" \
-
-Transceiver.obj: \
-	Transceiver.cpp \
-    "Transceiver.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "TransceiverF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "EndpointIF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ProtocolInstanceF.h" \
-
-UdpConnector.obj: \
-	UdpConnector.cpp \
-    "UdpConnector.h" \
-    "TransceiverF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "ProtocolInstanceF.h" \
-    "Connector.h" \
-    "ConnectorF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ProtocolInstance.h" \
-    "EndpointIF.h" \
-    "IPEndpointIF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "UdpTransceiver.h" \
-    "Transceiver.h" \
-    "UdpEndpointI.h" \
-    "IPEndpointI.h" \
-    "EndpointI.h" \
-    "AcceptorF.h" \
-    "EndpointFactory.h" \
-    "EndpointFactoryF.h" \
-
-UdpEndpointI.obj: \
-	UdpEndpointI.cpp \
-    "UdpEndpointI.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "IPEndpointI.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "IPEndpointIF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "EndpointI.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "AcceptorF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "ProtocolInstanceF.h" \
-    "EndpointFactory.h" \
-    "EndpointFactoryF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "UdpConnector.h" \
-    "Connector.h" \
-    "UdpTransceiver.h" \
-    "Transceiver.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "ProtocolInstance.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "HashUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-UdpTransceiver.obj: \
-	UdpTransceiver.cpp \
-    "UdpTransceiver.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "ProtocolInstanceF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "Transceiver.h" \
-    "TransceiverF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "EndpointIF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "UdpEndpointI.h" \
-    "IPEndpointI.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "IPEndpointIF.h" \
-    "EndpointI.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "ConnectorF.h" \
-    "AcceptorF.h" \
-    "EndpointFactory.h" \
-    "EndpointFactoryF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "ProtocolInstance.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-WSAcceptor.obj: \
-	WSAcceptor.cpp \
-    "WSAcceptor.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "TransceiverF.h" \
-    "Acceptor.h" \
-    "AcceptorF.h" \
-    "EndpointIF.h" \
-    "Network.h" \
-    "NetworkF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "ProtocolInstanceF.h" \
-    "ProtocolInstance.h" \
-    "ConnectorF.h" \
-    "IPEndpointIF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "WSTransceiver.h" \
-    "HttpParser.h" \
-    "Transceiver.h" \
-    "WSEndpoint.h" \
-    "EndpointI.h" \
-    "EndpointFactory.h" \
-    "EndpointFactoryF.h" \
-
-WSConnector.obj: \
-	WSConnector.cpp \
-    "WSConnector.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "TransceiverF.h" \
-    "Connector.h" \
-    "ConnectorF.h" \
-    "ProtocolInstance.h" \
-    "ProtocolInstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "EndpointIF.h" \
-    "IPEndpointIF.h" \
-    "NetworkF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "WSTransceiver.h" \
-    "HttpParser.h" \
-    "Transceiver.h" \
-    "Network.h" \
-    "WSEndpoint.h" \
-    "EndpointI.h" \
-    "AcceptorF.h" \
-    "EndpointFactory.h" \
-    "EndpointFactoryF.h" \
-
-WSEndpoint.obj: \
-	WSEndpoint.cpp \
-    "WSEndpoint.h" \
-    "EndpointI.h" \
-    "EndpointIF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "TransceiverF.h" \
-    "ConnectorF.h" \
-    "AcceptorF.h" \
-    "IPEndpointIF.h" \
-    "EndpointFactory.h" \
-    "EndpointFactoryF.h" \
-    "ProtocolInstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "ProtocolInstance.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "NetworkF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "WSAcceptor.h" \
-    "Acceptor.h" \
-    "Network.h" \
-    "WSConnector.h" \
-    "Connector.h" \
-    "IPEndpointI.h" \
-    "HashUtil.h" \
-    "EndpointFactoryManager.h" \
-
-WSTransceiver.obj: \
-	WSTransceiver.cpp \
-    "WSTransceiver.h" \
-    "ProtocolInstance.h" \
-    "ProtocolInstanceF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "EndpointIF.h" \
-    "ConnectorF.h" \
-    "IPEndpointIF.h" \
-    "NetworkF.h" \
-    "Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "TraceLevelsF.h" \
-    "DefaultsAndOverridesF.h" \
-    "RouterInfoF.h" \
-    "LocatorInfoF.h" \
-    "ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "EndpointFactoryManagerF.h" \
-    "RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "HttpParser.h" \
-    "Transceiver.h" \
-    "TransceiverF.h" \
-    "Network.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "Base64.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\SHA1.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-DLLMain.obj: \
-	DLLMain.cpp \
-    "ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-
-BuiltinSequences.obj: \
-	BuiltinSequences.cpp \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-Communicator.obj: \
-	Communicator.cpp \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-CommunicatorF.obj: \
-	CommunicatorF.cpp \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-Connection.obj: \
-	Connection.cpp \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-ConnectionF.obj: \
-	ConnectionF.cpp \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-Current.obj: \
-	Current.cpp \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-Endpoint.obj: \
-	Endpoint.cpp \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-EndpointF.obj: \
-	EndpointF.cpp \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-EndpointTypes.obj: \
-	EndpointTypes.cpp \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-FacetMap.obj: \
-	FacetMap.cpp \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-Identity.obj: \
-	Identity.cpp \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-ImplicitContext.obj: \
-	ImplicitContext.cpp \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-ImplicitContextF.obj: \
-	ImplicitContextF.cpp \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-Instrumentation.obj: \
-	Instrumentation.cpp \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-InstrumentationF.obj: \
-	InstrumentationF.cpp \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-LocalException.obj: \
-	LocalException.cpp \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-Locator.obj: \
-	Locator.cpp \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-LocatorF.obj: \
-	LocatorF.cpp \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-Logger.obj: \
-	Logger.cpp \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-LoggerF.obj: \
-	LoggerF.cpp \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-Metrics.obj: \
-	Metrics.cpp \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-ObjectAdapter.obj: \
-	ObjectAdapter.cpp \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-ObjectAdapterF.obj: \
-	ObjectAdapterF.cpp \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-ObjectFactory.obj: \
-	ObjectFactory.cpp \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-ObjectFactoryF.obj: \
-	ObjectFactoryF.cpp \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-Plugin.obj: \
-	Plugin.cpp \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-PluginF.obj: \
-	PluginF.cpp \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-Process.obj: \
-	Process.cpp \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-ProcessF.obj: \
-	ProcessF.cpp \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-Properties.obj: \
-	Properties.cpp \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-PropertiesAdmin.obj: \
-	PropertiesAdmin.cpp \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-PropertiesF.obj: \
-	PropertiesF.cpp \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-RemoteLogger.obj: \
-	RemoteLogger.cpp \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-Router.obj: \
-	Router.cpp \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-RouterF.obj: \
-	RouterF.cpp \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-ServantLocator.obj: \
-	ServantLocator.cpp \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-ServantLocatorF.obj: \
-	ServantLocatorF.cpp \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-SliceChecksumDict.obj: \
-	SliceChecksumDict.cpp \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-Version.obj: \
-	Version.cpp \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
diff --git a/cpp/src/Ice/.gitignore b/cpp/src/Ice/.gitignore
deleted file mode 100644
index 99bfe471904..00000000000
--- a/cpp/src/Ice/.gitignore
+++ /dev/null
@@ -1,83 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
-BuiltinSequences.cpp
-Communicator.cpp
-CommunicatorF.cpp
-Connection.cpp
-ConnectionF.cpp
-Current.cpp
-Endpoint.cpp
-EndpointF.cpp
-EndpointTypes.cpp
-FacetMap.cpp
-Identity.cpp
-ImplicitContext.cpp
-ImplicitContextF.cpp
-Instrumentation.cpp
-InstrumentationF.cpp
-LocalException.cpp
-Locator.cpp
-LocatorF.cpp
-Logger.cpp
-LoggerF.cpp
-Metrics.cpp
-ObjectAdapter.cpp
-ObjectAdapterF.cpp
-ObjectFactory.cpp
-ObjectFactoryF.cpp
-Plugin.cpp
-PluginF.cpp
-Process.cpp
-ProcessF.cpp
-Properties.cpp
-PropertiesAdmin.cpp
-PropertiesF.cpp
-RemoteLogger.cpp
-Router.cpp
-RouterF.cpp
-ServantLocator.cpp
-ServantLocatorF.cpp
-SliceChecksumDict.cpp
-Version.cpp
-BuiltinSequences.h
-Communicator.h
-CommunicatorF.h
-Connection.h
-ConnectionF.h
-Current.h
-Endpoint.h
-EndpointF.h
-EndpointTypes.h
-FacetMap.h
-Identity.h
-ImplicitContext.h
-ImplicitContextF.h
-Instrumentation.h
-InstrumentationF.h
-LocalException.h
-Locator.h
-LocatorF.h
-Logger.h
-LoggerF.h
-Metrics.h
-ObjectAdapter.h
-ObjectAdapterF.h
-ObjectFactory.h
-ObjectFactoryF.h
-Plugin.h
-PluginF.h
-Process.h
-ProcessF.h
-Properties.h
-PropertiesAdmin.h
-PropertiesF.h
-RemoteLogger.h
-Router.h
-RouterF.h
-ServantLocator.h
-ServantLocatorF.h
-SliceChecksumDict.h
-Version.h
diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp
index 8983cceee5a..9990d76f995 100644
--- a/cpp/src/Ice/ACM.cpp
+++ b/cpp/src/Ice/ACM.cpp
@@ -18,8 +18,10 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(ACMMonitor* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(FactoryACMMonitor* p) { return p; }
+#endif
 
 IceInternal::ACMConfig::ACMConfig(bool server) :
     timeout(IceUtil::Time::seconds(60)), 
@@ -107,7 +109,7 @@ IceInternal::FactoryACMMonitor::add(const ConnectionIPtr& connection)
     if(_connections.empty())
     {
         _connections.insert(connection);
-        _instance->timer()->scheduleRepeated(this, _config.timeout / 2);
+        _instance->timer()->scheduleRepeated(ICE_SHARED_FROM_THIS, _config.timeout / 2);
     }
     else
     {
@@ -156,7 +158,7 @@ IceInternal::FactoryACMMonitor::acm(const IceUtil::Optional<int>& timeout,
     {
         config.heartbeat = *heartbeat;
     }
-    return new ConnectionACMMonitor(this, _instance->timer(), config);
+    return ICE_MAKE_SHARED(ConnectionACMMonitor, ICE_SHARED_FROM_THIS, _instance->timer(), config);
 }
 
 Ice::ACM
@@ -201,7 +203,7 @@ IceInternal::FactoryACMMonitor::runTimerTask()
 
         if(_connections.empty())
         {
-            _instance->timer()->cancel(this);
+            _instance->timer()->cancel(ICE_SHARED_FROM_THIS);
             return;
         }
     }
@@ -275,7 +277,7 @@ IceInternal::ConnectionACMMonitor::add(const ConnectionIPtr& connection)
     _connection = connection;
     if(_config.timeout != IceUtil::Time())
     {
-        _timer->scheduleRepeated(this, _config.timeout / 2);
+        _timer->scheduleRepeated(ICE_SHARED_FROM_THIS, _config.timeout / 2);
     }
 }
 
@@ -286,7 +288,7 @@ IceInternal::ConnectionACMMonitor::remove(const ConnectionIPtr& connection)
     assert(_connection == connection);
     if(_config.timeout != IceUtil::Time())
     {
-        _timer->cancel(this);
+        _timer->cancel(ICE_SHARED_FROM_THIS);
     }
     _connection = 0;
 }
diff --git a/cpp/src/Ice/ACM.h b/cpp/src/Ice/ACM.h
index 455cd44115c..6859669255c 100644
--- a/cpp/src/Ice/ACM.h
+++ b/cpp/src/Ice/ACM.h
@@ -19,6 +19,7 @@
 #include <Ice/InstanceF.h>
 #include <Ice/PropertiesF.h>
 #include <Ice/LoggerF.h>
+#include <Ice/VirtualShared.h>
 #include <set>
 
 namespace IceInternal
@@ -44,13 +45,13 @@ public:
     virtual void remove(const Ice::ConnectionIPtr&) = 0;
     virtual void reap(const Ice::ConnectionIPtr&) = 0;
 
-    virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&, 
-                              const IceUtil::Optional<Ice::ACMClose>&, 
+    virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&,
+                              const IceUtil::Optional<Ice::ACMClose>&,
                               const IceUtil::Optional<Ice::ACMHeartbeat>&) = 0;
     virtual Ice::ACM getACM() = 0;
 };
 
-class FactoryACMMonitor : public ACMMonitor, public ::IceUtil::Mutex
+class FactoryACMMonitor : public ACMMonitor, public IceUtil::Mutex, public Ice::EnableSharedFromThis<FactoryACMMonitor>
 {
 public:
 
@@ -61,8 +62,8 @@ public:
     virtual void remove(const Ice::ConnectionIPtr&);
     virtual void reap(const Ice::ConnectionIPtr&);
 
-    virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&, 
-                              const IceUtil::Optional<Ice::ACMClose>&, 
+    virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&,
+                              const IceUtil::Optional<Ice::ACMClose>&,
                               const IceUtil::Optional<Ice::ACMHeartbeat>&);
     virtual Ice::ACM getACM();
 
@@ -85,7 +86,9 @@ private:
     std::vector<Ice::ConnectionIPtr> _reapedConnections;
 };
 
-class ConnectionACMMonitor : public ACMMonitor, public ::IceUtil::Mutex
+class ConnectionACMMonitor : public ACMMonitor,
+                             public IceUtil::Mutex,
+                             public Ice::EnableSharedFromThis<ConnectionACMMonitor>
 {
 public:
 
@@ -96,8 +99,8 @@ public:
     virtual void remove(const Ice::ConnectionIPtr&);
     virtual void reap(const Ice::ConnectionIPtr&);
 
-    virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&, 
-                              const IceUtil::Optional<Ice::ACMClose>&, 
+    virtual ACMMonitorPtr acm(const IceUtil::Optional<int>&,
+                              const IceUtil::Optional<Ice::ACMClose>&,
                               const IceUtil::Optional<Ice::ACMHeartbeat>&);
     virtual Ice::ACM getACM();
 
diff --git a/cpp/src/Ice/Acceptor.cpp b/cpp/src/Ice/Acceptor.cpp
index 4faae242150..892361d967d 100644
--- a/cpp/src/Ice/Acceptor.cpp
+++ b/cpp/src/Ice/Acceptor.cpp
@@ -13,4 +13,11 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+
+Acceptor::~Acceptor()
+{
+    // Out of line to avoid weak vtable
+}
+
+
 IceUtil::Shared* IceInternal::upCast(Acceptor* p) { return p; }
diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h
index 72c398b912e..269c8963226 100644
--- a/cpp/src/Ice/Acceptor.h
+++ b/cpp/src/Ice/Acceptor.h
@@ -19,9 +19,10 @@
 namespace IceInternal
 {
 
-class ICE_API Acceptor : virtual public ::IceUtil::Shared
+class ICE_API Acceptor : public virtual ::IceUtil::Shared
 {
 public:
+    virtual ~Acceptor();
 
     virtual NativeInfoPtr getNativeInfo() = 0;
     virtual void close() = 0;
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index f11177793de..af4e6458ef2 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -312,9 +312,9 @@ Ice::Application::main(int argc, char* argv[], const char* configFile)
         IceInternal::Application::_appName = argv[0];
     }
 
-    if(argc > 0 && argv[0] && LoggerIPtr::dynamicCast(getProcessLogger()))
+    if(argc > 0 && argv[0] && ICE_DYNAMIC_CAST(LoggerI, getProcessLogger()))
     {
-        setProcessLogger(new LoggerI(argv[0], "", true, IceUtil::getProcessStringConverter()));
+        setProcessLogger(ICE_MAKE_SHARED(LoggerI, argv[0], "", true, IceUtil::getProcessStringConverter()));
     }
 
     InitializationData initData;
@@ -364,12 +364,12 @@ Ice::Application::main(int argc, wchar_t* argv[], const Ice::InitializationData&
 int
 Ice::Application::main(int argc, char* argv[], const InitializationData& initializationData)
 {
-    if(argc > 0 && argv[0] && LoggerIPtr::dynamicCast(getProcessLogger()))
+    if(argc > 0 && argv[0] && ICE_DYNAMIC_CAST(LoggerI, getProcessLogger()))
     {
         const bool convert = initializationData.properties ?
                 initializationData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) > 0 &&
                 initializationData.properties->getProperty("Ice.StdErr").empty() : true;
-        setProcessLogger(new LoggerI(argv[0], "", convert, IceUtil::getProcessStringConverter()));
+        setProcessLogger(ICE_MAKE_SHARED(LoggerI, argv[0], "", convert, IceUtil::getProcessStringConverter()));
     }
 
     if(IceInternal::Application::_communicator != 0)
@@ -655,13 +655,13 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initD
         // If the process logger is the default logger, we now replace it with a
         // a logger which is using the program name for the prefix.
         //
-        if(initData.properties->getProperty("Ice.ProgramName") != "" && LoggerIPtr::dynamicCast(getProcessLogger()))
+        if(initData.properties->getProperty("Ice.ProgramName") != "" && ICE_DYNAMIC_CAST(LoggerI, getProcessLogger()))
         {
             const bool convert =
                 initData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) > 0 &&
                 initData.properties->getProperty("Ice.StdErr").empty();
 
-            setProcessLogger(new LoggerI(initData.properties->getProperty("Ice.ProgramName"), "", convert,
+            setProcessLogger(ICE_MAKE_SHARED(LoggerI, initData.properties->getProperty("Ice.ProgramName"), "", convert,
                                          IceUtil::getProcessStringConverter()));
         }
 
diff --git a/cpp/src/IceUtil/ArgVector.cpp b/cpp/src/Ice/ArgVector.cpp
index 149c7172bc6..149c7172bc6 100644
--- a/cpp/src/IceUtil/ArgVector.cpp
+++ b/cpp/src/Ice/ArgVector.cpp
diff --git a/cpp/src/Ice/AsyncResult.cpp b/cpp/src/Ice/AsyncResult.cpp
index 122d92faf89..60e5ac65773 100644
--- a/cpp/src/Ice/AsyncResult.cpp
+++ b/cpp/src/Ice/AsyncResult.cpp
@@ -7,151 +7,20 @@
 //
 // **********************************************************************
 
+#ifndef ICE_CPP11_MAPPING
+
 #include <IceUtil/DisableWarnings.h>
 #include <Ice/AsyncResult.h>
-#include <Ice/ThreadPool.h>
-#include <Ice/Instance.h>
-#include <Ice/LoggerUtil.h>
-#include <Ice/Properties.h>
-#include <Ice/RequestHandler.h>
-#include <Ice/OutgoingAsync.h>
+#include <Ice/Proxy.h>
 
 using namespace std;
 using namespace Ice;
-using namespace IceInternal;
 
 IceUtil::Shared* Ice::upCast(AsyncResult* p) { return p; }
 
-const unsigned char Ice::AsyncResult::OK = 0x1;
-const unsigned char Ice::AsyncResult::Done = 0x2;
-const unsigned char Ice::AsyncResult::Sent = 0x4;
-const unsigned char Ice::AsyncResult::EndCalled = 0x8;
-
-void
-AsyncResult::cancel()
-{
-    cancel(InvocationCanceledException(__FILE__, __LINE__));
-}
-
-Int
-AsyncResult::getHash() const
-{
-    return static_cast<Int>(reinterpret_cast<Long>(this) >> 4);
-}
-
-CommunicatorPtr 
-AsyncResult::getCommunicator() const
-{
-    return _communicator;
-}
-
-ConnectionPtr 
-AsyncResult::getConnection() const
-{
-    return 0;
-}
-
-ObjectPrx 
-AsyncResult::getProxy() const
-{
-    return 0;
-}
-
-bool
-AsyncResult::isCompleted() const
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    return _state & Done;
-}
-
-void
-AsyncResult::waitForCompleted()
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    while(!(_state & Done))
-    {
-        _monitor.wait();
-    }
-}
-
-bool
-AsyncResult::isSent() const
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    return _state & Sent;
-}
-
-void
-AsyncResult::waitForSent()
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    while(!(_state & Sent) && !_exception.get())
-    {
-        _monitor.wait();
-    }
-}
-
-void
-AsyncResult::throwLocalException() const
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    if(_exception.get())
-    {
-        _exception.get()->ice_throw();
-    }
-}
-
-bool 
-AsyncResult::sentSynchronously() const
-{
-    return _sentSynchronously;
-}
-
-LocalObjectPtr 
-AsyncResult::getCookie() const
-{
-    return _cookie;
-}
-
-const std::string& 
-AsyncResult::getOperation() const
-{
-    return _operation;
-}
-
-void
-AsyncResult::__throwUserException()
-{
-    try
-    {
-        _is.startReadEncaps();
-        _is.throwException();
-    }
-    catch(const Ice::UserException&)
-    {
-        _is.endReadEncaps();
-        throw;
-    }
-}
-
-bool
-AsyncResult::__wait()
+AsyncResult::~AsyncResult()
 {
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    if(_state & EndCalled)
-    {
-        throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "end_ method called more than once");
-    }
-    _state |= EndCalled;
-    while(!(_state & Done))
-    {
-        _monitor.wait();
-    }
-    if(_exception.get())
-    {
-        _exception.get()->ice_throw();
-    }
-    return _state & OK;
+    // Out of line to avoid weak vtable
 }
 
 void
@@ -197,403 +66,11 @@ AsyncResult::__check(const AsyncResultPtr& r, const string& operation)
     {
         throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "AsyncResult == null");
     }
-    else if(&r->_operation != &operation)
+    else if(r->getOperation() != operation)
     {
         throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Incorrect operation for end_" + operation +
-                                                " method: " + r->_operation);
-    }
-}
-
-AsyncResult::AsyncResult(const CommunicatorPtr& communicator,
-                         const IceInternal::InstancePtr& instance,
-                         const string& op,
-                         const CallbackBasePtr& del,
-                         const LocalObjectPtr& cookie) :
-    _instance(instance),
-    _sentSynchronously(false),
-    _is(instance.get(), Ice::currentProtocolEncoding),
-    _communicator(communicator),
-    _operation(op),
-    _callback(del),
-    _cookie(cookie),
-    _state(0)
-{
-    if(!_callback)
-    {
-        throw IceUtil::IllegalArgumentException(__FILE__, __LINE__);
-    }
-    const_cast<CallbackBasePtr&>(_callback) = _callback->verify(_cookie);
-}
-
-AsyncResult::~AsyncResult()
-{
-}
-
-bool
-AsyncResult::sent(bool done)
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    assert(!_exception.get());
-
-    bool alreadySent = _state & Sent;
-    _state |= Sent;
-    if(done)
-    {
-        _state |= Done | OK;
-        _cancellationHandler = 0;
-        if(!_callback || !_callback->hasSentCallback())
-        {
-            _observer.detach();
-        }
-    }
-
-    _monitor.notifyAll();
-    return !alreadySent && _callback && _callback->hasSentCallback();
-}
-
-bool
-AsyncResult::finished(bool ok)
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    _state |= Done;
-    if(ok)
-    {
-        _state |= OK;
-    }
-    _cancellationHandler = 0;
-    if(!_callback)
-    {
-        _observer.detach();
-    }
-    _monitor.notifyAll();
-    return _callback;
-}
-
-bool
-AsyncResult::finished(const Ice::Exception& ex)
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    _state |= Done;
-    _exception.reset(ex.ice_clone());
-    _cancellationHandler = 0;
-    _observer.failed(ex.ice_name());
-    if(!_callback)
-    {
-        _observer.detach();
-    }
-    _monitor.notifyAll();
-    return _callback;
-}
-
-void
-AsyncResult::invokeSentAsync()
-{
-    class AsynchronousSent : public DispatchWorkItem
-    {
-    public:
-
-        AsynchronousSent(const ConnectionPtr& connection, const AsyncResultPtr& result) :
-            DispatchWorkItem(connection), _result(result)
-        {
-        }
-
-        virtual void
-        run()
-        {
-            _result->invokeSent();
-        }
-        
-    private:
-
-        const AsyncResultPtr _result;
-    };
-
-    //
-    // This is called when it's not safe to call the sent callback
-    // synchronously from this thread. Instead the exception callback
-    // is called asynchronously from the client thread pool.
-    //
-    try
-    {
-        _instance->clientThreadPool()->dispatch(new AsynchronousSent(_cachedConnection, this));
-    }
-    catch(const Ice::CommunicatorDestroyedException&)
-    {
-    }
-}
-
-void
-AsyncResult::invokeCompletedAsync()
-{
-    class AsynchronousCompleted : public DispatchWorkItem
-    {
-    public:
-
-        AsynchronousCompleted(const ConnectionPtr& connection, const AsyncResultPtr& result) :
-            DispatchWorkItem(connection), _result(result)
-        {
-        }
-
-        virtual void
-        run()
-        {
-            _result->invokeCompleted();
-        }
-
-    private:
-
-        const AsyncResultPtr _result;
-    };
-
-    //
-    // CommunicatorDestroyedCompleted is the only exception that can propagate directly
-    // from this method.
-    //
-    _instance->clientThreadPool()->dispatch(new AsynchronousCompleted(_cachedConnection, this));
-}
-
-void
-AsyncResult::invokeSent()
-{
-    assert(_callback);
-
-    try
-    {
-        AsyncResultPtr self(this);
-        _callback->sent(self);
-    }
-    catch(const std::exception& ex)
-    {
-        warning(ex);
-    }
-    catch(...)
-    {
-        warning();
-    }
-
-    if(_observer)
-    {
-        ObjectPrx proxy = getProxy();
-        if(!proxy || !proxy->ice_isTwoway())
-        {
-            _observer.detach();
-        }            
-    }
-}
-
-void
-AsyncResult::invokeCompleted()
-{
-    assert(_callback);
-
-    try
-    {
-        AsyncResultPtr self(this);
-        _callback->completed(self);
-    }
-    catch(const std::exception& ex)
-    {
-        warning(ex);
-    }
-    catch(...)
-    {
-        warning();
-    }
-
-    _observer.detach();
-}
-
-void
-AsyncResult::cancel(const Ice::LocalException& ex)
-{
-    CancellationHandlerPtr handler;
-    {
-        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-        _cancellationException.reset(ex.ice_clone());
-        if(!_cancellationHandler)
-        {
-            return;
-        }
-        handler = _cancellationHandler;
-    }
-    handler->asyncRequestCanceled(OutgoingAsyncBasePtr::dynamicCast(this), ex);
-}
-
-void
-AsyncResult::cancelable(const CancellationHandlerPtr& handler)
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    if(_cancellationException.get())
-    {
-        try
-        {
-            _cancellationException->ice_throw();
-        }
-        catch(const Ice::Exception&)
-        {
-            _cancellationException.reset(0);
-            throw;
-        }
-    }
-    _cancellationHandler = handler;
-}
-
-void
-AsyncResult::warning(const std::exception& exc) const
-{
-    if(_instance->initializationData().properties->getPropertyAsIntWithDefault("Ice.Warn.AMICallback", 1) > 0)
-    {
-        Warning out(_instance->initializationData().logger);
-        const Exception* ex = dynamic_cast<const Exception*>(&exc);
-        if(ex)
-        {
-            out << "Ice::Exception raised by AMI callback:\n" << *ex;
-        }
-        else
-        {
-            out << "std::exception raised by AMI callback:\n" << exc.what();
-        }
-    }
-}
-
-void
-AsyncResult::warning() const
-{
-    if(_instance->initializationData().properties->getPropertyAsIntWithDefault("Ice.Warn.AMICallback", 1) > 0)
-    {
-        Warning out(_instance->initializationData().logger);
-        out << "unknown exception raised by AMI callback";
-    }
-}
-
-
-namespace
-{
-
-//
-// Dummy class derived from CallbackBase
-// We use this class for the __dummyCallback extern pointer in OutgoingAsync. In turn,
-// this allows us to test whether the user supplied a null delegate instance to the
-// generated begin_ method without having to generate a separate test to throw IllegalArgumentException
-// in the inlined versions of the begin_ method. In other words, this reduces the amount of generated
-// object code.
-//
-class DummyCallback : public CallbackBase
-{
-public:
-
-    DummyCallback()
-    {
-    }
-
-    virtual void
-    completed(const Ice::AsyncResultPtr&) const
-    {
-         assert(false);
-    }
-
-    virtual CallbackBasePtr
-    verify(const Ice::LocalObjectPtr&)
-    {
-        //
-        // Called by the AsyncResult constructor to verify the delegate. The dummy
-        // delegate is passed when the user used a begin_ method without delegate.
-        // By returning 0 here, we tell the AsyncResult that no delegates was
-        // provided.
-        //
-        return 0;
-    }
-
-    virtual void
-    sent(const AsyncResultPtr&) const
-    {
-         assert(false);
-    }
-
-    virtual bool
-    hasSentCallback() const
-    {
-        assert(false);
-        return false;
+                                                " method: " + r->getOperation());
     }
-};
-
 }
 
-//
-// This gives a pointer value to compare against in the generated
-// begin_ method to decide whether the caller passed a null pointer
-// versus the generated inline version of the begin_ method having
-// passed a pointer to the dummy delegate.
-//
-CallbackBasePtr IceInternal::__dummyCallback = new DummyCallback;
-
-#ifdef ICE_CPP11
-
-Ice::CallbackPtr
-Ice::newCallback(const ::IceInternal::Function<void (const AsyncResultPtr&)>& completed,
-                 const ::IceInternal::Function<void (const AsyncResultPtr&)>& sent)
-{
-    class Cpp11CB : public GenericCallbackBase
-    {
-    public:
-
-        Cpp11CB(const ::std::function<void (const AsyncResultPtr&)>& completed,
-                const ::std::function<void (const AsyncResultPtr&)>& sent) :
-            _completed(completed),
-            _sent(sent)
-        {
-            checkCallback(true, completed != nullptr);
-        }
-
-        virtual void
-        completed(const AsyncResultPtr& result) const
-        {
-            _completed(result);
-        }
-
-        virtual CallbackBasePtr
-        verify(const LocalObjectPtr&)
-        {
-            return this; // Nothing to do, the cookie is not type-safe.
-        }
-
-        virtual void
-        sent(const AsyncResultPtr& result) const
-        {
-            if(_sent != nullptr)
-            {
-                _sent(result);
-             }
-        }
-
-        virtual bool
-        hasSentCallback() const
-        {
-            return _sent != nullptr;
-        }
-
-    private:
-
-        ::std::function< void (const AsyncResultPtr&)> _completed;
-        ::std::function< void (const AsyncResultPtr&)> _sent;
-    };
-
-    return new Cpp11CB(completed, sent);
-}
 #endif
-
-void
-IceInternal::CallbackBase::checkCallback(bool obj, bool cb)
-{
-    if(!obj)
-    {
-        throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "callback object cannot be null");
-    }
-    if(!cb)
-    {
-        throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "callback cannot be null");
-    }
-}
-
-
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
deleted file mode 100644
index 65eda40d14e..00000000000
--- a/cpp/src/Ice/BasicStream.cpp
+++ /dev/null
@@ -1,3395 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <IceUtil/DisableWarnings.h>
-#include <Ice/BasicStream.h>
-#include <Ice/DefaultsAndOverrides.h>
-#include <Ice/Instance.h>
-#include <Ice/Object.h>
-#include <Ice/Proxy.h>
-#include <Ice/ProxyFactory.h>
-#include <Ice/ObjectFactory.h>
-#include <Ice/ObjectFactoryManager.h>
-#include <Ice/UserExceptionFactory.h>
-#include <Ice/LocalException.h>
-#include <Ice/Protocol.h>
-#include <Ice/FactoryTableInit.h>
-#include <Ice/TraceUtil.h>
-#include <Ice/TraceLevels.h>
-#include <Ice/LoggerUtil.h>
-#include <Ice/SlicedData.h>
-#include <IceUtil/StringConverter.h>
-#include <iterator>
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-namespace
-{
-
-class StreamUTF8BufferI : public IceUtil::UTF8Buffer
-{
-public:
-
-    StreamUTF8BufferI(BasicStream& stream) :
-        _stream(stream)
-    {
-    }
-
-    Ice::Byte*
-    getMoreBytes(size_t howMany, Ice::Byte* firstUnused)
-    {
-        assert(howMany > 0);
-
-        if(firstUnused != 0)
-        {
-            //
-            // Return unused bytes
-            //
-            _stream.resize(firstUnused - _stream.b.begin());
-        }
-
-        //
-        // Index of first unused byte
-        //
-        Buffer::Container::size_type pos = _stream.b.size();
-
-        //
-        // Since resize may reallocate the buffer, when firstUnused != 0, the
-        // return value can be != firstUnused
-        //
-        _stream.resize(pos + howMany);
-
-        return &_stream.b[pos];
-    }
-
-private:
-
-    BasicStream& _stream;
-};
-
-const Byte OPTIONAL_END_MARKER        = 0xFF;
-
-const Byte FLAG_HAS_TYPE_ID_STRING    = (1<<0);
-const Byte FLAG_HAS_TYPE_ID_INDEX     = (1<<1);
-const Byte FLAG_HAS_TYPE_ID_COMPACT   = (1<<0) | (1<<1);
-const Byte FLAG_HAS_OPTIONAL_MEMBERS  = (1<<2);
-const Byte FLAG_HAS_INDIRECTION_TABLE = (1<<3);
-const Byte FLAG_HAS_SLICE_SIZE        = (1<<4);
-const Byte FLAG_IS_LAST_SLICE         = (1<<5);
-
-}
-
-
-IceInternal::BasicStream::BasicStream(Instance* instance, const EncodingVersion& encoding) :
-    _instance(instance),
-    _closure(0),
-    _encoding(encoding),
-    _currentReadEncaps(0),
-    _currentWriteEncaps(0),
-    _sliceObjects(true),
-    _stringConverter(instance->getStringConverter()),
-    _wstringConverter(instance->getWstringConverter()),
-    _startSeq(-1),
-    _minSeqSize(0)
-{
-    //
-    // Initialize the encoding members of our pre-allocated encapsulations, in case
-    // this stream is used without an explicit encapsulation.
-    //
-    _preAllocatedReadEncaps.encoding = encoding;
-    _preAllocatedWriteEncaps.encoding = encoding;
-}
-
-IceInternal::BasicStream::BasicStream(Instance* instance, const EncodingVersion& encoding, const Byte* begin,
-                                      const Byte* end) :
-    IceInternal::Buffer(begin, end),
-    _instance(instance),
-    _closure(0),
-    _encoding(encoding),
-    _currentReadEncaps(0),
-    _currentWriteEncaps(0),
-    _sliceObjects(true),
-    _stringConverter(instance->getStringConverter()),
-    _wstringConverter(instance->getWstringConverter()),
-    _startSeq(-1),
-    _minSeqSize(0)
-{
-    //
-    // Initialize the encoding members of our pre-allocated encapsulations, in case
-    // this stream is used without an explicit encapsulation.
-    //
-    _preAllocatedReadEncaps.encoding = encoding;
-    _preAllocatedWriteEncaps.encoding = encoding;
-}
-
-void
-IceInternal::BasicStream::clear()
-{
-    while(_currentReadEncaps && _currentReadEncaps != &_preAllocatedReadEncaps)
-    {
-        ReadEncaps* oldEncaps = _currentReadEncaps;
-        _currentReadEncaps = _currentReadEncaps->previous;
-        delete oldEncaps;
-    }
-
-    while(_currentWriteEncaps && _currentWriteEncaps != &_preAllocatedWriteEncaps)
-    {
-        WriteEncaps* oldEncaps = _currentWriteEncaps;
-        _currentWriteEncaps = _currentWriteEncaps->previous;
-        delete oldEncaps;
-    }
-
-    _startSeq = -1;
-    _sliceObjects = true;
-}
-
-void*
-IceInternal::BasicStream::closure() const
-{
-    return _closure;
-}
-
-void*
-IceInternal::BasicStream::closure(void* p)
-{
-    void* prev = _closure;
-    _closure = p;
-    return prev;
-}
-
-void
-IceInternal::BasicStream::swap(BasicStream& other)
-{
-    assert(_instance == other._instance);
-
-    swapBuffer(other);
-
-    std::swap(_closure, other._closure);
-
-    //
-    // Swap is never called for BasicStreams that have encapsulations being read/write. However,
-    // encapsulations might still be set in case marhsalling or un-marhsalling failed. We just
-    // reset the encapsulations if there are still some set.
-    //
-    resetEncaps();
-    other.resetEncaps();
-
-    std::swap(_startSeq, other._startSeq);
-    std::swap(_minSeqSize, other._minSeqSize);
-}
-
-void
-IceInternal::BasicStream::resetEncaps()
-{
-    while(_currentReadEncaps && _currentReadEncaps != &_preAllocatedReadEncaps)
-    {
-        ReadEncaps* oldEncaps = _currentReadEncaps;
-        _currentReadEncaps = _currentReadEncaps->previous;
-        delete oldEncaps;
-    }
-
-    while(_currentWriteEncaps && _currentWriteEncaps != &_preAllocatedWriteEncaps)
-    {
-        WriteEncaps* oldEncaps = _currentWriteEncaps;
-        _currentWriteEncaps = _currentWriteEncaps->previous;
-        delete oldEncaps;
-    }
-
-    _preAllocatedReadEncaps.reset();
-    _preAllocatedWriteEncaps.reset();
-}
-
-void
-IceInternal::BasicStream::startWriteEncaps()
-{
-    //
-    // If no encoding version is specified, use the current write
-    // encapsulation encoding version if there's a current write
-    // encapsulation, otherwise, use the stream encoding version.
-    //
-
-    if(_currentWriteEncaps)
-    {
-        startWriteEncaps(_currentWriteEncaps->encoding, _currentWriteEncaps->format);
-    }
-    else
-    {
-        startWriteEncaps(_encoding, Ice::DefaultFormat);
-    }
-}
-
-void
-IceInternal::BasicStream::endWriteEncapsChecked()
-{
-    if(!_currentWriteEncaps)
-    {
-        throw EncapsulationException(__FILE__, __LINE__, "not in an encapsulation");
-    }
-    endWriteEncaps();
-}
-
-void
-IceInternal::BasicStream::endReadEncapsChecked()
-{
-    if(!_currentReadEncaps)
-    {
-        throw EncapsulationException(__FILE__, __LINE__, "not in an encapsulation");
-    }
-    endReadEncaps();
-}
-
-Int
-IceInternal::BasicStream::getReadEncapsSize()
-{
-    assert(_currentReadEncaps);
-    return _currentReadEncaps->sz - static_cast<Int>(sizeof(Int)) - 2;
-}
-
-EncodingVersion
-IceInternal::BasicStream::skipEncaps()
-{
-    Int sz;
-    read(sz);
-    if(sz < 6)
-    {
-        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
-    }
-    if(i - sizeof(Int) + sz > b.end())
-    {
-        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
-    }
-    EncodingVersion encoding;
-    read(encoding.major);
-    read(encoding.minor);
-    i += sz - sizeof(Int) - 2;
-    return encoding;
-}
-
-void
-IceInternal::BasicStream::readPendingObjects()
-{
-    if(_currentReadEncaps && _currentReadEncaps->decoder)
-    {
-        _currentReadEncaps->decoder->readPendingObjects();
-    }
-    else if(getReadEncoding() == Ice::Encoding_1_0)
-    {
-        //
-        // If using the 1.0 encoding and no objects were read, we
-        // still read an empty sequence of pending objects if
-        // requested (i.e.: if this is called).
-        //
-        // This is required by the 1.0 encoding, even if no objects
-        // are written we do marshal an empty sequence if marshaled
-        // data types use classes.
-        //
-        skipSize();
-    }
-}
-
-void
-IceInternal::BasicStream::writePendingObjects()
-{
-    if(_currentWriteEncaps && _currentWriteEncaps->encoder)
-    {
-        _currentWriteEncaps->encoder->writePendingObjects();
-    }
-    else if(getWriteEncoding() == Ice::Encoding_1_0)
-    {
-        //
-        // If using the 1.0 encoding and no objects were written, we
-        // still write an empty sequence for pending objects if
-        // requested (i.e.: if this is called).
-        //
-        // This is required by the 1.0 encoding, even if no objects
-        // are written we do marshal an empty sequence if marshaled
-        // data types use classes.
-        //
-        writeSize(0);
-    }
-}
-
-Int
-IceInternal::BasicStream::readAndCheckSeqSize(int minSize)
-{
-    Int sz = readSize();
-
-    if(sz == 0)
-    {
-        return sz;
-    }
-
-    //
-    // The _startSeq variable points to the start of the sequence for which
-    // we expect to read at least _minSeqSize bytes from the stream.
-    //
-    // If not initialized or if we already read more data than _minSeqSize,
-    // we reset _startSeq and _minSeqSize for this sequence (possibly a
-    // top-level sequence or enclosed sequence it doesn't really matter).
-    //
-    // Otherwise, we are reading an enclosed sequence and we have to bump
-    // _minSeqSize by the minimum size that this sequence will  require on
-    // the stream.
-    //
-    // The goal of this check is to ensure that when we start un-marshalling
-    // a new sequence, we check the minimal size of this new sequence against
-    // the estimated remaining buffer size. This estimatation is based on
-    // the minimum size of the enclosing sequences, it's _minSeqSize.
-    //
-    if(_startSeq == -1 || i > (b.begin() + _startSeq + _minSeqSize))
-    {
-        _startSeq = static_cast<int>(i - b.begin());
-        _minSeqSize = sz * minSize;
-    }
-    else
-    {
-        _minSeqSize += sz * minSize;
-    }
-
-    //
-    // If there isn't enough data to read on the stream for the sequence (and
-    // possibly enclosed sequences), something is wrong with the marshalled
-    // data: it's claiming having more data that what is possible to read.
-    //
-    if(_startSeq + _minSeqSize > static_cast<int>(b.size()))
-    {
-        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
-    }
-
-    return sz;
-}
-
-void
-IceInternal::BasicStream::writeBlob(const vector<Byte>& v)
-{
-    if(!v.empty())
-    {
-        Container::size_type pos = b.size();
-        resize(pos + v.size());
-        memcpy(&b[pos], &v[0], v.size());
-    }
-}
-
-void
-IceInternal::BasicStream::readBlob(vector<Byte>& v, Int sz)
-{
-    if(sz > 0)
-    {
-        if(b.end() - i < sz)
-        {
-            throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
-        }
-        vector<Byte>(i, i + sz).swap(v);
-        i += sz;
-    }
-    else
-    {
-        v.clear();
-    }
-}
-
-void
-IceInternal::BasicStream::write(const Byte* begin, const Byte* end)
-{
-    Int sz = static_cast<Int>(end - begin);
-    writeSize(sz);
-    if(sz > 0)
-    {
-        Container::size_type pos = b.size();
-        resize(pos + sz);
-        memcpy(&b[pos], begin, sz);
-    }
-}
-
-void
-IceInternal::BasicStream::read(std::vector<Ice::Byte>& v)
-{
-    std::pair<const Ice::Byte*, const Ice::Byte*> p;
-    read(p);
-    if(p.first != p.second)
-    {
-        v.resize(static_cast<Ice::Int>(p.second - p.first));
-        copy(p.first, p.second, v.begin());
-    }
-    else
-    {
-        v.clear();
-    }
-}
-
-void
-IceInternal::BasicStream::read(pair<const Byte*, const Byte*>& v)
-{
-    Int sz = readAndCheckSeqSize(1);
-    if(sz > 0)
-    {
-        v.first = i;
-        v.second = i + sz;
-        i += sz;
-    }
-    else
-    {
-        v.first = v.second = i;
-    }
-}
-
-void
-IceInternal::BasicStream::write(const vector<bool>& v)
-{
-    Int sz = static_cast<Int>(v.size());
-    writeSize(sz);
-    if(sz > 0)
-    {
-        Container::size_type pos = b.size();
-        resize(pos + sz);
-        copy(v.begin(), v.end(), b.begin() + pos);
-    }
-}
-
-namespace
-{
-
-template<size_t boolSize>
-struct BasicStreamWriteBoolHelper
-{
-    static void write(const bool* begin, BasicStream::Container::size_type pos, BasicStream::Container& b, Int sz)
-    {
-        for(int idx = 0; idx < sz; ++idx)
-        {
-           b[pos + idx] = static_cast<Byte>(*(begin + idx));
-        }
-    }
-};
-
-template<>
-struct BasicStreamWriteBoolHelper<1>
-{
-    static void write(const bool* begin, BasicStream::Container::size_type pos, BasicStream::Container& b, Int sz)
-    {
-        memcpy(&b[pos], begin, sz);
-    }
-};
-
-}
-
-void
-IceInternal::BasicStream::write(const bool* begin, const bool* end)
-{
-    Int sz = static_cast<Int>(end - begin);
-    writeSize(sz);
-    if(sz > 0)
-    {
-        Container::size_type pos = b.size();
-        resize(pos + sz);
-        BasicStreamWriteBoolHelper<sizeof(bool)>::write(begin, pos, b, sz);
-    }
-}
-
-void
-IceInternal::BasicStream::read(vector<bool>& v)
-{
-    Int sz = readAndCheckSeqSize(1);
-    if(sz > 0)
-    {
-        v.resize(sz);
-        copy(i, i + sz, v.begin());
-        i += sz;
-    }
-    else
-    {
-        v.clear();
-    }
-}
-
-namespace
-{
-
-template<size_t boolSize>
-struct BasicStreamReadBoolHelper
-{
-    static bool* read(pair<const bool*, const bool*>& v, Int sz, BasicStream::Container::iterator& i)
-    {
-        bool* array = new bool[sz];
-        for(int idx = 0; idx < sz; ++idx)
-        {
-            array[idx] = static_cast<bool>(*(i + idx));
-        }
-        v.first = array;
-        v.second = array + sz;
-        return array;
-    }
-};
-
-template<>
-struct BasicStreamReadBoolHelper<1>
-{
-    static bool* read(pair<const bool*, const bool*>& v, Int sz, BasicStream::Container::iterator& i)
-    {
-        v.first = reinterpret_cast<bool*>(i);
-        v.second = reinterpret_cast<bool*>(i) + sz;
-        return 0;
-    }
-};
-
-}
-
-void
-IceInternal::BasicStream::read(pair<const bool*, const bool*>& v, IceUtil::ScopedArray<bool>& result)
-{
-    Int sz = readAndCheckSeqSize(1);
-    if(sz > 0)
-    {
-        result.reset(BasicStreamReadBoolHelper<sizeof(bool)>::read(v, sz, i));
-        i += sz;
-    }
-    else
-    {
-        result.reset();
-        v.first = v.second = reinterpret_cast<bool*>(i);
-    }
-}
-
-void
-IceInternal::BasicStream::write(Short v)
-{
-    Container::size_type pos = b.size();
-    resize(pos + sizeof(Short));
-    Byte* dest = &b[pos];
-#ifdef ICE_BIG_ENDIAN
-    const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Short) - 1;
-    *dest++ = *src--;
-    *dest = *src;
-#else
-    const Byte* src = reinterpret_cast<const Byte*>(&v);
-    *dest++ = *src++;
-    *dest = *src;
-#endif
-}
-
-void
-IceInternal::BasicStream::write(const Short* begin, const Short* end)
-{
-    Int sz = static_cast<Int>(end - begin);
-    writeSize(sz);
-    if(sz > 0)
-    {
-        Container::size_type pos = b.size();
-        resize(pos + sz * sizeof(Short));
-#ifdef ICE_BIG_ENDIAN
-        const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Short) - 1;
-        Byte* dest = &(*(b.begin() + pos));
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest++ = *src--;
-            *dest++ = *src--;
-            src += 2 * sizeof(Short);
-        }
-#else
-        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Short));
-#endif
-    }
-}
-
-void
-IceInternal::BasicStream::read(Short& v)
-{
-    if(b.end() - i < static_cast<int>(sizeof(Short)))
-    {
-        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
-    }
-    const Byte* src = &(*i);
-    i += sizeof(Short);
-#ifdef ICE_BIG_ENDIAN
-    Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Short) - 1;
-    *dest-- = *src++;
-    *dest = *src;
-#else
-    Byte* dest = reinterpret_cast<Byte*>(&v);
-    *dest++ = *src++;
-    *dest = *src;
-#endif
-}
-
-void
-IceInternal::BasicStream::read(vector<Short>& v)
-{
-    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Short)));
-    if(sz > 0)
-    {
-        Container::iterator begin = i;
-        i += sz * static_cast<int>(sizeof(Short));
-        v.resize(sz);
-#ifdef ICE_BIG_ENDIAN
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Short) - 1;
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest-- = *src++;
-            *dest-- = *src++;
-            dest += 2 * sizeof(Short);
-        }
-#else
-        copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
-#endif
-    }
-    else
-    {
-        v.clear();
-    }
-}
-
-void
-IceInternal::BasicStream::read(pair<const Short*, const Short*>& v, IceUtil::ScopedArray<Short>& result)
-{
-    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Short)));
-    if(sz > 0)
-    {
-#if defined(__i386) || defined(_M_IX86) || defined(__x86_64) || defined(_M_X64)
-        v.first = reinterpret_cast<Short*>(i);
-        i += sz * static_cast<int>(sizeof(Short));
-        v.second = reinterpret_cast<Short*>(i);
-#else
-        result.reset(new Short[sz]);
-        v.first = result.get();
-        v.second = result.get() + sz;
-
-        Container::iterator begin = i;
-        i += sz * static_cast<int>(sizeof(Short));
-#  ifdef ICE_BIG_ENDIAN
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&result[0]) + sizeof(Short) - 1;
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest-- = *src++;
-            *dest-- = *src++;
-            dest += 2 * sizeof(Short);
-        }
-#  else
-        copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
-#  endif
-#endif
-    }
-    else
-    {
-        result.reset();
-        v.first = v.second = 0;
-    }
-}
-
-void
-IceInternal::BasicStream::write(const Int* begin, const Int* end)
-{
-    Int sz = static_cast<Int>(end - begin);
-    writeSize(sz);
-    if(sz > 0)
-    {
-        Container::size_type pos = b.size();
-        resize(pos + sz * sizeof(Int));
-#ifdef ICE_BIG_ENDIAN
-        const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Int) - 1;
-        Byte* dest = &(*(b.begin() + pos));
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            src += 2 * sizeof(Int);
-        }
-#else
-        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Int));
-#endif
-    }
-}
-
-void
-IceInternal::BasicStream::read(vector<Int>& v)
-{
-    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Int)));
-    if(sz > 0)
-    {
-        Container::iterator begin = i;
-        i += sz * static_cast<int>(sizeof(Int));
-        v.resize(sz);
-#ifdef ICE_BIG_ENDIAN
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Int) - 1;
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            dest += 2 * sizeof(Int);
-        }
-#else
-        copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
-#endif
-    }
-    else
-    {
-        v.clear();
-    }
-}
-
-void
-IceInternal::BasicStream::read(pair<const Int*, const Int*>& v, ::IceUtil::ScopedArray<Int>& result)
-{
-    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Int)));
-    if(sz > 0)
-    {
-#if defined(__i386) || defined(_M_IX86) || defined(__x86_64) || defined(_M_X64)
-        v.first = reinterpret_cast<Int*>(i);
-        i += sz * static_cast<int>(sizeof(Int));
-        v.second = reinterpret_cast<Int*>(i);
-#else
-        result.reset(new Int[sz]);
-        v.first = result.get();
-        v.second = result.get() + sz;
-
-        Container::iterator begin = i;
-        i += sz * static_cast<int>(sizeof(Int));
-#  ifdef ICE_BIG_ENDIAN
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&result[0]) + sizeof(Int) - 1;
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            dest += 2 * sizeof(Int);
-        }
-#  else
-        copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
-#  endif
-#endif
-    }
-    else
-    {
-        result.reset();
-        v.first = v.second = 0;
-    }
-}
-
-void
-IceInternal::BasicStream::write(Long v)
-{
-    Container::size_type pos = b.size();
-    resize(pos + sizeof(Long));
-    Byte* dest = &b[pos];
-#ifdef ICE_BIG_ENDIAN
-    const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Long) - 1;
-    *dest++ = *src--;
-    *dest++ = *src--;
-    *dest++ = *src--;
-    *dest++ = *src--;
-    *dest++ = *src--;
-    *dest++ = *src--;
-    *dest++ = *src--;
-    *dest = *src;
-#else
-    const Byte* src = reinterpret_cast<const Byte*>(&v);
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest = *src;
-#endif
-}
-
-void
-IceInternal::BasicStream::write(const Long* begin, const Long* end)
-{
-    Int sz = static_cast<Int>(end - begin);
-    writeSize(sz);
-    if(sz > 0)
-    {
-        Container::size_type pos = b.size();
-        resize(pos + sz * sizeof(Long));
-#ifdef ICE_BIG_ENDIAN
-        const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Long) - 1;
-        Byte* dest = &(*(b.begin() + pos));
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            src += 2 * sizeof(Long);
-        }
-#else
-        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Long));
-#endif
-    }
-}
-
-void
-IceInternal::BasicStream::read(Long& v)
-{
-    if(b.end() - i < static_cast<int>(sizeof(Long)))
-    {
-        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
-    }
-    const Byte* src = &(*i);
-    i += sizeof(Long);
-#ifdef ICE_BIG_ENDIAN
-    Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Long) - 1;
-    *dest-- = *src++;
-    *dest-- = *src++;
-    *dest-- = *src++;
-    *dest-- = *src++;
-    *dest-- = *src++;
-    *dest-- = *src++;
-    *dest-- = *src++;
-    *dest = *src;
-#else
-    Byte* dest = reinterpret_cast<Byte*>(&v);
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest = *src;
-#endif
-}
-
-void
-IceInternal::BasicStream::read(vector<Long>& v)
-{
-    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Long)));
-    if(sz > 0)
-    {
-        Container::iterator begin = i;
-        i += sz * static_cast<int>(sizeof(Long));
-        v.resize(sz);
-#ifdef ICE_BIG_ENDIAN
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Long) - 1;
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            dest += 2 * sizeof(Long);
-        }
-#else
-        copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
-#endif
-    }
-    else
-    {
-        v.clear();
-    }
-}
-
-void
-IceInternal::BasicStream::read(pair<const Long*, const Long*>& v, IceUtil::ScopedArray<Long>& result)
-{
-    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Long)));
-    if(sz > 0)
-    {
-#if defined(__i386) || defined(_M_IX86) || defined(__x86_64) || defined(_M_X64)
-        v.first = reinterpret_cast<Long*>(i);
-        i += sz * static_cast<int>(sizeof(Long));
-        v.second = reinterpret_cast<Long*>(i);
-#else
-        result.reset(new Long[sz]);
-        v.first = result.get();
-        v.second = result.get() + sz;
-
-        Container::iterator begin = i;
-        i += sz * static_cast<int>(sizeof(Long));
-#  ifdef ICE_BIG_ENDIAN
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&result[0]) + sizeof(Long) - 1;
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            dest += 2 * sizeof(Long);
-        }
-#  else
-        copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
-#  endif
-#endif
-    }
-    else
-    {
-        result.reset();
-        v.first = v.second = 0;
-    }
-}
-
-void
-IceInternal::BasicStream::write(Float v)
-{
-    Container::size_type pos = b.size();
-    resize(pos + sizeof(Float));
-    Byte* dest = &b[pos];
-#ifdef ICE_BIG_ENDIAN
-    const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Float) - 1;
-    *dest++ = *src--;
-    *dest++ = *src--;
-    *dest++ = *src--;
-    *dest = *src;
-#else
-    const Byte* src = reinterpret_cast<const Byte*>(&v);
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest = *src;
-#endif
-}
-
-void
-IceInternal::BasicStream::write(const Float* begin, const Float* end)
-{
-    Int sz = static_cast<Int>(end - begin);
-    writeSize(sz);
-    if(sz > 0)
-    {
-        Container::size_type pos = b.size();
-        resize(pos + sz * sizeof(Float));
-#ifdef ICE_BIG_ENDIAN
-        const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Float) - 1;
-        Byte* dest = &(*(b.begin() + pos));
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            src += 2 * sizeof(Float);
-        }
-#else
-        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Float));
-#endif
-    }
-}
-
-void
-IceInternal::BasicStream::read(Float& v)
-{
-    if(b.end() - i < static_cast<int>(sizeof(Float)))
-    {
-        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
-    }
-    const Byte* src = &(*i);
-    i += sizeof(Float);
-#ifdef ICE_BIG_ENDIAN
-    Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Float) - 1;
-    *dest-- = *src++;
-    *dest-- = *src++;
-    *dest-- = *src++;
-    *dest = *src;
-#else
-    Byte* dest = reinterpret_cast<Byte*>(&v);
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest = *src;
-#endif
-}
-
-void
-IceInternal::BasicStream::read(vector<Float>& v)
-{
-    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Float)));
-    if(sz > 0)
-    {
-        Container::iterator begin = i;
-        i += sz * static_cast<int>(sizeof(Float));
-        v.resize(sz);
-#ifdef ICE_BIG_ENDIAN
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Float) - 1;
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            dest += 2 * sizeof(Float);
-        }
-#else
-        copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
-#endif
-    }
-    else
-    {
-        v.clear();
-    }
-}
-
-void
-IceInternal::BasicStream::read(pair<const Float*, const Float*>& v, IceUtil::ScopedArray<Float>& result)
-{
-    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Float)));
-    if(sz > 0)
-    {
-#if defined(__i386) || defined(_M_IX86) || defined(__x86_64) || defined(_M_X64)
-        v.first = reinterpret_cast<Float*>(i);
-        i += sz * static_cast<int>(sizeof(Float));
-        v.second = reinterpret_cast<Float*>(i);
-#else
-        result.reset(new Float[sz]);
-        v.first = result.get();
-        v.second = result.get() + sz;
-
-        Container::iterator begin = i;
-        i += sz * static_cast<int>(sizeof(Float));
-#  ifdef ICE_BIG_ENDIAN
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&result[0]) + sizeof(Float) - 1;
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            dest += 2 * sizeof(Float);
-        }
-#  else
-        copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
-#  endif
-#endif
-    }
-    else
-    {
-        result.reset();
-        v.first = v.second = 0;
-    }
-}
-
-void
-IceInternal::BasicStream::write(Double v)
-{
-    Container::size_type pos = b.size();
-    resize(pos + sizeof(Double));
-    Byte* dest = &b[pos];
-#ifdef ICE_BIG_ENDIAN
-    const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Double) - 1;
-    *dest++ = *src--;
-    *dest++ = *src--;
-    *dest++ = *src--;
-    *dest++ = *src--;
-    *dest++ = *src--;
-    *dest++ = *src--;
-    *dest++ = *src--;
-    *dest = *src;
-#else
-    const Byte* src = reinterpret_cast<const Byte*>(&v);
-#  if defined(ICE_LITTLEBYTE_BIGWORD)
-    dest[4] = *src++;
-    dest[5] = *src++;
-    dest[6] = *src++;
-    dest[7] = *src++;
-    dest[0] = *src++;
-    dest[1] = *src++;
-    dest[2] = *src++;
-    dest[3] = *src;
-#  else
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest = *src;
-#  endif
-#endif
-}
-
-void
-IceInternal::BasicStream::write(const Double* begin, const Double* end)
-{
-    Int sz = static_cast<Int>(end - begin);
-    writeSize(sz);
-    if(sz > 0)
-    {
-        Container::size_type pos = b.size();
-        resize(pos + sz * sizeof(Double));
-#ifdef ICE_BIG_ENDIAN
-        const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Double) - 1;
-        Byte* dest = &(*(b.begin() + pos));
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            *dest++ = *src--;
-            src += 2 * sizeof(Double);
-        }
-#elif defined(ICE_LITTLEBYTE_BIGWORD)
-        const Byte* src = reinterpret_cast<const Byte*>(begin);
-        Byte* dest = &(*(b.begin() + pos));
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            dest[4] = *src++;
-            dest[5] = *src++;
-            dest[6] = *src++;
-            dest[7] = *src++;
-            dest[0] = *src++;
-            dest[1] = *src++;
-            dest[2] = *src++;
-            dest[3] = *src++;
-            dest += sizeof(Double);
-        }
-#else
-        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Double));
-#endif
-    }
-}
-
-void
-IceInternal::BasicStream::read(Double& v)
-{
-    if(b.end() - i < static_cast<int>(sizeof(Double)))
-    {
-        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
-    }
-    const Byte* src = &(*i);
-    i += sizeof(Double);
-#ifdef ICE_BIG_ENDIAN
-    Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Double) - 1;
-    *dest-- = *src++;
-    *dest-- = *src++;
-    *dest-- = *src++;
-    *dest-- = *src++;
-    *dest-- = *src++;
-    *dest-- = *src++;
-    *dest-- = *src++;
-    *dest = *src;
-#else
-    Byte* dest = reinterpret_cast<Byte*>(&v);
-#  if defined(ICE_LITTLEBYTE_BIGWORD)
-    dest[4] = *src++;
-    dest[5] = *src++;
-    dest[6] = *src++;
-    dest[7] = *src++;
-    dest[0] = *src++;
-    dest[1] = *src++;
-    dest[2] = *src++;
-    dest[3] = *src;
-#  else
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest = *src;
-#  endif
-#endif
-}
-
-void
-IceInternal::BasicStream::read(vector<Double>& v)
-{
-    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Double)));
-    if(sz > 0)
-    {
-        Container::iterator begin = i;
-        i += sz * static_cast<int>(sizeof(Double));
-        v.resize(sz);
-#ifdef ICE_BIG_ENDIAN
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Double) - 1;
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            dest += 2 * sizeof(Double);
-        }
-#elif defined(ICE_LITTLEBYTE_BIGWORD)
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&v[0]);
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            dest[4] = *src++;
-            dest[5] = *src++;
-            dest[6] = *src++;
-            dest[7] = *src++;
-            dest[0] = *src++;
-            dest[1] = *src++;
-            dest[2] = *src++;
-            dest[3] = *src++;
-            dest += sizeof(Double);
-        }
-#else
-        copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
-#endif
-    }
-    else
-    {
-        v.clear();
-    }
-}
-
-void
-IceInternal::BasicStream::read(pair<const Double*, const Double*>& v, IceUtil::ScopedArray<Double>& result)
-{
-    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Double)));
-    if(sz > 0)
-    {
-#if defined(__i386) || defined(_M_IX86) || defined(__x86_64) || defined(_M_X64)
-        v.first = reinterpret_cast<Double*>(i);
-        i += sz * static_cast<int>(sizeof(Double));
-        v.second = reinterpret_cast<Double*>(i);
-#else
-        result.reset(new Double[sz]);
-        v.first = result.get();
-        v.second = result.get() + sz;
-
-        Container::iterator begin = i;
-        i += sz * static_cast<int>(sizeof(Double));
-#  ifdef ICE_BIG_ENDIAN
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&result[0]) + sizeof(Double) - 1;
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            *dest-- = *src++;
-            dest += 2 * sizeof(Double);
-        }
-#  elif defined(ICE_LITTLEBYTE_BIGWORD)
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&result[0]);
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            dest[4] = *src++;
-            dest[5] = *src++;
-            dest[6] = *src++;
-            dest[7] = *src++;
-            dest[0] = *src++;
-            dest[1] = *src++;
-            dest[2] = *src++;
-            dest[3] = *src++;
-            dest += sizeof(Double);
-        }
-
-#  else
-        copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
-#  endif
-#endif
-    }
-    else
-    {
-        result.reset();
-        v.first = v.second = 0;
-    }
-}
-
-//
-// NOTE: This member function is intentionally omitted in order to
-// cause a link error if it is used. This is for efficiency reasons:
-// writing a const char * requires a traversal of the string to get
-// the string length first, which takes O(n) time, whereas getting the
-// string length from a std::string takes constant time.
-//
-/*
-void
-IceInternal::BasicStream::write(const char*)
-{
-}
-*/
-
-void
-IceInternal::BasicStream::writeConverted(const char* vdata, size_t vsize)
-{
-    //
-    // What is the size of the resulting UTF-8 encoded string?
-    // Impossible to tell, so we guess. If we don't guess correctly,
-    // we'll have to fix the mistake afterwards
-    //
-    try
-    {
-        Int guessedSize = static_cast<Int>(vsize);
-        writeSize(guessedSize); // writeSize() only writes the size; it does not reserve any buffer space.
-
-        size_t firstIndex = b.size();
-        StreamUTF8BufferI buffer(*this);
-
-        Byte* lastByte = _stringConverter->toUTF8(vdata, vdata + vsize, buffer);
-        if(lastByte != b.end())
-        {
-            resize(lastByte - b.begin());
-        }
-        size_t lastIndex = b.size();
-
-        Int actualSize = static_cast<Int>(lastIndex - firstIndex);
-
-        //
-        // Check against the guess
-        //
-        if(guessedSize != actualSize)
-        {
-            if(guessedSize <= 254 && actualSize > 254)
-            {
-                //
-                // Move the UTF-8 sequence 4 bytes further
-                // Use memmove instead of memcpy since the source and destination typically overlap.
-                //
-                resize(b.size() + 4);
-                memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize);
-            }
-            else if(guessedSize > 254 && actualSize <= 254)
-            {
-                //
-                // Move the UTF-8 sequence 4 bytes back
-                //
-                memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize);
-                resize(b.size() - 4);
-            }
-
-            if(guessedSize <= 254)
-            {
-                rewriteSize(actualSize, b.begin() + firstIndex - 1);
-            }
-            else
-            {
-                rewriteSize(actualSize, b.begin() + firstIndex - 1 - 4);
-            }
-        }
-    }
-    catch(const IceUtil::IllegalConversionException& ex)
-    {
-        throw StringConversionException(__FILE__, __LINE__, ex.reason());
-    }
-}
-
-void
-IceInternal::BasicStream::write(const string* begin, const string* end, bool convert)
-{
-    Int sz = static_cast<Int>(end - begin);
-    writeSize(sz);
-    if(sz > 0)
-    {
-        for(int i = 0; i < sz; ++i)
-        {
-            write(begin[i], convert);
-        }
-    }
-}
-
-void
-IceInternal::BasicStream::readConverted(string& v, int sz)
-{
-    try
-    {
-        _stringConverter->fromUTF8(i, i + sz, v);
-    }
-    catch(const IceUtil::IllegalConversionException& ex)
-    {
-        throw StringConversionException(__FILE__, __LINE__, ex.reason());
-    }
-}
-
-void
-IceInternal::BasicStream::read(vector<string>& v, bool convert)
-{
-    Int sz = readAndCheckSeqSize(1);
-    if(sz > 0)
-    {
-        v.resize(sz);
-        for(int j = 0; j < sz; ++j)
-        {
-            read(v[j], convert);
-        }
-    }
-    else
-    {
-       v.clear();
-    }
-}
-
-void
-IceInternal::BasicStream::write(const wstring& v)
-{
-    if(v.empty())
-    {
-        writeSize(0);
-        return;
-    }
-
-    //
-    // What is the size of the resulting UTF-8 encoded string?
-    // Impossible to tell, so we guess. If we don't guess correctly,
-    // we'll have to fix the mistake afterwards
-    //
-    try
-    {
-        Int guessedSize = static_cast<Int>(v.size());
-        writeSize(guessedSize); // writeSize() only writes the size; it does not reserve any buffer space.
-
-        size_t firstIndex = b.size();
-        StreamUTF8BufferI buffer(*this);
-
-        Byte* lastByte = _wstringConverter->toUTF8(v.data(), v.data() + v.size(), buffer);
-        if(lastByte != b.end())
-        {
-            resize(lastByte - b.begin());
-        }
-        size_t lastIndex = b.size();
-
-        Int actualSize = static_cast<Int>(lastIndex - firstIndex);
-
-        //
-        // Check against the guess
-        //
-        if(guessedSize != actualSize)
-        {
-            if(guessedSize <= 254 && actualSize > 254)
-            {
-                //
-                // Move the UTF-8 sequence 4 bytes further
-                // Use memmove instead of memcpy since the source and destination typically overlap.
-                //
-                resize(b.size() + 4);
-                memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize);
-            }
-            else if(guessedSize > 254 && actualSize <= 254)
-            {
-                //
-                // Move the UTF-8 sequence 4 bytes back
-                //
-                memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize);
-                resize(b.size() - 4);
-            }
-
-            if(guessedSize <= 254)
-            {
-                rewriteSize(actualSize, b.begin() + firstIndex - 1);
-            }
-            else
-            {
-                rewriteSize(actualSize, b.begin() + firstIndex - 1 - 4);
-            }
-        }
-    }
-    catch(const IceUtil::IllegalConversionException& ex)
-    {
-        throw StringConversionException(__FILE__, __LINE__, ex.reason());
-    }
-}
-
-void
-IceInternal::BasicStream::write(const wstring* begin, const wstring* end)
-{
-    Int sz = static_cast<Int>(end - begin);
-    writeSize(sz);
-    if(sz > 0)
-    {
-        for(int i = 0; i < sz; ++i)
-        {
-            write(begin[i]);
-        }
-    }
-}
-
-void
-IceInternal::BasicStream::read(wstring& v)
-{
-    Int sz = readSize();
-    if(sz > 0)
-    {
-        if(b.end() - i < sz)
-        {
-            throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
-        }
-
-        try
-        {
-            _wstringConverter->fromUTF8(i, i + sz, v);
-            i += sz;
-        }
-        catch(const IceUtil::IllegalConversionException& ex)
-        {
-            throw StringConversionException(__FILE__, __LINE__, ex.reason());
-        }
-    }
-    else
-    {
-        v.clear();
-    }
-}
-
-void
-IceInternal::BasicStream::read(vector<wstring>& v)
-{
-    Int sz = readAndCheckSeqSize(1);
-    if(sz > 0)
-    {
-        v.resize(sz);
-        for(int j = 0; j < sz; ++j)
-        {
-            read(v[j]);
-        }
-    }
-    else
-    {
-       v.clear();
-    }
-}
-
-void
-IceInternal::BasicStream::write(const ObjectPrx& v)
-{
-    _instance->proxyFactory()->proxyToStream(v, this);
-}
-
-void
-IceInternal::BasicStream::read(ObjectPrx& v)
-{
-    v = _instance->proxyFactory()->streamToProxy(this);
-}
-
-Int
-IceInternal::BasicStream::readEnum(Int maxValue)
-{
-    if(getReadEncoding() == Encoding_1_0)
-    {
-        if(maxValue < 127)
-        {
-            Byte value;
-            read(value);
-            return value;
-        }
-        else if(maxValue < 32767)
-        {
-            Short value;
-            read(value);
-            return value;
-        }
-        else
-        {
-            Int value;
-            read(value);
-            return value;
-        }
-    }
-    else
-    {
-        return readSize();
-    }
-}
-
-void
-IceInternal::BasicStream::writeEnum(Int v, Int maxValue)
-{
-    if(getWriteEncoding() == Encoding_1_0)
-    {
-        if(maxValue < 127)
-        {
-            write(static_cast<Byte>(v));
-        }
-        else if(maxValue < 32767)
-        {
-            write(static_cast<Short>(v));
-        }
-        else
-        {
-            write(v);
-        }
-    }
-    else
-    {
-        writeSize(v);
-    }
-}
-
-void
-IceInternal::BasicStream::writeException(const UserException& e)
-{
-    initWriteEncaps();
-    _currentWriteEncaps->encoder->write(e);
-}
-
-void
-IceInternal::BasicStream::throwException(const UserExceptionFactoryPtr& factory)
-{
-    initReadEncaps();
-    _currentReadEncaps->decoder->throwException(factory);
-}
-
-void
-IceInternal::BasicStream::sliceObjects(bool doSlice)
-{
-    _sliceObjects = doSlice;
-}
-
-bool
-IceInternal::BasicStream::readOptImpl(Int readTag, OptionalFormat expectedFormat)
-{
-    if(getReadEncoding() == Encoding_1_0)
-    {
-        return false; // Optional members aren't supported with the 1.0 encoding.
-    }
-
-    while(true)
-    {
-        if(i >= b.begin() + _currentReadEncaps->start + _currentReadEncaps->sz)
-        {
-            return false; // End of encapsulation also indicates end of optionals.
-        }
-
-        Byte v;
-        read(v);
-        if(v == OPTIONAL_END_MARKER)
-        {
-            --i; // Rewind
-            return false;
-        }
-
-        OptionalFormat format = static_cast<OptionalFormat>(v & 0x07); // First 3 bits.
-        Int tag = static_cast<Int>(v >> 3);
-        if(tag == 30)
-        {
-            tag = readSize();
-        }
-
-        if(tag > readTag)
-        {
-            i -= tag < 30 ? 1 : (tag < 255 ? 2 : 6); // Rewind
-            return false; // No optional data members with the requested tag.
-        }
-        else if(tag < readTag)
-        {
-            skipOpt(format); // Skip optional data members
-        }
-        else
-        {
-            if(format != expectedFormat)
-            {
-                ostringstream os;
-                os << "invalid optional data member `" << tag << "': unexpected format";
-                throw MarshalException(__FILE__, __LINE__, os.str());
-            }
-            return true;
-        }
-    }
-    return true; // Keep the compiler happy.
-}
-
-bool
-IceInternal::BasicStream::writeOptImpl(Int tag, OptionalFormat type)
-{
-    if(getWriteEncoding() == Encoding_1_0)
-    {
-        return false; // Optional members aren't supported with the 1.0 encoding.
-    }
-
-    Byte v = static_cast<Byte>(type);
-    if(tag < 30)
-    {
-        v |= static_cast<Byte>(tag << 3);
-        write(v);
-    }
-    else
-    {
-        v |= 0xF0; // tag = 30
-        write(v);
-        writeSize(tag);
-    }
-    return true;
-}
-
-void
-IceInternal::BasicStream::skipOpt(OptionalFormat type)
-{
-    switch(type)
-    {
-    case Ice::OptionalFormatF1:
-    {
-        skip(1);
-        break;
-    }
-    case Ice::OptionalFormatF2:
-    {
-        skip(2);
-        break;
-    }
-    case Ice::OptionalFormatF4:
-    {
-        skip(4);
-        break;
-    }
-    case Ice::OptionalFormatF8:
-    {
-        skip(8);
-        break;
-    }
-    case Ice::OptionalFormatSize:
-    {
-        skipSize();
-        break;
-    }
-    case Ice::OptionalFormatVSize:
-    {
-        skip(readSize());
-        break;
-    }
-    case Ice::OptionalFormatFSize:
-    {
-        Int sz;
-        read(sz);
-        skip(sz);
-        break;
-    }
-    case Ice::OptionalFormatClass:
-    {
-        read(0, 0);
-        break;
-    }
-    }
-}
-
-void
-BasicStream::skipOpts()
-{
-    //
-    // Skip remaining un-read optional members.
-    //
-    while(true)
-    {
-        if(i >= b.begin() + _currentReadEncaps->start + _currentReadEncaps->sz)
-        {
-            return; // End of encapsulation also indicates end of optionals.
-        }
-
-        Byte v;
-        read(v);
-        if(v == OPTIONAL_END_MARKER)
-        {
-            return;
-        }
-
-        OptionalFormat format = static_cast<OptionalFormat>(v & 0x07); // Read first 3 bits.
-        if(static_cast<Int>(v >> 3) == 30)
-        {
-            skipSize();
-        }
-        skipOpt(format);
-    }
-}
-
-void
-IceInternal::BasicStream::throwUnmarshalOutOfBoundsException(const char* file, int line)
-{
-    throw UnmarshalOutOfBoundsException(file, line);
-}
-
-void
-IceInternal::BasicStream::throwEncapsulationException(const char* file, int line)
-{
-    throw EncapsulationException(file, line);
-}
-
-void
-IceInternal::BasicStream::initReadEncaps()
-{
-    if(!_currentReadEncaps) // Lazy initialization.
-    {
-        _currentReadEncaps = &_preAllocatedReadEncaps;
-        _currentReadEncaps->sz = static_cast<Ice::Int>(b.size());
-    }
-
-    if(!_currentReadEncaps->decoder) // Lazy initialization.
-    {
-        ObjectFactoryManagerPtr factoryManager = _instance->servantFactoryManager();
-        if(_currentReadEncaps->encoding == Encoding_1_0)
-        {
-            _currentReadEncaps->decoder = new EncapsDecoder10(this, _currentReadEncaps, _sliceObjects, factoryManager);
-        }
-        else
-        {
-            _currentReadEncaps->decoder = new EncapsDecoder11(this, _currentReadEncaps, _sliceObjects, factoryManager);
-        }
-    }
-}
-
-void
-IceInternal::BasicStream::initWriteEncaps()
-{
-    if(!_currentWriteEncaps) // Lazy initialization.
-    {
-        _currentWriteEncaps = &_preAllocatedWriteEncaps;
-        _currentWriteEncaps->start = b.size();
-    }
-
-    if(_currentWriteEncaps->format == Ice::DefaultFormat)
-    {
-        _currentWriteEncaps->format = _instance->defaultsAndOverrides()->defaultFormat;
-    }
-
-    if(!_currentWriteEncaps->encoder) // Lazy initialization.
-    {
-        if(_currentWriteEncaps->encoding == Encoding_1_0)
-        {
-            _currentWriteEncaps->encoder = new EncapsEncoder10(this, _currentWriteEncaps);
-        }
-        else
-        {
-            _currentWriteEncaps->encoder = new EncapsEncoder11(this, _currentWriteEncaps);
-        }
-    }
-}
-
-string
-IceInternal::BasicStream::EncapsDecoder::readTypeId(bool isIndex)
-{
-    if(isIndex)
-    {
-        Int index = _stream->readSize();
-        TypeIdReadMap::const_iterator k = _typeIdMap.find(index);
-        if(k == _typeIdMap.end())
-        {
-            throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
-        }
-        return k->second;
-    }
-    else
-    {
-        string typeId;
-        _stream->read(typeId, false);
-        _typeIdMap.insert(make_pair(++_typeIdIndex, typeId));
-        return typeId;
-    }
-}
-
-Ice::ObjectPtr
-IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId)
-{
-    Ice::ObjectPtr v;
-
-    //
-    // Try to find a factory registered for the specific type.
-    //
-    ObjectFactoryPtr userFactory = _servantFactoryManager->find(typeId);
-    if(userFactory)
-    {
-        v = userFactory->create(typeId);
-    }
-
-    //
-    // If that fails, invoke the default factory if one has been
-    // registered.
-    //
-    if(!v)
-    {
-        userFactory = _servantFactoryManager->find("");
-        if(userFactory)
-        {
-            v = userFactory->create(typeId);
-        }
-    }
-
-    //
-    // Last chance: check the table of static factories (i.e.,
-    // automatically generated factories for concrete classes).
-    //
-    if(!v)
-    {
-        ObjectFactoryPtr of = IceInternal::factoryTable->getObjectFactory(typeId);
-        if(of)
-        {
-            v = of->create(typeId);
-            assert(v);
-        }
-    }
-
-    return v;
-}
-
-void
-IceInternal::BasicStream::EncapsDecoder::addPatchEntry(Int index, PatchFunc patchFunc, void* patchAddr)
-{
-    assert(index > 0);
-
-    //
-    // Check if already un-marshalled the object. If that's the case,
-    // just patch the object smart pointer and we're done.
-    //
-    IndexToPtrMap::iterator p = _unmarshaledMap.find(index);
-    if(p != _unmarshaledMap.end())
-    {
-        (*patchFunc)(patchAddr, p->second);
-        return;
-    }
-
-    //
-    // Add patch entry if the object isn't un-marshalled yet, the
-    // smart pointer will be patched when the instance is
-    // un-marshalled.
-    //
-
-    PatchMap::iterator q = _patchMap.find(index);
-    if(q == _patchMap.end())
-    {
-        //
-        // We have no outstanding instances to be patched for this
-        // index, so make a new entry in the patch map.
-        //
-        q = _patchMap.insert(make_pair(index, PatchList())).first;
-    }
-
-    //
-    // Append a patch entry for this instance.
-    //
-    PatchEntry e;
-    e.patchFunc = patchFunc;
-    e.patchAddr = patchAddr;
-    q->second.push_back(e);
-}
-
-void
-IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ObjectPtr& v)
-{
-    //
-    // Add the object to the map of un-marshalled objects, this must
-    // be done before reading the objects (for circular references).
-    //
-    _unmarshaledMap.insert(make_pair(index, v));
-
-    //
-    // Read the object.
-    //
-    v->__read(_stream);
-
-    //
-    // Patch all instances now that the object is un-marshalled.
-    //
-    PatchMap::iterator patchPos = _patchMap.find(index);
-    if(patchPos != _patchMap.end())
-    {
-        assert(patchPos->second.size() > 0);
-
-        //
-        // Patch all pointers that refer to the instance.
-        //
-        for(PatchList::iterator k = patchPos->second.begin(); k != patchPos->second.end(); ++k)
-        {
-            (*k->patchFunc)(k->patchAddr, v);
-        }
-
-        //
-        // Clear out the patch map for that index -- there is nothing left
-        // to patch for that index for the time being.
-        //
-        _patchMap.erase(patchPos);
-    }
-
-    if(_objectList.empty() && _patchMap.empty())
-    {
-        try
-        {
-            if(_stream->instance()->collectObjects())
-            {
-                v->ice_collectable(true);
-            }
-            v->ice_postUnmarshal();
-        }
-        catch(const std::exception& ex)
-        {
-            Warning out(_stream->instance()->initializationData().logger);
-            out << "std::exception raised by ice_postUnmarshal:\n" << ex;
-        }
-        catch(...)
-        {
-            Warning out(_stream->instance()->initializationData().logger);
-            out << "unknown exception raised by ice_postUnmarshal";
-        }
-    }
-    else
-    {
-        _objectList.push_back(v);
-
-        if(_patchMap.empty())
-        {
-            //
-            // Iterate over the object list and invoke ice_postUnmarshal on
-            // each object.  We must do this after all objects have been
-            // unmarshaled in order to ensure that any object data members
-            // have been properly patched.
-            //
-            for(ObjectList::iterator p = _objectList.begin(); p != _objectList.end(); ++p)
-            {
-                try
-                {
-                    if(_stream->instance()->collectObjects())
-                    {
-                        (*p)->ice_collectable(true);
-                    }
-                    (*p)->ice_postUnmarshal();
-                }
-                catch(const std::exception& ex)
-                {
-                    Warning out(_stream->instance()->initializationData().logger);
-                    out << "std::exception raised by ice_postUnmarshal:\n" << ex;
-                }
-                catch(...)
-                {
-                    Warning out(_stream->instance()->initializationData().logger);
-                    out << "unknown exception raised by ice_postUnmarshal";
-                }
-            }
-            _objectList.clear();
-        }
-    }
-}
-
-void
-IceInternal::BasicStream::EncapsDecoder10::read(PatchFunc patchFunc, void* patchAddr)
-{
-    assert(patchFunc && patchAddr);
-
-    //
-    // Object references are encoded as a negative integer in 1.0.
-    //
-    Int index;
-    _stream->read(index);
-    if(index > 0)
-    {
-        throw MarshalException(__FILE__, __LINE__, "invalid object id");
-    }
-    index = -index;
-
-    if(index == 0)
-    {
-        //
-        // Calling the patch function for null instances is necessary for correct functioning of Ice for
-        // Python and Ruby.
-        //
-        ObjectPtr nil;
-        patchFunc(patchAddr, nil);
-    }
-    else
-    {
-        addPatchEntry(index, patchFunc, patchAddr);
-    }
-}
-
-void
-IceInternal::BasicStream::EncapsDecoder10::throwException(const UserExceptionFactoryPtr& factory)
-{
-    assert(_sliceType == NoSlice);
-
-    //
-    // User exception with the 1.0 encoding start with a boolean flag
-    // that indicates whether or not the exception has classes.
-    //
-    // This allows reading the pending objects even if some part of
-    // the exception was sliced.
-    //
-    bool usesClasses;
-    _stream->read(usesClasses);
-
-    _sliceType = ExceptionSlice;
-    _skipFirstSlice = false;
-
-    //
-    // Read the first slice header.
-    //
-    startSlice();
-    const string mostDerivedId = _typeId;
-    UserExceptionFactoryPtr exceptionFactory = factory;
-    while(true)
-    {
-        //
-        // Look for a statically-generated factory for this ID.
-        //
-        if(!exceptionFactory)
-        {
-            exceptionFactory = factoryTable->getExceptionFactory(_typeId);
-        }
-
-        //
-        // We found a factory, we get out of this loop.
-        //
-        if(exceptionFactory)
-        {
-            //
-            // Got factory -- ask the factory to instantiate the
-            // exception, initialize the exception members, and throw
-            // the exception.
-            //
-            try
-            {
-                exceptionFactory->createAndThrow(_typeId);
-            }
-            catch(UserException& ex)
-            {
-                ex.__read(_stream);
-                if(usesClasses)
-                {
-                    readPendingObjects();
-                }
-                throw;
-
-                // Never reached.
-            }
-        }
-
-        //
-        // Slice off what we don't understand.
-        //
-        skipSlice();
-        try
-        {
-            startSlice();
-        }
-        catch(UnmarshalOutOfBoundsException& ex)
-        {
-            //
-            // An oversight in the 1.0 encoding means there is no marker to indicate
-            // the last slice of an exception. As a result, we just try to read the
-            // next type ID, which raises UnmarshalOutOfBoundsException when the
-            // input buffer underflows.
-            //
-            // Set the reason member to a more helpful message.
-            //
-            ex.reason = "unknown exception type `" + mostDerivedId + "'";
-            throw;
-        }
-    }
-}
-
-void
-#ifndef NDEBUG
-IceInternal::BasicStream::EncapsDecoder10::startInstance(SliceType sliceType)
-#else
-IceInternal::BasicStream::EncapsDecoder10::startInstance(SliceType)
-#endif
-{
-    assert(_sliceType == sliceType);
-    _skipFirstSlice = true;
-}
-
-SlicedDataPtr
-IceInternal::BasicStream::EncapsDecoder10::endInstance(bool)
-{
-    //
-    // Read the Ice::Object slice.
-    //
-    if(_sliceType == ObjectSlice)
-    {
-        startSlice();
-        Int sz = _stream->readSize(); // For compatibility with the old AFM.
-        if(sz != 0)
-        {
-            throw MarshalException(__FILE__, __LINE__, "invalid Object slice");
-        }
-        endSlice();
-    }
-    _sliceType = NoSlice;
-    return 0;
-}
-
-const std::string&
-IceInternal::BasicStream::EncapsDecoder10::startSlice()
-{
-    //
-    // If first slice, don't read the header, it was already read in
-    // readInstance or throwException to find the factory.
-    //
-    if(_skipFirstSlice)
-    {
-        _skipFirstSlice = false;
-        return _typeId;
-    }
-
-    //
-    // For objects, first read the type ID boolean which indicates
-    // whether or not the type ID is encoded as a string or as an
-    // index. For exceptions, the type ID is always encoded as a
-    // string.
-    //
-    if(_sliceType == ObjectSlice)
-    {
-        bool isIndex;
-        _stream->read(isIndex);
-        _typeId = readTypeId(isIndex);
-    }
-    else
-    {
-        _stream->read(_typeId, false);
-    }
-
-    _stream->read(_sliceSize);
-    if(_sliceSize < 4)
-    {
-        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
-    }
-    return _typeId;
-}
-
-void
-IceInternal::BasicStream::EncapsDecoder10::endSlice()
-{
-}
-
-void
-IceInternal::BasicStream::EncapsDecoder10::skipSlice()
-{
-    if(_stream->instance()->traceLevels()->slicing > 0)
-    {
-        const Ice::LoggerPtr& logger = _stream->instance()->initializationData().logger;
-        if(_sliceType == ExceptionSlice)
-        {
-            traceSlicing("exception", _typeId, _stream->instance()->traceLevels()->slicingCat, logger);
-        }
-        else
-        {
-            traceSlicing("object", _typeId, _stream->instance()->traceLevels()->slicingCat, logger);
-        }
-    }
-    assert(_sliceSize >= 4);
-    _stream->skip(_sliceSize - sizeof(Int));
-}
-
-void
-IceInternal::BasicStream::EncapsDecoder10::readPendingObjects()
-{
-    Int num;
-    do
-    {
-        num = _stream->readSize();
-        for(Int k = num; k > 0; --k)
-        {
-            readInstance();
-        }
-    }
-    while(num);
-
-    if(!_patchMap.empty())
-    {
-        //
-        // If any entries remain in the patch map, the sender has sent an index for an object, but failed
-        // to supply the object.
-        //
-        throw MarshalException(__FILE__, __LINE__, "index for class received, but no instance");
-    }
-}
-
-void
-IceInternal::BasicStream::EncapsDecoder10::readInstance()
-{
-    Int index;
-    _stream->read(index);
-
-    if(index <= 0)
-    {
-        throw MarshalException(__FILE__, __LINE__, "invalid object id");
-    }
-
-    _sliceType = ObjectSlice;
-    _skipFirstSlice = false;
-
-    //
-    // Read the first slice header.
-    //
-    startSlice();
-    const string mostDerivedId = _typeId;
-    ObjectPtr v;
-    while(true)
-    {
-        //
-        // For the 1.0 encoding, the type ID for the base Object class
-        // marks the last slice.
-        //
-        if(_typeId == Object::ice_staticId())
-        {
-            throw NoObjectFactoryException(__FILE__, __LINE__, "", mostDerivedId);
-        }
-
-        v = newInstance(_typeId);
-
-        //
-        // We found a factory, we get out of this loop.
-        //
-        if(v)
-        {
-            break;
-        }
-
-        //
-        // If object slicing is disabled, stop un-marshalling.
-        //
-        if(!_sliceObjects)
-        {
-            throw NoObjectFactoryException(__FILE__, __LINE__, "no object factory found and object slicing is disabled",
-                                           _typeId);
-        }
-
-        //
-        // Slice off what we don't understand.
-        //
-        skipSlice();
-        startSlice(); // Read next Slice header for next iteration.
-    }
-
-    //
-    // Un-marshal the object and add-it to the map of un-marshaled objects.
-    //
-    unmarshal(index, v);
-}
-
-void
-IceInternal::BasicStream::EncapsDecoder11::read(PatchFunc patchFunc, void* patchAddr)
-{
-    Int index = _stream->readSize();
-    if(index < 0)
-    {
-        throw MarshalException(__FILE__, __LINE__, "invalid object id");
-    }
-    else if(index == 0)
-    {
-        //
-        // Calling the patch function for null instances is necessary for correct functioning of Ice for
-        // Python and Ruby.
-        //
-        if(patchFunc)
-        {
-            ObjectPtr nil;
-            patchFunc(patchAddr, nil);
-        }
-    }
-    else if(_current && _current->sliceFlags & FLAG_HAS_INDIRECTION_TABLE)
-    {
-        //
-        // When reading an object within a slice and there's an
-        // indirect object table, always read an indirect reference
-        // that points to an object from the indirect object table
-        // marshaled at the end of the Slice.
-        //
-        // Maintain a list of indirect references. Note that the
-        // indirect index starts at 1, so we decrement it by one to
-        // derive an index into the indirection table that we'll read
-        // at the end of the slice.
-        //
-        if(patchFunc)
-        {
-            IndirectPatchEntry e;
-            e.index = index - 1;
-            e.patchFunc = patchFunc;
-            e.patchAddr = patchAddr;
-            _current->indirectPatchList.push_back(e);
-        }
-    }
-    else
-    {
-        readInstance(index, patchFunc, patchAddr);
-    }
-}
-
-void
-IceInternal::BasicStream::EncapsDecoder11::throwException(const UserExceptionFactoryPtr& factory)
-{
-    assert(!_current);
-
-    push(ExceptionSlice);
-
-    //
-    // Read the first slice header.
-    //
-    startSlice();
-    const string mostDerivedId = _current->typeId;
-    UserExceptionFactoryPtr exceptionFactory = factory;
-    while(true)
-    {
-        //
-        // Look for a statically-generated factory for this ID.
-        //
-        if(!exceptionFactory)
-        {
-            exceptionFactory = factoryTable->getExceptionFactory(_current->typeId);
-        }
-
-        //
-        // We found a factory, we get out of this loop.
-        //
-        if(exceptionFactory)
-        {
-            //
-            // Got factory -- ask the factory to instantiate the
-            // exception, initialize the exception members, and throw
-            // the exception.
-            //
-            try
-            {
-                exceptionFactory->createAndThrow(_current->typeId);
-            }
-            catch(UserException& ex)
-            {
-                ex.__read(_stream);
-                throw;
-
-                // Never reached.
-            }
-        }
-
-        //
-        // Slice off what we don't understand.
-        //
-        skipSlice();
-
-        //
-        // If this is the last slice, raise an exception and stop un-marshalling.
-        //
-        if(_current->sliceFlags & FLAG_IS_LAST_SLICE)
-        {
-            if(mostDerivedId.length() > 2 && mostDerivedId[0] == ':' && mostDerivedId[1] == ':')
-            {
-                throw UnknownUserException(__FILE__, __LINE__, mostDerivedId.substr(2));
-            }
-            else
-            {
-                throw UnknownUserException(__FILE__, __LINE__, mostDerivedId);
-            }
-        }
-
-        startSlice();
-    }
-}
-
-void
-#ifndef NDEBUG
-IceInternal::BasicStream::EncapsDecoder11::startInstance(SliceType sliceType)
-#else
-IceInternal::BasicStream::EncapsDecoder11::startInstance(SliceType)
-#endif
-{
-    assert(_current->sliceType == sliceType);
-    _current->skipFirstSlice = true;
-}
-
-SlicedDataPtr
-IceInternal::BasicStream::EncapsDecoder11::endInstance(bool preserve)
-{
-    SlicedDataPtr slicedData;
-    if(preserve)
-    {
-        slicedData = readSlicedData();
-    }
-    _current->slices.clear();
-    _current->indirectionTables.clear();
-    _current = _current->previous;
-    return slicedData;
-}
-
-const std::string&
-IceInternal::BasicStream::EncapsDecoder11::startSlice()
-{
-    //
-    // If first slice, don't read the header, it was already read in
-    // readInstance or throwException to find the factory.
-    //
-    if(_current->skipFirstSlice)
-    {
-        _current->skipFirstSlice = false;
-        return _current->typeId;
-    }
-
-    _stream->read(_current->sliceFlags);
-
-    //
-    // Read the type ID, for object slices the type ID is encoded as a
-    // string or as an index, for exceptions it's always encoded as a
-    // string.
-    //
-    if(_current->sliceType == ObjectSlice)
-    {
-        if((_current->sliceFlags & FLAG_HAS_TYPE_ID_COMPACT) == FLAG_HAS_TYPE_ID_COMPACT) // Must be checked first!
-        {
-            _current->typeId.clear();
-            _current->compactId = _stream->readSize();
-        }
-        else if(_current->sliceFlags & (FLAG_HAS_TYPE_ID_STRING | FLAG_HAS_TYPE_ID_INDEX))
-        {
-            _current->typeId = readTypeId(_current->sliceFlags & FLAG_HAS_TYPE_ID_INDEX);
-            _current->compactId = -1;
-        }
-        else
-        {
-            // Only the most derived slice encodes the type ID for the compact format.
-            _current->typeId.clear();
-            _current->compactId = -1;
-        }
-    }
-    else
-    {
-        _stream->read(_current->typeId, false);
-    }
-
-    //
-    // Read the slice size if necessary.
-    //
-    if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE)
-    {
-        _stream->read(_current->sliceSize);
-        if(_current->sliceSize < 4)
-        {
-            throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
-        }
-    }
-    else
-    {
-        _current->sliceSize = 0;
-    }
-
-    return _current->typeId;
-}
-
-void
-IceInternal::BasicStream::EncapsDecoder11::endSlice()
-{
-    if(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS)
-    {
-        _stream->skipOpts();
-    }
-
-    //
-    // Read the indirect object table if one is present.
-    //
-    if(_current->sliceFlags & FLAG_HAS_INDIRECTION_TABLE)
-    {
-        IndexList indirectionTable(_stream->readAndCheckSeqSize(1));
-        for(IndexList::iterator p = indirectionTable.begin(); p != indirectionTable.end(); ++p)
-        {
-            *p = readInstance(_stream->readSize(), 0, 0);
-        }
-
-        //
-        // Sanity checks. If there are optional members, it's possible
-        // that not all object references were read if they are from
-        // unknown optional data members.
-        //
-        if(indirectionTable.empty())
-        {
-            throw MarshalException(__FILE__, __LINE__, "empty indirection table");
-        }
-        if(_current->indirectPatchList.empty() && !(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS))
-        {
-            throw MarshalException(__FILE__, __LINE__, "no references to indirection table");
-        }
-
-        //
-        // Convert indirect references into direct references.
-        //
-        IndirectPatchList::iterator p;
-        for(p = _current->indirectPatchList.begin(); p != _current->indirectPatchList.end(); ++p)
-        {
-            assert(p->index >= 0);
-            if(p->index >= static_cast<Int>(indirectionTable.size()))
-            {
-                throw MarshalException(__FILE__, __LINE__, "indirection out of range");
-            }
-            addPatchEntry(indirectionTable[p->index], p->patchFunc, p->patchAddr);
-        }
-        _current->indirectPatchList.clear();
-    }
-}
-
-void
-IceInternal::BasicStream::EncapsDecoder11::skipSlice()
-{
-    if(_stream->instance()->traceLevels()->slicing > 0)
-    {
-        const Ice::LoggerPtr& logger = _stream->instance()->initializationData().logger;
-        if(_current->sliceType == ExceptionSlice)
-        {
-            traceSlicing("exception", _current->typeId, _stream->instance()->traceLevels()->slicingCat, logger);
-        }
-        else
-        {
-            traceSlicing("object", _current->typeId, _stream->instance()->traceLevels()->slicingCat, logger);
-        }
-    }
-
-    Container::iterator start = _stream->i;
-
-    if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE)
-    {
-        assert(_current->sliceSize >= 4);
-        _stream->skip(_current->sliceSize - sizeof(Int));
-    }
-    else
-    {
-        if(_current->sliceType == ObjectSlice)
-        {
-            throw NoObjectFactoryException(__FILE__, __LINE__,
-                                           "no object factory found and compact format prevents "
-                                           "slicing (the sender should use the sliced format instead)",
-                                           _current->typeId);
-        }
-        else
-        {
-            if(_current->typeId.length() > 2 && _current->typeId[0] == ':' && _current->typeId[1] == ':')
-            {
-                throw UnknownUserException(__FILE__, __LINE__, _current->typeId.substr(2));
-            }
-            else
-            {
-                throw UnknownUserException(__FILE__, __LINE__, _current->typeId);
-            }
-        }
-    }
-
-    //
-    // Preserve this slice.
-    //
-    SliceInfoPtr info = new SliceInfo;
-    info->typeId = _current->typeId;
-    info->compactId = _current->compactId;
-    info->hasOptionalMembers = _current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS;
-    info->isLastSlice = _current->sliceFlags & FLAG_IS_LAST_SLICE;
-    if(info->hasOptionalMembers)
-    {
-        //
-        // Don't include the optional member end marker. It will be re-written by
-        // endSlice when the sliced data is re-written.
-        //
-        vector<Byte>(start, _stream->i - 1).swap(info->bytes);
-    }
-    else
-    {
-        vector<Byte>(start, _stream->i).swap(info->bytes);
-    }
-
-    _current->indirectionTables.push_back(IndexList());
-
-    //
-    // Read the indirect object table. We read the instances or their
-    // IDs if the instance is a reference to an already un-marhsaled
-    // object.
-    //
-    // The SliceInfo object sequence is initialized only if
-    // readSlicedData is called.
-    //
-    if(_current->sliceFlags & FLAG_HAS_INDIRECTION_TABLE)
-    {
-        IndexList& table = _current->indirectionTables.back();
-        table.resize(_stream->readAndCheckSeqSize(1));
-        for(IndexList::iterator p = table.begin(); p != table.end(); ++p)
-        {
-            *p = readInstance(_stream->readSize(), 0, 0);
-        }
-    }
-
-    _current->slices.push_back(info);
-}
-
-bool
-IceInternal::BasicStream::EncapsDecoder11::readOpt(Ice::Int readTag, Ice::OptionalFormat expectedFormat)
-{
-    if(!_current)
-    {
-        return _stream->readOptImpl(readTag, expectedFormat);
-    }
-    else if(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS)
-    {
-        return _stream->readOptImpl(readTag, expectedFormat);
-    }
-    return false;
-}
-
-Int
-IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc patchFunc, void* patchAddr)
-{
-    assert(index > 0);
-
-    if(index > 1)
-    {
-        if(patchFunc)
-        {
-            addPatchEntry(index, patchFunc, patchAddr);
-        }
-        return index;
-    }
-
-    push(ObjectSlice);
-
-    //
-    // Get the object ID before we start reading slices. If some
-    // slices are skiped, the indirect object table are still read and
-    // might read other objects.
-    //
-    index = ++_objectIdIndex;
-
-    //
-    // Read the first slice header.
-    //
-    startSlice();
-    const string mostDerivedId = _current->typeId;
-    Ice::ObjectPtr v;
-    const CompactIdResolverPtr& compactIdResolver = _stream->instance()->initializationData().compactIdResolver;
-    while(true)
-    {
-        if(_current->compactId >= 0)
-        {
-            //
-            // Translate a compact (numeric) type ID into a string type ID.
-            //
-            _current->typeId.clear();
-            if(compactIdResolver)
-            {
-                try
-                {
-                    _current->typeId = compactIdResolver->resolve(_current->compactId);
-                }
-                catch(const LocalException&)
-                {
-                    throw;
-                }
-                catch(const std::exception& ex)
-                {
-                    ostringstream ostr;
-                    ostr << "exception in CompactIdResolver for ID " << _current->compactId;
-                    string msg = ostr.str();
-                    string what = ex.what();
-                    if(!what.empty())
-                    {
-                        msg += ":\n" + what;
-                    }
-                    throw MarshalException(__FILE__, __LINE__, msg);
-                }
-                catch(...)
-                {
-                    ostringstream ostr;
-                    ostr << "unknown exception in CompactIdResolver for ID " << _current->compactId;
-                    throw MarshalException(__FILE__, __LINE__, ostr.str());
-                }
-            }
-            if(_current->typeId.empty())
-            {
-                _current->typeId = IceInternal::factoryTable->getTypeId(_current->compactId);
-            }
-        }
-
-        if(!_current->typeId.empty())
-        {
-            v = newInstance(_current->typeId);
-
-            //
-            // We found a factory, we get out of this loop.
-            //
-            if(v)
-            {
-                break;
-            }
-        }
-
-        //
-        // If object slicing is disabled, stop un-marshalling.
-        //
-        if(!_sliceObjects)
-        {
-            throw NoObjectFactoryException(__FILE__, __LINE__, "no object factory found and object slicing is disabled",
-                                           _current->typeId);
-        }
-
-        //
-        // Slice off what we don't understand.
-        //
-        skipSlice();
-
-        //
-        // If this is the last slice, keep the object as an opaque UnknownSlicedObject.
-        //
-        if(_current->sliceFlags & FLAG_IS_LAST_SLICE)
-        {
-            //
-            // Provide a factory with an opportunity to supply the object.
-            // We pass the "::Ice::Object" ID to indicate that this is the
-            // last chance to preserve the object.
-            //
-            v = newInstance(Object::ice_staticId());
-            if(!v)
-            {
-                v = new UnknownSlicedObject(mostDerivedId);
-            }
-
-            break;
-        }
-
-        startSlice(); // Read next Slice header for next iteration.
-    }
-
-    //
-    // Un-marshal the object
-    //
-    unmarshal(index, v);
-
-    if(!_current && !_patchMap.empty())
-    {
-        //
-        // If any entries remain in the patch map, the sender has sent an index for an object, but failed
-        // to supply the object.
-        //
-        throw MarshalException(__FILE__, __LINE__, "index for class received, but no instance");
-    }
-
-    if(patchFunc)
-    {
-        patchFunc(patchAddr, v);
-    }
-    return index;
-}
-
-SlicedDataPtr
-IceInternal::BasicStream::EncapsDecoder11::readSlicedData()
-{
-    if(_current->slices.empty()) // No preserved slices.
-    {
-        return 0;
-    }
-
-    //
-    // The indirectionTables member holds the indirection table for
-    // each slice in slices.
-    //
-    assert(_current->slices.size() == _current->indirectionTables.size());
-    for(SliceInfoSeq::size_type n = 0; n < _current->slices.size(); ++n)
-    {
-        //
-        // We use the "objects" list in SliceInfo to hold references
-        // to the target objects. Note that the objects might not have
-        // been read yet in the case of a circular reference to an
-        // enclosing object.
-        //
-        const IndexList& table = _current->indirectionTables[n];
-        vector<ObjectPtr>& objects = _current->slices[n]->objects;
-        objects.resize(table.size());
-        IndexList::size_type j = 0;
-        for(IndexList::const_iterator p = table.begin(); p != table.end(); ++p)
-        {
-            addPatchEntry(*p, &patchHandle<Object>, &objects[j++]);
-        }
-    }
-    return new SlicedData(_current->slices);
-}
-
-Int
-IceInternal::BasicStream::EncapsEncoder::registerTypeId(const string& typeId)
-{
-    TypeIdWriteMap::const_iterator p = _typeIdMap.find(typeId);
-    if(p != _typeIdMap.end())
-    {
-        return p->second;
-    }
-    else
-    {
-        _typeIdMap.insert(make_pair(typeId, ++_typeIdIndex));
-        return -1;
-    }
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder10::write(const ObjectPtr& v)
-{
-    //
-    // Object references are encoded as a negative integer in 1.0.
-    //
-    if(v)
-    {
-        _stream->write(-registerObject(v));
-    }
-    else
-    {
-        _stream->write(0);
-    }
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder10::write(const UserException& v)
-{
-    //
-    // User exception with the 1.0 encoding start with a boolean
-    // flag that indicates whether or not the exception uses
-    // classes.
-    //
-    // This allows reading the pending objects even if some part of
-    // the exception was sliced.
-    //
-    bool usesClasses = v.__usesClasses();
-    _stream->write(usesClasses);
-    v.__write(_stream);
-    if(usesClasses)
-    {
-        writePendingObjects();
-    }
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder10::startInstance(SliceType sliceType, const SlicedDataPtr&)
-{
-    _sliceType = sliceType;
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder10::endInstance()
-{
-    if(_sliceType == ObjectSlice)
-    {
-        //
-        // Write the Object slice.
-        //
-        startSlice(Object::ice_staticId(), -1, true);
-        _stream->writeSize(0); // For compatibility with the old AFM.
-        endSlice();
-    }
-    _sliceType = NoSlice;
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder10::startSlice(const string& typeId, int, bool /*last*/)
-{
-    //
-    // For object slices, encode a boolean to indicate how the type ID
-    // is encoded and the type ID either as a string or index. For
-    // exception slices, always encode the type ID as a string.
-    //
-    if(_sliceType == ObjectSlice)
-    {
-        Int index = registerTypeId(typeId);
-        if(index < 0)
-        {
-            _stream->write(false);
-            _stream->write(typeId, false);
-        }
-        else
-        {
-            _stream->write(true);
-            _stream->writeSize(index);
-        }
-    }
-    else
-    {
-        _stream->write(typeId, false);
-    }
-
-    _stream->write(Int(0)); // Placeholder for the slice length.
-
-    _writeSlice = _stream->b.size();
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder10::endSlice()
-{
-    //
-    // Write the slice length.
-    //
-    Int sz = static_cast<Int>(_stream->b.size() - _writeSlice + sizeof(Int));
-    Byte* dest = &(*(_stream->b.begin() + _writeSlice - sizeof(Int)));
-    _stream->write(sz, dest);
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder10::writePendingObjects()
-{
-    while(!_toBeMarshaledMap.empty())
-    {
-        //
-        // Consider the to be marshalled objects as marshalled now,
-        // this is necessary to avoid adding again the "to be
-        // marshalled objects" into _toBeMarshaledMap while writing
-        // objects.
-        //
-        _marshaledMap.insert(_toBeMarshaledMap.begin(), _toBeMarshaledMap.end());
-
-        PtrToIndexMap savedMap;
-        savedMap.swap(_toBeMarshaledMap);
-        _stream->writeSize(static_cast<Int>(savedMap.size()));
-        for(PtrToIndexMap::iterator p = savedMap.begin(); p != savedMap.end(); ++p)
-        {
-            //
-            // Ask the instance to marshal itself. Any new class
-            // instances that are triggered by the classes marshaled
-            // are added to toBeMarshaledMap.
-            //
-            _stream->write(p->second);
-
-            try
-            {
-                p->first->ice_preMarshal();
-            }
-            catch(const std::exception& ex)
-            {
-                Warning out(_stream->instance()->initializationData().logger);
-                out << "std::exception raised by ice_preMarshal:\n" << ex;
-            }
-            catch(...)
-            {
-                Warning out(_stream->instance()->initializationData().logger);
-                out << "unknown exception raised by ice_preMarshal";
-            }
-
-            p->first->__write(_stream);
-        }
-    }
-    _stream->writeSize(0); // Zero marker indicates end of sequence of sequences of instances.
-}
-
-Int
-IceInternal::BasicStream::EncapsEncoder10::registerObject(const ObjectPtr& v)
-{
-    assert(v);
-
-    //
-    // Look for this instance in the to-be-marshaled map.
-    //
-    PtrToIndexMap::const_iterator p = _toBeMarshaledMap.find(v);
-    if(p != _toBeMarshaledMap.end())
-    {
-        return p->second;
-    }
-
-    //
-    // Didn't find it, try the marshaled map next.
-    //
-    PtrToIndexMap::const_iterator q = _marshaledMap.find(v);
-    if(q != _marshaledMap.end())
-    {
-        return q->second;
-    }
-
-    //
-    // We haven't seen this instance previously, create a new
-    // index, and insert it into the to-be-marshaled map.
-    //
-    _toBeMarshaledMap.insert(make_pair(v, ++_objectIdIndex));
-    return _objectIdIndex;
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder11::write(const ObjectPtr& v)
-{
-    if(!v)
-    {
-        _stream->writeSize(0); // Nil reference.
-    }
-    else if(_current && _encaps->format == SlicedFormat)
-    {
-        //
-        // If writting an object within a slice and using the sliced
-        // format, write an index from the object indirection
-        // table. The indirect object table is encoded at the end of
-        // each slice and is always read (even if the Slice is
-        // unknown).
-        //
-        PtrToIndexMap::const_iterator p = _current->indirectionMap.find(v);
-        if(p == _current->indirectionMap.end())
-        {
-            _current->indirectionTable.push_back(v);
-            Int idx = static_cast<Int>(_current->indirectionTable.size()); // Position + 1 (0 is reserved for nil)
-            _current->indirectionMap.insert(make_pair(v, idx));
-            _stream->writeSize(idx);
-        }
-        else
-        {
-            _stream->writeSize(p->second);
-        }
-    }
-    else
-    {
-        writeInstance(v); // Write the instance or a reference if already marshaled.
-    }
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder11::write(const UserException& v)
-{
-    v.__write(_stream);
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder11::startInstance(SliceType sliceType, const SlicedDataPtr& data)
-{
-    if(!_current)
-    {
-        _current = &_preAllocatedInstanceData;
-    }
-    else
-    {
-        _current = _current->next ? _current->next : new InstanceData(_current);
-    }
-    _current->sliceType = sliceType;
-    _current->firstSlice = true;
-
-    if(data)
-    {
-        writeSlicedData(data);
-    }
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder11::endInstance()
-{
-    _current = _current->previous;
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder11::startSlice(const string& typeId, int compactId, bool last)
-{
-    assert(_current->indirectionTable.empty() && _current->indirectionMap.empty());
-
-    _current->sliceFlagsPos = _stream->b.size();
-
-    _current->sliceFlags = 0;
-    if(_encaps->format == SlicedFormat)
-    {
-        _current->sliceFlags |= FLAG_HAS_SLICE_SIZE; // Encode the slice size if using the sliced format.
-    }
-    if(last)
-    {
-        _current->sliceFlags |= FLAG_IS_LAST_SLICE; // This is the last slice.
-    }
-
-    _stream->write(Byte(0)); // Placeholder for the slice flags
-
-    //
-    // For object slices, encode the flag and the type ID either as a
-    // string or index. For exception slices, always encode the type
-    // ID a string.
-    //
-    if(_current->sliceType == ObjectSlice)
-    {
-        //
-        // Encode the type ID (only in the first slice for the compact
-        // encoding).
-        //
-        if(_encaps->format == SlicedFormat || _current->firstSlice)
-        {
-            if(compactId >= 0)
-            {
-                _current->sliceFlags |= FLAG_HAS_TYPE_ID_COMPACT;
-                _stream->writeSize(compactId);
-            }
-            else
-            {
-                Int index = registerTypeId(typeId);
-                if(index < 0)
-                {
-                    _current->sliceFlags |= FLAG_HAS_TYPE_ID_STRING;
-                    _stream->write(typeId, false);
-                }
-                else
-                {
-                    _current->sliceFlags |= FLAG_HAS_TYPE_ID_INDEX;
-                    _stream->writeSize(index);
-                }
-            }
-        }
-    }
-    else
-    {
-        _stream->write(typeId, false);
-    }
-
-    if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE)
-    {
-        _stream->write(Int(0)); // Placeholder for the slice length.
-    }
-
-    _current->writeSlice = _stream->b.size();
-    _current->firstSlice = false;
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder11::endSlice()
-{
-    //
-    // Write the optional member end marker if some optional members
-    // were encoded. Note that the optional members are encoded before
-    // the indirection table and are included in the slice size.
-    //
-    if(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS)
-    {
-        _stream->write(OPTIONAL_END_MARKER);
-    }
-
-    //
-    // Write the slice length if necessary.
-    //
-    if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE)
-    {
-        Int sz = static_cast<Int>(_stream->b.size() - _current->writeSlice + sizeof(Int));
-        Byte* dest = &(*(_stream->b.begin() + _current->writeSlice - sizeof(Int)));
-        _stream->write(sz, dest);
-    }
-
-    //
-    // Only write the indirection table if it contains entries.
-    //
-    if(!_current->indirectionTable.empty())
-    {
-        assert(_encaps->format == SlicedFormat);
-        _current->sliceFlags |= FLAG_HAS_INDIRECTION_TABLE;
-
-        //
-        // Write the indirection object table.
-        //
-        _stream->writeSize(static_cast<Int>(_current->indirectionTable.size()));
-        ObjectList::const_iterator p;
-        for(p = _current->indirectionTable.begin(); p != _current->indirectionTable.end(); ++p)
-        {
-            writeInstance(*p);
-        }
-        _current->indirectionTable.clear();
-        _current->indirectionMap.clear();
-    }
-
-    //
-    // Finally, update the slice flags.
-    //
-    Byte* dest = &(*(_stream->b.begin() + _current->sliceFlagsPos));
-    *dest = _current->sliceFlags;
-}
-
-bool
-IceInternal::BasicStream::EncapsEncoder11::writeOpt(Ice::Int tag, Ice::OptionalFormat format)
-{
-    if(!_current)
-    {
-        return _stream->writeOptImpl(tag, format);
-    }
-    else
-    {
-        if(_stream->writeOptImpl(tag, format))
-        {
-            _current->sliceFlags |= FLAG_HAS_OPTIONAL_MEMBERS;
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder11::writeSlicedData(const SlicedDataPtr& slicedData)
-{
-    assert(slicedData);
-
-    //
-    // We only remarshal preserved slices if we are using the sliced
-    // format. Otherwise, we ignore the preserved slices, which
-    // essentially "slices" the object into the most-derived type
-    // known by the sender.
-    //
-    if(_encaps->format != SlicedFormat)
-    {
-        return;
-    }
-
-    for(SliceInfoSeq::const_iterator p = slicedData->slices.begin(); p != slicedData->slices.end(); ++p)
-    {
-        startSlice((*p)->typeId, (*p)->compactId, (*p)->isLastSlice);
-
-        //
-        // Write the bytes associated with this slice.
-        //
-        _stream->writeBlob((*p)->bytes);
-
-        if((*p)->hasOptionalMembers)
-        {
-            _current->sliceFlags |= FLAG_HAS_OPTIONAL_MEMBERS;
-        }
-
-        //
-        // Make sure to also re-write the object indirection table.
-        //
-        _current->indirectionTable = (*p)->objects;
-
-        endSlice();
-    }
-}
-
-void
-IceInternal::BasicStream::EncapsEncoder11::writeInstance(const ObjectPtr& v)
-{
-    assert(v);
-
-    //
-    // If the instance was already marshaled, just write it's ID.
-    //
-    PtrToIndexMap::const_iterator q = _marshaledMap.find(v);
-    if(q != _marshaledMap.end())
-    {
-        _stream->writeSize(q->second);
-        return;
-    }
-
-    //
-    // We haven't seen this instance previously, create a new ID,
-    // insert it into the marshaled map, and write the instance.
-    //
-    _marshaledMap.insert(make_pair(v, ++_objectIdIndex));
-
-    try
-    {
-        v->ice_preMarshal();
-    }
-    catch(const std::exception& ex)
-    {
-        Warning out(_stream->instance()->initializationData().logger);
-        out << "std::exception raised by ice_preMarshal:\n" << ex;
-    }
-    catch(...)
-    {
-        Warning out(_stream->instance()->initializationData().logger);
-        out << "unknown exception raised by ice_preMarshal";
-    }
-
-    _stream->writeSize(1); // Object instance marker.
-    v->__write(_stream);
-}
-
diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp
index 4727f094eee..53f5750836a 100644
--- a/cpp/src/Ice/BatchRequestQueue.cpp
+++ b/cpp/src/Ice/BatchRequestQueue.cpp
@@ -12,6 +12,7 @@
 #include <Ice/Properties.h>
 
 using namespace std;
+using namespace Ice;
 using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(BatchRequestQueue* p) { return p; }
@@ -25,7 +26,7 @@ class BatchRequestI : public Ice::BatchRequest
 {
 public:
 
-    BatchRequestI(BatchRequestQueue& queue, const Ice::ObjectPrx& proxy, const string& operation, int size) :
+    BatchRequestI(BatchRequestQueue& queue, const Ice::ObjectPrxPtr& proxy, const string& operation, int size) :
         _queue(queue), _proxy(proxy), _operation(operation), _size(size)
     {
     }
@@ -48,7 +49,7 @@ public:
         return _operation;
     }
 
-    virtual const Ice::ObjectPrx&
+    virtual const Ice::ObjectPrxPtr&
     getProxy() const
     {
         return _proxy;
@@ -57,7 +58,7 @@ public:
 private:
 
     BatchRequestQueue& _queue;
-    const Ice::ObjectPrx& _proxy;
+    const Ice::ObjectPrxPtr& _proxy;
     const std::string& _operation;
     const int _size;
 };
@@ -87,21 +88,20 @@ BatchRequestQueue::BatchRequestQueue(const InstancePtr& instance, bool datagram)
 }
 
 void
-BatchRequestQueue::prepareBatchRequest(BasicStream* os)
+BatchRequestQueue::prepareBatchRequest(OutputStream* os)
 {
     Lock sync(*this);
-    if(_exception.get())
+    if(ICE_EXCEPTION_ISSET(_exception))
     {
-        _exception->ice_throw();
+        ICE_RETHROW_EXCEPTION(_exception);
     }
-
     waitStreamInUse(false);
     _batchStreamInUse = true;
     _batchStream.swap(*os);
 }
 
 void
-BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrx& proxy, const std::string& operation)
+BatchRequestQueue::finishBatchRequest(OutputStream* os, const Ice::ObjectPrxPtr& proxy, const std::string& operation)
 {
     //
     // No need for synchronization, no other threads are supposed
@@ -116,14 +116,22 @@ BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrx& pro
 
         if(_maxSize > 0 && _batchStream.b.size() >= _maxSize)
         {
+#ifdef ICE_CPP11_MAPPING
+            proxy->ice_flushBatchRequestsAsync();
+#else
             proxy->begin_ice_flushBatchRequests();
+#endif
         }
 
         assert(_batchMarker < _batchStream.b.size());
         if(_interceptor)
         {
             BatchRequestI request(*this, proxy, operation, static_cast<int>(_batchStream.b.size() - _batchMarker));
+#ifdef ICE_CPP11_MAPPING
+            _interceptor(request, _batchRequestNum, static_cast<int>(_batchMarker));
+#else
             _interceptor->enqueue(request, _batchRequestNum, static_cast<int>(_batchMarker));
+#endif
         }
         else
         {
@@ -149,7 +157,7 @@ BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrx& pro
 }
 
 void
-BatchRequestQueue::abortBatchRequest(BasicStream* os)
+BatchRequestQueue::abortBatchRequest(OutputStream* os)
 {
     Lock sync(*this);
     if(_batchStreamInUse)
@@ -162,7 +170,7 @@ BatchRequestQueue::abortBatchRequest(BasicStream* os)
 }
 
 int
-BatchRequestQueue::swap(BasicStream* os)
+BatchRequestQueue::swap(OutputStream* os)
 {
     Lock sync(*this);
     if(_batchRequestNum == 0)
@@ -199,7 +207,11 @@ void
 BatchRequestQueue::destroy(const Ice::LocalException& ex)
 {
     Lock sync(*this);
+#ifdef ICE_CPP11_MAPPING
+    _exception = ex.ice_clone();
+#else
     _exception.reset(ex.ice_clone());
+#endif
 }
 
 bool
diff --git a/cpp/src/Ice/BatchRequestQueue.h b/cpp/src/Ice/BatchRequestQueue.h
index 7a50e1f8f22..c7e30c6bd65 100644
--- a/cpp/src/Ice/BatchRequestQueue.h
+++ b/cpp/src/Ice/BatchRequestQueue.h
@@ -18,7 +18,7 @@
 #include <Ice/BatchRequestInterceptor.h>
 #include <Ice/BatchRequestQueueF.h>
 #include <Ice/InstanceF.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
 
 namespace IceInternal
 {
@@ -29,11 +29,11 @@ public:
 
     BatchRequestQueue(const InstancePtr&, bool);
 
-    void prepareBatchRequest(BasicStream*);
-    void finishBatchRequest(BasicStream*, const Ice::ObjectPrx&, const std::string&);
-    void abortBatchRequest(BasicStream*);
+    void prepareBatchRequest(Ice::OutputStream*);
+    void finishBatchRequest(Ice::OutputStream*, const Ice::ObjectPrxPtr&, const std::string&);
+    void abortBatchRequest(Ice::OutputStream*);
 
-    int swap(BasicStream*);
+    int swap(Ice::OutputStream*);
 
     void destroy(const Ice::LocalException&);
     bool isEmpty();
@@ -44,13 +44,21 @@ private:
 
     void waitStreamInUse(bool);
 
+#ifdef ICE_CPP11_MAPPING
+    std::function<void(const Ice::BatchRequest&, int, int)> _interceptor;
+#else
     Ice::BatchRequestInterceptorPtr _interceptor;
-    BasicStream _batchStream;
+#endif
+    Ice::OutputStream _batchStream;
     bool _batchStreamInUse;
     bool _batchStreamCanFlush;
     int _batchRequestNum;
     size_t _batchMarker;
+#ifdef ICE_CPP11_MAPPING
+    std::exception_ptr _exception;
+#else
     IceUtil::UniquePtr<Ice::LocalException> _exception;
+#endif
     size_t _maxSize;
 };
 
diff --git a/cpp/src/Ice/Buffer.cpp b/cpp/src/Ice/Buffer.cpp
index fa32a0ec6e6..33cbaeabc34 100644
--- a/cpp/src/Ice/Buffer.cpp
+++ b/cpp/src/Ice/Buffer.cpp
@@ -25,21 +25,68 @@ IceInternal::Buffer::Container::Container() :
     _buf(0),
     _size(0),
     _capacity(0),
-    _shrinkCounter(0)
+    _shrinkCounter(0),
+    _owned(true)
 {
 }
 
 IceInternal::Buffer::Container::Container(const_iterator beg, const_iterator end) :
     _buf(const_cast<iterator>(beg)),
     _size(end - beg),
-    _capacity(0),
+    _capacity(end - beg),
+    _shrinkCounter(0),
+    _owned(false)
+{
+}
+
+IceInternal::Buffer::Container::Container(const vector<value_type>& v) :
     _shrinkCounter(0)
 {
+    if(v.empty())
+    {
+        _buf = 0;
+        _size = 0;
+        _capacity = 0;
+        _owned = true;
+    }
+    else
+    {
+        _buf = const_cast<value_type*>(&v[0]);
+        _size = v.size();
+        _capacity = _size;
+        _owned = false;
+    }
+}
+
+IceInternal::Buffer::Container::Container(Container& other, bool adopt)
+{
+    if(adopt)
+    {
+        _buf = other._buf;
+        _size = other._size;
+        _capacity = other._capacity;
+        _shrinkCounter = other._shrinkCounter;
+        _owned = other._owned;
+
+        other._buf = 0;
+        other._size = 0;
+        other._capacity = 0;
+        other._shrinkCounter = 0;
+        other._owned = true;
+    }
+    else
+    {
+        _buf = other._buf;
+        _size = other._size;
+        _capacity = other._capacity;
+        _shrinkCounter = 0;
+        _owned = false;
+    }
 }
 
 IceInternal::Buffer::Container::~Container()
 {
-    if(_buf && _capacity > 0)
+    if(_buf && _owned)
     {
         ::free(_buf);
     }
@@ -48,31 +95,31 @@ IceInternal::Buffer::Container::~Container()
 void
 IceInternal::Buffer::Container::swap(Container& other)
 {
-    assert(!_buf || _capacity > 0);
-
     std::swap(_buf, other._buf);
-
     std::swap(_size, other._size);
     std::swap(_capacity, other._capacity);
     std::swap(_shrinkCounter, other._shrinkCounter);
+    std::swap(_owned, other._owned);
 }
 
 void
 IceInternal::Buffer::Container::clear()
 {
-    assert(!_buf || _capacity > 0);
+    if(_buf && _owned)
+    {
+        ::free(_buf);
+    }
 
-    free(_buf);
     _buf = 0;
     _size = 0;
     _capacity = 0;
+    _shrinkCounter = 0;
+    _owned = true;
 }
 
 void
 IceInternal::Buffer::Container::reserve(size_type n)
 {
-    assert(!_buf || _capacity > 0);
-
     size_type c = _capacity;
     if(n > _capacity)
     {
@@ -88,11 +135,26 @@ IceInternal::Buffer::Container::reserve(size_type n)
         return;
     }
 
-    pointer p = reinterpret_cast<pointer>(::realloc(_buf, _capacity));
+    pointer p;
+    if(_owned)
+    {
+        p = reinterpret_cast<pointer>(::realloc(_buf, _capacity));
+    }
+    else
+    {
+        p = reinterpret_cast<pointer>(::malloc(_capacity));
+        if(p)
+        {
+            ::memcpy(p, _buf, _size);
+            _owned = true;
+        }
+    }
+
     if(!p)
     {
         _capacity = c; // Restore the previous capacity.
         throw std::bad_alloc();
     }
+
     _buf = p;
 }
diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp
index aff05d4d198..b6b15cb83b8 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.cpp
+++ b/cpp/src/Ice/CollocatedRequestHandler.cpp
@@ -31,11 +31,15 @@ class InvokeAll : public DispatchWorkItem
 public:
 
     InvokeAll(OutgoingBase* out,
-              BasicStream* os,
+              OutputStream* os,
               CollocatedRequestHandler* handler,
               Int requestId,
               Int batchRequestNum) :
-        _out(out), _os(os), _handler(handler), _requestId(requestId), _batchRequestNum(batchRequestNum)
+        _out(out),
+        _os(os),
+        _handler(handler->shared_from_this()),
+        _requestId(requestId),
+        _batchRequestNum(batchRequestNum)
     {
     }
 
@@ -51,7 +55,7 @@ public:
 private:
 
     OutgoingBase* _out;
-    BasicStream* _os;
+    OutputStream* _os;
     CollocatedRequestHandlerPtr _handler;
     Int _requestId;
     Int _batchRequestNum;
@@ -62,8 +66,8 @@ class InvokeAllAsync : public DispatchWorkItem
 public:
 
     InvokeAllAsync(const OutgoingAsyncBasePtr& outAsync,
-                   BasicStream* os,
-                   CollocatedRequestHandler* handler,
+                   OutputStream* os,
+                   const CollocatedRequestHandlerPtr& handler,
                    Int requestId,
                    Int batchRequestNum) :
         _outAsync(outAsync), _os(os), _handler(handler), _requestId(requestId), _batchRequestNum(batchRequestNum)
@@ -82,14 +86,14 @@ public:
 private:
 
     OutgoingAsyncBasePtr _outAsync;
-    BasicStream* _os;
+    OutputStream* _os;
     CollocatedRequestHandlerPtr _handler;
     Int _requestId;
     Int _batchRequestNum;
 };
 
 void
-fillInValue(BasicStream* os, int pos, Int value)
+fillInValue(OutputStream* os, int pos, Int value)
 {
     const Byte* p = reinterpret_cast<const Byte*>(&value);
 #ifdef ICE_BIG_ENDIAN
@@ -103,7 +107,7 @@ fillInValue(BasicStream* os, int pos, Int value)
 
 CollocatedRequestHandler::CollocatedRequestHandler(const ReferencePtr& ref, const ObjectAdapterPtr& adapter) :
     RequestHandler(ref),
-    _adapter(ObjectAdapterIPtr::dynamicCast(adapter)),
+    _adapter(ICE_DYNAMIC_CAST(ObjectAdapterI, adapter)),
     _dispatcher(_reference->getInstance()->initializationData().dispatcher),
     _logger(_reference->getInstance()->initializationData().logger), // Cached for better performance.
     _traceLevels(_reference->getInstance()->traceLevels()), // Cached for better performance.
@@ -118,7 +122,7 @@ CollocatedRequestHandler::~CollocatedRequestHandler()
 RequestHandlerPtr
 CollocatedRequestHandler::update(const RequestHandlerPtr& previousHandler, const RequestHandlerPtr& newHandler)
 {
-    return previousHandler.get() == this ? newHandler : this;
+    return previousHandler.get() == this ? newHandler : shared_from_this();
 }
 
 bool
@@ -182,15 +186,15 @@ CollocatedRequestHandler::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAs
             _asyncRequests.erase(p->second);
         }
         _sendAsyncRequests.erase(p);
-        if(outAsync->completed(ex))
+        if(outAsync->exception(ex))
         {
-            outAsync->invokeCompletedAsync();
+            outAsync->invokeExceptionAsync();
         }
         _adapter->decDirectCount(); // invokeAll won't be called, decrease the direct count.
         return;
     }
 
-    OutgoingAsyncPtr o = OutgoingAsyncPtr::dynamicCast(outAsync);
+    OutgoingAsyncPtr o = ICE_DYNAMIC_CAST(OutgoingAsync, outAsync);
     if(o)
     {
         for(map<Int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.begin(); q != _asyncRequests.end(); ++q)
@@ -198,9 +202,9 @@ CollocatedRequestHandler::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAs
             if(q->second.get() == o.get())
             {
                 _asyncRequests.erase(q);
-                if(outAsync->completed(ex))
+                if(outAsync->exception(ex))
                 {
-                    outAsync->invokeCompletedAsync();
+                    outAsync->invokeExceptionAsync();
                 }
                 return;
             }
@@ -249,7 +253,7 @@ CollocatedRequestHandler::invokeRequest(OutgoingBase* out, int batchRequestNum)
 }
 
 AsyncStatus
-CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int batchRequestNum)
+CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int batchRequestNum, bool synchronous)
 {
     //
     // Increase the direct count to prevent the thread pool from being destroyed before
@@ -262,15 +266,18 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int ba
     {
         Lock sync(*this);
 
-        outAsync->cancelable(this); // This will throw if the request is canceled
+        //
+        // This will throw if the request is canceled
+        //
+        outAsync->cancelable(shared_from_this());
 
         if(_response)
         {
             requestId = ++_requestId;
-            _asyncRequests.insert(make_pair(requestId, outAsync));
+            _asyncRequests.insert(make_pair(requestId, outAsync->shared_from_this()));
         }
 
-        _sendAsyncRequests.insert(make_pair(outAsync, requestId));
+        _sendAsyncRequests.insert(make_pair(outAsync->shared_from_this(), requestId));
     }
     catch(...)
     {
@@ -280,31 +287,65 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int ba
 
     outAsync->attachCollocatedObserver(_adapter, requestId);
 
-    _adapter->getThreadPool()->dispatch(new InvokeAllAsync(outAsync, outAsync->getOs(), this, requestId,
-                                                           batchRequestNum));
+    if(!synchronous || !_response || _reference->getInvocationTimeout() > 0)
+    {
+        // Don't invoke from the user thread if async or invocation timeout is set
+        _adapter->getThreadPool()->dispatch(new InvokeAllAsync(outAsync->shared_from_this(),
+                                                               outAsync->getOs(),
+                                                               shared_from_this(),
+                                                               requestId,
+                                                               batchRequestNum));
+    }
+    else if(_dispatcher)
+    {
+        _adapter->getThreadPool()->dispatchFromThisThread(new InvokeAllAsync(outAsync->shared_from_this(),
+                                                                             outAsync->getOs(),
+                                                                             shared_from_this(),
+                                                                             requestId,
+                                                                             batchRequestNum));
+    }
+    else // Optimization: directly call invokeAll if there's no dispatcher.
+    {
+        //
+        // Make sure to hold a reference on this handler while the call is being
+        // dispatched. Otherwise, the handler could be deleted during the dispatch
+        // if a retry occurs.
+        //
+        CollocatedRequestHandlerPtr self(shared_from_this());
+
+        if(sentAsync(outAsync))
+        {
+            invokeAll(outAsync->getOs(), requestId, batchRequestNum);
+        }
+    }
     return AsyncStatusQueued;
 }
 
 void
-CollocatedRequestHandler::sendResponse(Int requestId, BasicStream* os, Byte, bool amd)
+CollocatedRequestHandler::sendResponse(Int requestId, OutputStream* os, Byte, bool amd)
 {
     OutgoingAsyncBasePtr outAsync;
     {
         Lock sync(*this);
         assert(_response);
 
-        os->i = os->b.begin() + sizeof(replyHdr) + 4;
-
         if(_traceLevels->protocol >= 1)
         {
             fillInValue(os, 10, static_cast<Int>(os->b.size()));
-            traceRecv(*os, _logger, _traceLevels);
+        }
+
+        InputStream is(os->instance(), os->getEncoding(), *os, true); // Adopting the OutputStream's buffer.
+        is.pos(sizeof(replyHdr) + 4);
+
+        if(_traceLevels->protocol >= 1)
+        {
+            traceRecv(is, _logger, _traceLevels);
         }
 
         map<int, OutgoingBase*>::iterator p = _requests.find(requestId);
         if(p != _requests.end())
         {
-            p->second->completed(*os);
+            p->second->completed(is);
             _requests.erase(p);
         }
         else
@@ -312,8 +353,8 @@ CollocatedRequestHandler::sendResponse(Int requestId, BasicStream* os, Byte, boo
             map<int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.find(requestId);
             if(q != _asyncRequests.end())
             {
-                os->swap(*q->second->getIs());
-                if(q->second->completed())
+                is.swap(*q->second->getIs());
+                if(q->second->response())
                 {
                     outAsync = q->second;
                 }
@@ -331,11 +372,11 @@ CollocatedRequestHandler::sendResponse(Int requestId, BasicStream* os, Byte, boo
         //
         if(amd)
         {
-            outAsync->invokeCompletedAsync();
+            outAsync->invokeResponseAsync();
         }
         else
         {
-            outAsync->invokeCompleted();
+            outAsync->invokeResponse();
         }
     }
 
@@ -392,7 +433,7 @@ CollocatedRequestHandler::sentAsync(OutgoingAsyncBase* outAsync)
 {
     {
         Lock sync(*this);
-        if(_sendAsyncRequests.erase(outAsync) == 0)
+        if(_sendAsyncRequests.erase(outAsync->shared_from_this()) == 0)
         {
             return false; // The request timed-out.
         }
@@ -407,17 +448,8 @@ CollocatedRequestHandler::sentAsync(OutgoingAsyncBase* outAsync)
 }
 
 void
-CollocatedRequestHandler::invokeAll(BasicStream* os, Int requestId, Int batchRequestNum)
+CollocatedRequestHandler::invokeAll(OutputStream* os, Int requestId, Int batchRequestNum)
 {
-    if(batchRequestNum > 0)
-    {
-        os->i = os->b.begin() + sizeof(requestBatchHdr);
-    }
-    else
-    {
-        os->i = os->b.begin() + sizeof(requestHdr);
-    }
-
     if(_traceLevels->protocol >= 1)
     {
         fillInValue(os, 10, static_cast<Int>(os->b.size()));
@@ -432,6 +464,17 @@ CollocatedRequestHandler::invokeAll(BasicStream* os, Int requestId, Int batchReq
         traceSend(*os, _logger, _traceLevels);
     }
 
+    InputStream is(os->instance(), os->getEncoding(), *os);
+
+    if(batchRequestNum > 0)
+    {
+        is.pos(sizeof(requestBatchHdr));
+    }
+    else
+    {
+        is.pos(sizeof(requestHdr));
+    }
+
     int invokeNum = batchRequestNum > 0 ? batchRequestNum : 1;
     ServantManagerPtr servantManager = _adapter->getServantManager();
     try
@@ -455,7 +498,7 @@ CollocatedRequestHandler::invokeAll(BasicStream* os, Int requestId, Int batchReq
             }
 
             Incoming in(_reference->getInstance().get(), this, 0, _adapter, _response, 0, requestId);
-            in.invoke(servantManager, os);
+            in.invoke(servantManager, &is);
             --invokeNum;
         }
     }
@@ -490,7 +533,7 @@ CollocatedRequestHandler::handleException(int requestId, const Exception& ex, bo
             map<int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.find(requestId);
             if(q != _asyncRequests.end())
             {
-                if(q->second->completed(ex))
+                if(q->second->exception(ex))
                 {
                     outAsync = q->second;
                 }
@@ -508,11 +551,11 @@ CollocatedRequestHandler::handleException(int requestId, const Exception& ex, bo
         //
         if(amd)
         {
-            outAsync->invokeCompletedAsync();
+            outAsync->invokeExceptionAsync();
         }
         else
         {
-            outAsync->invokeCompleted();
+            outAsync->invokeException();
         }
     }
 }
diff --git a/cpp/src/Ice/CollocatedRequestHandler.h b/cpp/src/Ice/CollocatedRequestHandler.h
index 4e841ad3bc9..3f26d677bb8 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.h
+++ b/cpp/src/Ice/CollocatedRequestHandler.h
@@ -15,16 +15,17 @@
 
 #include <Ice/RequestHandler.h>
 #include <Ice/ResponseHandler.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
 #include <Ice/ObjectAdapterF.h>
 #include <Ice/LoggerF.h>
 #include <Ice/TraceLevelsF.h>
+#include <Ice/VirtualShared.h>
 
 namespace Ice
 {
 
 class ObjectAdapterI;
-typedef IceUtil::Handle<ObjectAdapterI> ObjectAdapterIPtr;
+ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI);
 
 }
 
@@ -36,7 +37,10 @@ class Outgoing;
 class OutgoingAsyncBase;
 class OutgoingAsync;
 
-class CollocatedRequestHandler : public RequestHandler, public ResponseHandler, private IceUtil::Monitor<IceUtil::Mutex>
+class CollocatedRequestHandler : public RequestHandler,
+                                 public ResponseHandler,
+                                 private IceUtil::Monitor<IceUtil::Mutex>,
+                                 public Ice::EnableSharedFromThis<CollocatedRequestHandler>
 {
 public:
 
@@ -51,7 +55,7 @@ public:
     virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&);
     virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&);
 
-    virtual void sendResponse(Ice::Int, BasicStream*, Ice::Byte, bool);
+    virtual void sendResponse(Ice::Int, Ice::OutputStream*, Ice::Byte, bool);
     virtual void sendNoResponse();
     virtual bool systemException(Ice::Int, const Ice::SystemException&, bool);
     virtual void invokeException(Ice::Int, const Ice::LocalException&, int, bool);
@@ -62,12 +66,14 @@ public:
     virtual Ice::ConnectionIPtr waitForConnection();
 
     void invokeRequest(OutgoingBase*, int);
-    AsyncStatus invokeAsyncRequest(OutgoingAsyncBase*, int);
+    AsyncStatus invokeAsyncRequest(OutgoingAsyncBase*, int, bool);
 
     bool sent(OutgoingBase*);
     bool sentAsync(OutgoingAsyncBase*);
 
-    void invokeAll(BasicStream*, Ice::Int, Ice::Int);
+    void invokeAll(Ice::OutputStream*, Ice::Int, Ice::Int);
+
+    using Ice::EnableSharedFromThis<CollocatedRequestHandler>::shared_from_this;
 
 private:
 
@@ -86,7 +92,7 @@ private:
     std::map<Ice::Int, OutgoingBase*> _requests;
     std::map<Ice::Int, OutgoingAsyncBasePtr> _asyncRequests;
 };
-typedef IceUtil::Handle<CollocatedRequestHandler> CollocatedRequestHandlerPtr;
+ICE_DEFINE_PTR(CollocatedRequestHandlerPtr, CollocatedRequestHandler);
 
 }
 
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 02528ed579c..3311768e765 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -7,13 +7,13 @@
 //
 // **********************************************************************
 
+#include <IceUtil/DisableWarnings.h>
 #include <Ice/CommunicatorI.h>
 #include <Ice/Instance.h>
 #include <Ice/Properties.h>
 #include <Ice/ConnectionFactory.h>
 #include <Ice/ReferenceFactory.h>
 #include <Ice/ProxyFactory.h>
-#include <Ice/ObjectFactoryManager.h>
 #include <Ice/ObjectAdapterFactory.h>
 #include <Ice/LoggerUtil.h>
 #include <Ice/LocalException.h>
@@ -56,26 +56,26 @@ Ice::CommunicatorI::isShutdown() const
     return _instance->objectAdapterFactory()->isShutdown();
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::CommunicatorI::stringToProxy(const string& s) const
 {
     return _instance->proxyFactory()->stringToProxy(s);
 }
 
 string
-Ice::CommunicatorI::proxyToString(const ObjectPrx& proxy) const
+Ice::CommunicatorI::proxyToString(const ObjectPrxPtr& proxy) const
 {
     return _instance->proxyFactory()->proxyToString(proxy);
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::CommunicatorI::propertyToProxy(const string& p) const
 {
     return _instance->proxyFactory()->propertyToProxy(p);
 }
 
 PropertyDict
-Ice::CommunicatorI::proxyToProperty(const ObjectPrx& proxy, const string& property) const
+Ice::CommunicatorI::proxyToProperty(const ObjectPrxPtr& proxy, const string& property) const
 {
     return _instance->proxyFactory()->proxyToProperty(proxy, property);
 }
@@ -83,19 +83,19 @@ Ice::CommunicatorI::proxyToProperty(const ObjectPrx& proxy, const string& proper
 Identity
 Ice::CommunicatorI::stringToIdentity(const string& s) const
 {
-    return _instance->stringToIdentity(s);
+    return Ice::stringToIdentity(s);
 }
 
 string
 Ice::CommunicatorI::identityToString(const Identity& ident) const
 {
-    return _instance->identityToString(ident);
+    return Ice::identityToString(ident);
 }
 
 ObjectAdapterPtr
 Ice::CommunicatorI::createObjectAdapter(const string& name)
 {
-    return _instance->objectAdapterFactory()->createObjectAdapter(name, 0);
+    return _instance->objectAdapterFactory()->createObjectAdapter(name, ICE_NULLPTR);
 }
 
 ObjectAdapterPtr
@@ -108,11 +108,11 @@ Ice::CommunicatorI::createObjectAdapterWithEndpoints(const string& name, const s
     }
 
     getProperties()->setProperty(oaName + ".Endpoints", endpoints);
-    return _instance->objectAdapterFactory()->createObjectAdapter(oaName, 0);
+    return _instance->objectAdapterFactory()->createObjectAdapter(oaName, ICE_NULLPTR);
 }
 
 ObjectAdapterPtr
-Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const RouterPrx& router)
+Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const RouterPrxPtr& router)
 {
     string oaName = name;
     if(oaName.empty())
@@ -130,15 +130,15 @@ Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const Rout
 }
 
 void
-Ice::CommunicatorI::addObjectFactory(const ObjectFactoryPtr& factory, const string& id)
+Ice::CommunicatorI::addObjectFactory(const ::Ice::ObjectFactoryPtr& factory, const string& id)
 {
-    _instance->servantFactoryManager()->add(factory, id);
+    _instance->addObjectFactory(factory, id);
 }
 
-ObjectFactoryPtr
+::Ice::ObjectFactoryPtr
 Ice::CommunicatorI::findObjectFactory(const string& id) const
 {
-    return _instance->servantFactoryManager()->find(id);
+    return _instance->findObjectFactory(id);
 }
 
 PropertiesPtr
@@ -159,26 +159,26 @@ Ice::CommunicatorI::getObserver() const
     return _instance->initializationData().observer;
 }
 
-RouterPrx
+RouterPrxPtr
 Ice::CommunicatorI::getDefaultRouter() const
 {
     return _instance->referenceFactory()->getDefaultRouter();
 }
 
 void
-Ice::CommunicatorI::setDefaultRouter(const RouterPrx& router)
+Ice::CommunicatorI::setDefaultRouter(const RouterPrxPtr& router)
 {
     _instance->setDefaultRouter(router);
 }
 
-LocatorPrx
+LocatorPrxPtr
 Ice::CommunicatorI::getDefaultLocator() const
 {
     return _instance->referenceFactory()->getDefaultLocator();
 }
 
 void
-Ice::CommunicatorI::setDefaultLocator(const LocatorPrx& locator)
+Ice::CommunicatorI::setDefaultLocator(const LocatorPrxPtr& locator)
 {
     _instance->setDefaultLocator(locator);
 }
@@ -195,6 +195,47 @@ Ice::CommunicatorI::getPluginManager() const
     return _instance->pluginManager();
 }
 
+ValueFactoryManagerPtr
+Ice::CommunicatorI::getValueFactoryManager() const
+{
+    return _instance->initializationData().valueFactoryManager;
+}
+
+namespace
+{
+
+const ::std::string __flushBatchRequests_name = "flushBatchRequests";
+
+}
+
+#ifdef ICE_CPP11_MAPPING
+void
+Ice::CommunicatorI::flushBatchRequests()
+{
+    Communicator::flushBatchRequestsAsync().get();
+}
+
+::std::function<void()>
+Ice::CommunicatorI::flushBatchRequestsAsync(function<void(exception_ptr)> ex, function<void(bool)> sent)
+{
+    class CommunicatorFlushBatchLambda : public CommunicatorFlushBatchAsync, public LambdaInvoke
+    {
+    public:
+
+        CommunicatorFlushBatchLambda(const InstancePtr& instance,
+                                     std::function<void(std::exception_ptr)> ex,
+                                     std::function<void(bool)> sent) :
+            CommunicatorFlushBatchAsync(instance), LambdaInvoke(std::move(ex), std::move(sent))
+        {
+        }
+    };
+    auto outAsync = make_shared<CommunicatorFlushBatchLambda>(_instance, ex, sent);
+    outAsync->invoke(__flushBatchRequests_name);
+    return [outAsync]() { outAsync->cancel(); };
+}
+
+#else
+
 void
 Ice::CommunicatorI::flushBatchRequests()
 {
@@ -221,78 +262,39 @@ Ice::CommunicatorI::begin_flushBatchRequests(const Callback_Communicator_flushBa
 }
 
 AsyncResultPtr
-Ice::CommunicatorI::begin_flushBatchRequests(const IceInternal::Function<void (const Exception&)>& exception,
-                                             const IceInternal::Function<void (bool)>& sent)
+Ice::CommunicatorI::__begin_flushBatchRequests(const IceInternal::CallbackBasePtr& cb, const LocalObjectPtr& cookie)
 {
-#ifdef ICE_CPP11
-    class Cpp11CB : public IceInternal::Cpp11FnCallbackNC
+    class CommunicatorFlushBatchAsyncWithCallback : public CommunicatorFlushBatchAsync, public CallbackCompletion
     {
-
     public:
 
-        Cpp11CB(const IceInternal::Function<void (const Exception&)>& excb,
-                const IceInternal::Function<void (bool)>& sentcb) :
-            IceInternal::Cpp11FnCallbackNC(excb, sentcb)
+        CommunicatorFlushBatchAsyncWithCallback(const Ice::CommunicatorPtr& communicator,
+                                                const InstancePtr& instance,
+                                                const CallbackBasePtr& callback,
+                                                const Ice::LocalObjectPtr& cookie) :
+            CommunicatorFlushBatchAsync(instance), CallbackCompletion(callback, cookie), _communicator(communicator)
         {
-            CallbackBase::checkCallback(true, excb != nullptr);
+            _cookie = cookie;
         }
 
-        virtual void
-        completed(const AsyncResultPtr& __result) const
+        virtual Ice::CommunicatorPtr getCommunicator() const
         {
-            CommunicatorPtr __com = __result->getCommunicator();
-            assert(__com);
-            try
-            {
-                __com->end_flushBatchRequests(__result);
-                assert(false);
-            }
-            catch(const Exception& ex)
-            {
-                IceInternal::Cpp11FnCallbackNC::exception(__result, ex);
-            }
+            return _communicator;
         }
-    };
-
-    return __begin_flushBatchRequests(new Cpp11CB(exception, sent), 0);
-#else
-    assert(false); // Ice not built with C++11 support.
-    return 0;
-#endif
-}
-
-namespace
-{
-
-const ::std::string __flushBatchRequests_name = "flushBatchRequests";
-
-}
-
-AsyncResultPtr
-Ice::CommunicatorI::__begin_flushBatchRequests(const IceInternal::CallbackBasePtr& cb, const LocalObjectPtr& cookie)
-{
-    OutgoingConnectionFactoryPtr connectionFactory = _instance->outgoingConnectionFactory();
-    ObjectAdapterFactoryPtr adapterFactory = _instance->objectAdapterFactory();
 
-    //
-    // This callback object receives the results of all invocations
-    // of Connection::begin_flushBatchRequests.
-    //
-    CommunicatorFlushBatchAsyncPtr result = new CommunicatorFlushBatchAsync(this,
-                                                                            _instance,
-                                                                            __flushBatchRequests_name,
-                                                                            cb,
-                                                                            cookie);
+        virtual const std::string&
+        getOperation() const
+        {
+            return __flushBatchRequests_name;
+        }
 
-    connectionFactory->flushAsyncBatchRequests(result);
-    adapterFactory->flushAsyncBatchRequests(result);
+    private:
 
-    //
-    // Inform the callback that we have finished initiating all of the
-    // flush requests.
-    //
-    result->ready();
+        Ice::CommunicatorPtr _communicator;
+    };
 
+    CommunicatorFlushBatchAsyncPtr result = new CommunicatorFlushBatchAsyncWithCallback(this, _instance, cb, cookie);
+    result->invoke(__flushBatchRequests_name);
     return result;
 }
 
@@ -302,13 +304,14 @@ Ice::CommunicatorI::end_flushBatchRequests(const AsyncResultPtr& r)
     AsyncResult::__check(r, this, __flushBatchRequests_name);
     r->__wait();
 }
+#endif
 
-ObjectPrx
+ObjectPrxPtr
 Ice::CommunicatorI::createAdmin(const ObjectAdapterPtr& adminAdapter, const Identity& adminId)
 {
     return _instance->createAdmin(adminAdapter, adminId);
 }
-ObjectPrx
+ObjectPrxPtr
 Ice::CommunicatorI::getAdmin() const
 {
     return _instance->getAdmin();
@@ -338,32 +341,32 @@ Ice::CommunicatorI::findAllAdminFacets()
     return _instance->findAllAdminFacets();
 }
 
-Ice::CommunicatorI::CommunicatorI(const InitializationData& initData)
+CommunicatorIPtr
+Ice::CommunicatorI::create(const InitializationData& initData)
 {
-    __setNoDelete(true);
+    Ice::CommunicatorIPtr communicator = ICE_MAKE_SHARED(CommunicatorI);
     try
     {
-        const_cast<InstancePtr&>(_instance) = new Instance(this, initData);
+        const_cast<InstancePtr&>(communicator->_instance) = new Instance(communicator, initData);
 
         //
         // Keep a reference to the dynamic library list to ensure
         // the libraries are not unloaded until this Communicator's
         // destructor is invoked.
         //
-        const_cast<DynamicLibraryListPtr&>(_dynamicLibraryList) = _instance->dynamicLibraryList();
+        const_cast<DynamicLibraryListPtr&>(communicator->_dynamicLibraryList) = communicator->_instance->dynamicLibraryList();
     }
     catch(...)
     {
-        destroy();
-        __setNoDelete(false);
+        communicator->destroy();
         throw;
     }
-    __setNoDelete(false);
+    return communicator;
 }
 
 Ice::CommunicatorI::~CommunicatorI()
 {
-    if(!_instance->destroyed())
+    if(_instance && !_instance->destroyed())
     {
         Warning out(_instance->initializationData().logger);
         out << "Ice::Communicator::destroy() has not been called";
@@ -375,7 +378,7 @@ Ice::CommunicatorI::finishSetup(int& argc, char* argv[])
 {
     try
     {
-        _instance->finishSetup(argc, argv, this);
+        _instance->finishSetup(argc, argv, ICE_SHARED_FROM_THIS);
     }
     catch(...)
     {
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index 9cfd42e65f6..83c4661c316 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -20,27 +20,31 @@
 namespace Ice
 {
 
-class CommunicatorI : public Communicator
+class CommunicatorI;
+ICE_DEFINE_PTR(CommunicatorIPtr, CommunicatorI);
+
+class CommunicatorI : public EnableSharedFromThis<CommunicatorI>,
+                      public Communicator
 {
 public:
-    
+
     virtual void destroy();
     virtual void shutdown();
     virtual void waitForShutdown();
     virtual bool isShutdown() const;
 
-    virtual ObjectPrx stringToProxy(const std::string&) const;
-    virtual std::string proxyToString(const ObjectPrx&) const;
+    virtual ObjectPrxPtr stringToProxy(const std::string&) const;
+    virtual std::string proxyToString(const ObjectPrxPtr&) const;
 
-    virtual ObjectPrx propertyToProxy(const std::string&) const;
-    virtual PropertyDict proxyToProperty(const ObjectPrx&, const std::string&) const;
+    virtual ObjectPrxPtr propertyToProxy(const std::string&) const;
+    virtual PropertyDict proxyToProperty(const ObjectPrxPtr&, const std::string&) const;
 
     virtual Identity stringToIdentity(const std::string&) const;
     virtual std::string identityToString(const Identity&) const;
 
     virtual ObjectAdapterPtr createObjectAdapter(const std::string&);
     virtual ObjectAdapterPtr createObjectAdapterWithEndpoints(const std::string&, const std::string&);
-    virtual ObjectAdapterPtr createObjectAdapterWithRouter(const std::string&, const RouterPrx&);
+    virtual ObjectAdapterPtr createObjectAdapterWithRouter(const std::string&, const RouterPrxPtr&);
 
     virtual void addObjectFactory(const ObjectFactoryPtr&, const std::string&);
     virtual ObjectFactoryPtr findObjectFactory(const std::string&) const;
@@ -51,38 +55,47 @@ public:
     virtual LoggerPtr getLogger() const;
     virtual Ice::Instrumentation::CommunicatorObserverPtr getObserver() const;
 
-    virtual RouterPrx getDefaultRouter() const;
-    virtual void setDefaultRouter(const RouterPrx&);
+    virtual RouterPrxPtr getDefaultRouter() const;
+    virtual void setDefaultRouter(const RouterPrxPtr&);
 
-    virtual LocatorPrx getDefaultLocator() const;
-    virtual void setDefaultLocator(const LocatorPrx&);
+    virtual LocatorPrxPtr getDefaultLocator() const;
+    virtual void setDefaultLocator(const LocatorPrxPtr&);
 
     virtual PluginManagerPtr getPluginManager() const;
 
+    virtual ValueFactoryManagerPtr getValueFactoryManager() const;
+
     virtual void flushBatchRequests();
 
+#ifdef ICE_CPP11_MAPPING
+    virtual ::std::function<void()>
+    flushBatchRequestsAsync(::std::function<void(::std::exception_ptr)>,
+                            ::std::function<void(bool)> = nullptr);
+#else
     virtual AsyncResultPtr begin_flushBatchRequests();
     virtual AsyncResultPtr begin_flushBatchRequests(const CallbackPtr&, const LocalObjectPtr& = 0);
     virtual AsyncResultPtr begin_flushBatchRequests(const Callback_Communicator_flushBatchRequestsPtr&,
                                                     const LocalObjectPtr& = 0);
 
-    virtual AsyncResultPtr begin_flushBatchRequests(
-        const IceInternal::Function<void (const Exception&)>&,
-        const IceInternal::Function<void (bool)>& = IceInternal::Function<void (bool)>());
-
     virtual void end_flushBatchRequests(const AsyncResultPtr&);
+#endif
 
-    virtual ObjectPrx createAdmin(const ObjectAdapterPtr&, const Identity&);
-    virtual ObjectPrx getAdmin() const;
+    virtual ObjectPrxPtr createAdmin(const ObjectAdapterPtr&, const Identity&);
+    virtual ObjectPrxPtr getAdmin() const;
     virtual void addAdminFacet(const ObjectPtr&, const std::string&);
     virtual ObjectPtr removeAdminFacet(const std::string&);
     virtual ObjectPtr findAdminFacet(const std::string&);
     virtual FacetMap findAllAdminFacets();
 
+    virtual ~CommunicatorI();
+
 private:
 
-    CommunicatorI(const InitializationData&);
-    virtual ~CommunicatorI();
+#ifndef ICE_CPP11_MAPPING
+    CommunicatorI() {}
+#endif
+
+    static CommunicatorIPtr create(const InitializationData&);
 
     //
     // Certain initialization tasks need to be completed after the
@@ -96,7 +109,9 @@ private:
     friend ICE_API ::IceInternal::InstancePtr IceInternal::getInstance(const ::Ice::CommunicatorPtr&);
     friend ICE_API ::IceUtil::TimerPtr IceInternal::getInstanceTimer(const ::Ice::CommunicatorPtr&);
 
+#ifndef ICE_CPP11_MAPPING
     AsyncResultPtr __begin_flushBatchRequests(const IceInternal::CallbackBasePtr&, const LocalObjectPtr&);
+#endif
 
     const ::IceInternal::InstancePtr _instance;
 
diff --git a/cpp/src/IceUtil/Cond.cpp b/cpp/src/Ice/Cond.cpp
index 1ec40216661..1ec40216661 100644
--- a/cpp/src/IceUtil/Cond.cpp
+++ b/cpp/src/Ice/Cond.cpp
diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp
index a1ed4225866..ee1ed2376a6 100644
--- a/cpp/src/Ice/ConnectRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectRequestHandler.cpp
@@ -23,9 +23,11 @@
 using namespace std;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(ConnectRequestHandler* p) { return p; }
+#endif
 
-ConnectRequestHandler::ConnectRequestHandler(const ReferencePtr& ref, const Ice::ObjectPrx& proxy) :
+ConnectRequestHandler::ConnectRequestHandler(const ReferencePtr& ref, const Ice::ObjectPrxPtr& proxy) :
     RequestHandler(ref),
     _proxy(proxy),
     _initialized(false),
@@ -33,25 +35,21 @@ ConnectRequestHandler::ConnectRequestHandler(const ReferencePtr& ref, const Ice:
 {
 }
 
-ConnectRequestHandler::~ConnectRequestHandler()
-{
-}
-
 RequestHandlerPtr
-ConnectRequestHandler::connect(const Ice::ObjectPrx& proxy)
+ConnectRequestHandler::connect(const Ice::ObjectPrxPtr& proxy)
 {
     Lock sync(*this);
     if(!initialized())
     {
         _proxies.insert(proxy);
     }
-    return _requestHandler ? _requestHandler : this;
+    return _requestHandler ? _requestHandler : shared_from_this();
 }
 
 RequestHandlerPtr
 ConnectRequestHandler::update(const RequestHandlerPtr& previousHandler, const RequestHandlerPtr& newHandler)
 {
-    return previousHandler.get() == this ? newHandler : this;
+    return previousHandler.get() == this ? newHandler : shared_from_this();
 }
 
 bool
@@ -77,7 +75,7 @@ ConnectRequestHandler::sendAsyncRequest(const ProxyOutgoingAsyncBasePtr& out)
         Lock sync(*this);
         if(!_initialized)
         {
-            out->cancelable(this); // This will throw if the request is canceled
+            out->cancelable(shared_from_this()); // This will throw if the request is canceled
         }
 
         if(!initialized())
@@ -96,7 +94,7 @@ ConnectRequestHandler::requestCanceled(OutgoingBase* out, const Ice::LocalExcept
 {
     {
         Lock sync(*this);
-        if(_exception.get())
+        if(ICE_EXCEPTION_ISSET(_exception))
         {
             return; // The request has been notified of a failure already.
         }
@@ -123,7 +121,7 @@ ConnectRequestHandler::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync
 {
     {
         Lock sync(*this);
-        if(_exception.get())
+        if(ICE_EXCEPTION_ISSET(_exception))
         {
             return; // The request has been notified of a failure already.
         }
@@ -135,9 +133,9 @@ ConnectRequestHandler::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync
                 if(p->outAsync.get() == outAsync.get())
                 {
                     _requests.erase(p);
-                    if(outAsync->completed(ex))
+                    if(outAsync->exception(ex))
                     {
-                        outAsync->invokeCompletedAsync();
+                        outAsync->invokeExceptionAsync();
                     }
                     return;
                 }
@@ -151,9 +149,9 @@ Ice::ConnectionIPtr
 ConnectRequestHandler::getConnection()
 {
     Lock sync(*this);
-    if(_exception.get())
+    if(ICE_EXCEPTION_ISSET(_exception))
     {
-        _exception->ice_throw();
+        ICE_RETHROW_EXCEPTION(_exception);
         return 0; // Keep the compiler happy.
     }
     else
@@ -166,22 +164,25 @@ Ice::ConnectionIPtr
 ConnectRequestHandler::waitForConnection()
 {
     Lock sync(*this);
-    if(_exception.get())
+    if(ICE_EXCEPTION_ISSET(_exception))
     {
+#ifdef ICE_CPP11_MAPPING
+        throw RetryException(_exception);
+#else
         throw RetryException(*_exception.get());
+#endif
     }
-
     //
     // Wait for the connection establishment to complete or fail.
     //
-    while(!_initialized && !_exception.get())
+    while(!_initialized && !ICE_EXCEPTION_ISSET(_exception))
     {
         wait();
     }
 
-    if(_exception.get())
+    if(ICE_EXCEPTION_ISSET(_exception))
     {
-        _exception->ice_throw();
+        ICE_RETHROW_EXCEPTION(_exception);
         return 0; // Keep the compiler happy.
     }
     else
@@ -195,7 +196,7 @@ ConnectRequestHandler::setConnection(const Ice::ConnectionIPtr& connection, bool
 {
     {
         Lock sync(*this);
-        assert(!_exception.get() && !_connection);
+        assert(!ICE_EXCEPTION_ISSET(_exception) && !_connection);
         _connection = connection;
         _compress = compress;
     }
@@ -205,7 +206,7 @@ ConnectRequestHandler::setConnection(const Ice::ConnectionIPtr& connection, bool
     // add this proxy to the router info object.
     //
     RouterInfoPtr ri = _reference->getRouterInfo();
-    if(ri && !ri->addProxy(_proxy, this))
+    if(ri && !ri->addProxy(_proxy, AddProxyCallback::shared_from_this()))
     {
         return; // The request handler will be initialized once addProxy returns.
     }
@@ -220,8 +221,9 @@ void
 ConnectRequestHandler::setException(const Ice::LocalException& ex)
 {
     Lock sync(*this);
-    assert(!_initialized && !_exception.get());
-    _exception.reset(ex.ice_clone());
+    assert(!_initialized && !ICE_EXCEPTION_ISSET(_exception));
+    ICE_RESET_EXCEPTION(_exception, ex.ice_clone());
+
     _proxies.clear();
     _proxy = 0; // Break cyclic reference count.
 
@@ -233,24 +235,31 @@ ConnectRequestHandler::setException(const Ice::LocalException& ex)
     //
     try
     {
-        _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this);
+        _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, shared_from_this());
     }
     catch(const Ice::CommunicatorDestroyedException&)
     {
         // Ignore
     }
 
-    for(deque<Request>::const_iterator p = _requests.begin(); p != _requests.end(); ++p)
+    try
     {
-        if(p->out)
-        {
-            p->out->completed(*_exception.get());
-        }
-        else
+        ICE_RETHROW_EXCEPTION(_exception);
+    }
+    catch(const Ice::LocalException& ex)
+    {
+        for(deque<Request>::const_iterator p = _requests.begin(); p != _requests.end(); ++p)
         {
-            if(p->outAsync->completed(*_exception.get()))
+            if(p->out)
+            {
+                p->out->completed(ex);
+            }
+            else
             {
-                p->outAsync->invokeCompletedAsync();
+                if(p->outAsync->exception(ex))
+                {
+                    p->outAsync->invokeExceptionAsync();
+                }
             }
         }
     }
@@ -280,12 +289,12 @@ ConnectRequestHandler::initialized()
     }
     else
     {
-        while(_flushing && !_exception.get())
+        while(_flushing && !ICE_EXCEPTION_ISSET(_exception))
         {
             wait();
         }
 
-        if(_exception.get())
+        if(ICE_EXCEPTION_ISSET(_exception))
         {
             if(_connection)
             {
@@ -297,7 +306,7 @@ ConnectRequestHandler::initialized()
                 //
                 return true;
             }
-            _exception->ice_throw();
+            ICE_RETHROW_EXCEPTION(_exception);
             return false; // Keep the compiler happy.
         }
         else
@@ -322,7 +331,11 @@ ConnectRequestHandler::flushRequests()
         _flushing = true;
     }
 
+#ifdef ICE_CPP11_MAPPING
+    std::exception_ptr exception;
+#else
     IceUtil::UniquePtr<Ice::LocalException> exception;
+#endif
     while(!_requests.empty()) // _requests is immutable when _flushing = true
     {
         Request& req = _requests.front();
@@ -339,30 +352,40 @@ ConnectRequestHandler::flushRequests()
         }
         catch(const RetryException& ex)
         {
+#ifdef ICE_CPP11_MAPPING
+            exception = ex.get();
+#else
             exception.reset(ex.get()->ice_clone());
-
-            // Remove the request handler before retrying.
-            _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this);
-
-            if(req.out)
+#endif
+            try
             {
-                req.out->retryException(*ex.get());
+                ICE_RETHROW_EXCEPTION(exception);
             }
-            else
+            catch(const Ice::LocalException& ee)
             {
-                req.outAsync->retryException(*ex.get());
+                // Remove the request handler before retrying.
+                _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, shared_from_this());
+
+                if(req.out)
+                {
+                    req.out->retryException(ee);
+                }
+                else
+                {
+                    req.outAsync->retryException(ee);
+                }
             }
         }
         catch(const Ice::LocalException& ex)
         {
-            exception.reset(ex.ice_clone());
+            ICE_RESET_EXCEPTION(exception, ex.ice_clone());
             if(req.out)
             {
                 req.out->completed(ex);
             }
-            else if(req.outAsync->completed(ex))
+            else if(req.outAsync->exception(ex))
             {
-                req.outAsync->invokeCompletedAsync();
+                req.outAsync->invokeExceptionAsync();
             }
         }
         _requests.pop_front();
@@ -374,30 +397,35 @@ ConnectRequestHandler::flushRequests()
     // request handler to use the more efficient connection request
     // handler.
     //
-    if(_reference->getCacheConnection() && !exception.get())
+    if(_reference->getCacheConnection() && !ICE_EXCEPTION_ISSET(exception))
     {
-        _requestHandler = new ConnectionRequestHandler(_reference, _connection, _compress);
-        for(set<Ice::ObjectPrx>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p)
+        _requestHandler = ICE_MAKE_SHARED(ConnectionRequestHandler, _reference, _connection, _compress);
+        for(set<Ice::ObjectPrxPtr>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p)
         {
-            (*p)->__updateRequestHandler(this, _requestHandler);
+            (*p)->__updateRequestHandler(shared_from_this(), _requestHandler);
         }
     }
 
     {
         Lock sync(*this);
         assert(!_initialized);
+#ifdef ICE_CPP11_MAPPING
+        swap(_exception, exception);
+#else
         _exception.swap(exception);
-        _initialized = !_exception.get();
+#endif
+        _initialized = !ICE_EXCEPTION_ISSET(_exception);
         _flushing = false;
 
         //
         // Only remove once all the requests are flushed to
         // guarantee serialization.
         //
-        _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this);
+        _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, shared_from_this());
 
         _proxies.clear();
-        _proxy = 0; // Break cyclic reference count.
+        _proxy = ICE_NULLPTR; // Break cyclic reference count.
         notifyAll();
     }
 }
+
diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h
index 6ab94247a86..771d682ac7a 100644
--- a/cpp/src/Ice/ConnectRequestHandler.h
+++ b/cpp/src/Ice/ConnectRequestHandler.h
@@ -19,7 +19,6 @@
 #include <Ice/Reference.h>
 #include <Ice/RouterInfo.h>
 #include <Ice/ProxyF.h>
-#include <Ice/BasicStream.h>
 
 #include <deque>
 #include <set>
@@ -30,14 +29,14 @@ namespace IceInternal
 class ConnectRequestHandler : public RequestHandler,
                               public Reference::GetConnectionCallback,
                               public RouterInfo::AddProxyCallback,
-                              public IceUtil::Monitor<IceUtil::Mutex>
+                              public IceUtil::Monitor<IceUtil::Mutex>,
+                              public Ice::EnableSharedFromThis<ConnectRequestHandler>
 {
 public:
 
-    ConnectRequestHandler(const ReferencePtr&, const Ice::ObjectPrx&);
-    virtual ~ConnectRequestHandler();
+    ConnectRequestHandler(const ReferencePtr&, const Ice::ObjectPrxPtr&);
 
-    RequestHandlerPtr connect(const Ice::ObjectPrx&);
+    RequestHandlerPtr connect(const Ice::ObjectPrxPtr&);
     virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&);
 
     virtual bool sendRequest(ProxyOutgoingBase*);
@@ -54,6 +53,8 @@ public:
 
     virtual void addedProxy();
 
+    using Ice::EnableSharedFromThis<ConnectRequestHandler>::shared_from_this;
+
 private:
 
     bool initialized();
@@ -69,12 +70,16 @@ private:
         ProxyOutgoingAsyncBasePtr outAsync;
     };
 
-    Ice::ObjectPrx _proxy;
-    std::set<Ice::ObjectPrx> _proxies;
+    Ice::ObjectPrxPtr _proxy;
+    std::set<Ice::ObjectPrxPtr> _proxies;
 
     Ice::ConnectionIPtr _connection;
     bool _compress;
+#ifdef ICE_CPP11_MAPPING
+    std::exception_ptr _exception;
+#else
     IceUtil::UniquePtr<Ice::LocalException> _exception;
+#endif
     bool _initialized;
     bool _flushing;
 
diff --git a/cpp/src/Ice/ConnectRequestHandlerF.h b/cpp/src/Ice/ConnectRequestHandlerF.h
index 7c14f23a07c..3ed40897176 100644
--- a/cpp/src/Ice/ConnectRequestHandlerF.h
+++ b/cpp/src/Ice/ConnectRequestHandlerF.h
@@ -17,8 +17,12 @@ namespace IceInternal
 {
 
 class ConnectRequestHandler;
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<ConnectRequestHandler> ConnectRequestHandlerPtr;
+#else
 ICE_API IceUtil::Shared* upCast(ConnectRequestHandler*);
 typedef IceInternal::Handle<ConnectRequestHandler> ConnectRequestHandlerPtr;
+#endif
 
 }
 
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index f9f329b3c41..dbfc20e9a94 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -32,8 +32,8 @@
 namespace IceInternal
 {
 
-bool registerForBackgroundNotification(IceInternal::IncomingConnectionFactory*);
-void unregisterForBackgroundNotification(IceInternal::IncomingConnectionFactory*);
+bool registerForBackgroundNotification(const IceInternal::IncomingConnectionFactoryPtr&);
+void unregisterForBackgroundNotification(const IceInternal::IncomingConnectionFactoryPtr&);
 
 }
 #endif
@@ -44,7 +44,10 @@ using namespace Ice::Instrumentation;
 using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(OutgoingConnectionFactory* p) { return p; }
+
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(IncomingConnectionFactory* p) { return p; }
+#endif
 
 namespace
 {
@@ -57,6 +60,38 @@ struct RandomNumberGenerator : public std::unary_function<ptrdiff_t, ptrdiff_t>
     }
 };
 
+#ifdef ICE_CPP11_MAPPING
+template <typename Map> void
+remove(Map& m, const typename Map::key_type& k, const typename Map::mapped_type& v)
+{
+    auto pr = m.equal_range(k);
+    assert(pr.first != pr.second);
+    for(auto q = pr.first; q != pr.second; ++q)
+    {
+        if(q->second.get() == v.get())
+        {
+            m.erase(q);
+            return;
+        }
+    }
+    assert(false); // Nothing was removed which is an error.
+}
+
+template<typename Map, typename Predicate> typename Map::mapped_type
+find(const Map& m, const typename Map::key_type& k, Predicate predicate)
+{
+    auto pr = m.equal_range(k);
+    for(auto q = pr.first; q != pr.second; ++q)
+    {
+        if(predicate(q->second))
+        {
+            return q->second;
+        }
+    }
+    return nullptr;
+}
+
+#else
 template <typename K, typename V> void
 remove(multimap<K, V>& m, K k, V v)
 {
@@ -89,6 +124,7 @@ find(const multimap<K,::IceInternal::Handle<V> >& m,
     }
     return IceInternal::Handle<V>();
 }
+#endif
 
 }
 
@@ -198,7 +234,11 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointIPtr>& endpt
         return;
     }
 
+#ifdef ICE_CPP11_MAPPING
+    auto cb = make_shared<ConnectCallback>(_instance, this, endpoints, hasMore, callback, selType);
+#else
     ConnectCallbackPtr cb = new ConnectCallback(_instance, this, endpoints, hasMore, callback, selType);
+#endif
     cb->getConnectors();
 }
 
@@ -545,8 +585,8 @@ IceInternal::OutgoingConnectionFactory::createConnection(const TransceiverPtr& t
             throw Ice::CommunicatorDestroyedException(__FILE__, __LINE__);
         }
 
-        connection = new ConnectionI(_communicator, _instance, _monitor, transceiver, ci.connector,
-                                     ci.endpoint->compress(false), 0);
+        connection = ConnectionI::create(_communicator, _instance, _monitor, transceiver, ci.connector,
+                                         ci.endpoint->compress(false), ICE_NULLPTR);
     }
     catch(const Ice::LocalException&)
     {
@@ -827,7 +867,7 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::connectionStartComplete
     }
 
     connection->activate();
-    _factory->finishGetConnection(_connectors, *_iter, connection, this);
+    _factory->finishGetConnection(_connectors, *_iter, connection, shared_from_this());
 }
 
 void
@@ -920,7 +960,8 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::nextEndpoint()
     try
     {
         assert(_endpointsIter != _endpoints.end());
-        (*_endpointsIter)->connectors_async(_selType, this);
+        (*_endpointsIter)->connectors_async(_selType, ICE_SHARED_FROM_THIS);
+
     }
     catch(const Ice::LocalException& ex)
     {
@@ -938,7 +979,7 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::getConnection()
         // connection.
         //
         bool compress;
-        Ice::ConnectionIPtr connection = _factory->getConnection(_connectors, this, compress);
+        Ice::ConnectionIPtr connection = _factory->getConnection(_connectors, shared_from_this(), compress);
         if(!connection)
         {
             //
@@ -986,7 +1027,7 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::nextConnector()
                     << _iter->connector->toString();
             }
             Ice::ConnectionIPtr connection = _factory->createConnection(_iter->connector->connect(), *_iter);
-            connection->start(this);
+            connection->start(ICE_SHARED_FROM_THIS);
         }
         catch(const Ice::LocalException& ex)
         {
@@ -1052,7 +1093,7 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::removeConnectors(const
 void
 IceInternal::OutgoingConnectionFactory::ConnectCallback::removeFromPending()
 {
-    _factory->removeFromPending(this, _connectors);
+    _factory->removeFromPending(shared_from_this(), _connectors);
 }
 
 bool
@@ -1066,14 +1107,14 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::connectionStartFailedIm
 {
     if(_observer)
     {
-        _observer->failed(ex.ice_name());
+        _observer->failed(ex.ice_id());
         _observer->detach();
     }
 
     _factory->handleConnectionException(ex, _hasMore || _iter != _connectors.end() - 1);
     if(dynamic_cast<const Ice::CommunicatorDestroyedException*>(&ex)) // No need to continue.
     {
-        _factory->finishGetConnection(_connectors, ex, this);
+        _factory->finishGetConnection(_connectors, ex, ICE_SHARED_FROM_THIS);
     }
     else if(++_iter != _connectors.end()) // Try the next connector.
     {
@@ -1081,7 +1122,7 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::connectionStartFailedIm
     }
     else
     {
-        _factory->finishGetConnection(_connectors, ex, this);
+        _factory->finishGetConnection(_connectors, ex, ICE_SHARED_FROM_THIS);
     }
     return false;
 }
@@ -1360,8 +1401,8 @@ IceInternal::IncomingConnectionFactory::message(ThreadPoolCurrent& current)
 
         try
         {
-            connection = new ConnectionI(_adapter->getCommunicator(), _instance, _monitor, transceiver, 0, _endpoint,
-                                         _adapter);
+            connection = ConnectionI::create(_adapter->getCommunicator(), _instance, _monitor, transceiver, 0,
+                                             _endpoint, _adapter);
         }
         catch(const LocalException& ex)
         {
@@ -1386,7 +1427,7 @@ IceInternal::IncomingConnectionFactory::message(ThreadPoolCurrent& current)
     }
 
     assert(connection);
-    connection->start(this);
+    connection->start(shared_from_this());
 }
 
 void
@@ -1420,7 +1461,7 @@ IceInternal::IncomingConnectionFactory::finished(ThreadPoolCurrent&, bool close)
 
 #if TARGET_OS_IPHONE != 0
     sync.release();
-    unregisterForBackgroundNotification(this);
+    unregisterForBackgroundNotification(shared_from_this());
 #endif
 }
 
@@ -1428,7 +1469,6 @@ string
 IceInternal::IncomingConnectionFactory::toString() const
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-
     if(_transceiver)
     {
         return _transceiver->toString();
@@ -1541,7 +1581,7 @@ IceInternal::IncomingConnectionFactory::stopAcceptor()
         return;
     }
 
-    if(_adapter->getThreadPool()->finish(this, true))
+    if(_adapter->getThreadPool()->finish(shared_from_this(), true))
     {
         _acceptorStarted = false;
         closeAcceptor();
@@ -1561,7 +1601,6 @@ IceInternal::IncomingConnectionFactory::initialize()
     {
         _endpoint = _endpoint->compress(_instance->defaultsAndOverrides()->overrideCompressValue);
     }
-
     try
     {
         const_cast<TransceiverPtr&>(_transceiver) = _endpoint->transceiver();
@@ -1573,9 +1612,8 @@ IceInternal::IncomingConnectionFactory::initialize()
                 out << "attempting to bind to " << _endpoint->protocol() << " socket\n" << _transceiver->toString();
             }
             const_cast<EndpointIPtr&>(_endpoint) = _transceiver->bind();
-
-            ConnectionIPtr connection = new ConnectionI(_adapter->getCommunicator(), _instance, 0, _transceiver, 0,
-                                                        _endpoint, _adapter);
+            ConnectionIPtr connection(ConnectionI::create(_adapter->getCommunicator(), _instance, 0, _transceiver, 0,
+                                                          _endpoint, _adapter));
             connection->start(0);
             _connections.insert(connection);
         }
@@ -1587,7 +1625,7 @@ IceInternal::IncomingConnectionFactory::initialize()
             // start the acceptor if necessary.
             //
             _acceptorStarted = false;
-            registerForBackgroundNotification(this);
+            registerForBackgroundNotification(shared_from_this());
 #else
             createAcceptor();
 #endif
@@ -1643,7 +1681,7 @@ IceInternal::IncomingConnectionFactory::setState(State state)
                     Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
                     out << "accepting " << _endpoint->protocol() << " connections at " << _acceptor->toString();
                 }
-                _adapter->getThreadPool()->_register(this, SocketOperationRead);
+                _adapter->getThreadPool()->_register(shared_from_this(), SocketOperationRead);
             }
             for_each(_connections.begin(), _connections.end(), Ice::voidMemFun(&ConnectionI::activate));
             break;
@@ -1662,7 +1700,7 @@ IceInternal::IncomingConnectionFactory::setState(State state)
                     Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
                     out << "holding " << _endpoint->protocol() << " connections at " << _acceptor->toString();
                 }
-                _adapter->getThreadPool()->unregister(this, SocketOperationRead);
+                _adapter->getThreadPool()->unregister(shared_from_this(), SocketOperationRead);
             }
             for_each(_connections.begin(), _connections.end(), Ice::voidMemFun(&ConnectionI::hold));
             break;
@@ -1679,7 +1717,7 @@ IceInternal::IncomingConnectionFactory::setState(State state)
                 // the finish() call. Not all selector implementations do support this
                 // however.
                 //
-                if(_adapter->getThreadPool()->finish(this, true))
+                if(_adapter->getThreadPool()->finish(shared_from_this(), true))
                 {
                     closeAcceptor();
                 }
@@ -1712,7 +1750,6 @@ IceInternal::IncomingConnectionFactory::createAcceptor()
     {
         _acceptor = _endpoint->acceptor(_adapter->getName());
         assert(_acceptor);
-
         if(_instance->traceLevels()->network >= 2)
         {
             Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
@@ -1720,18 +1757,16 @@ IceInternal::IncomingConnectionFactory::createAcceptor()
         }
 
         _endpoint = _acceptor->listen();
-
         if(_instance->traceLevels()->network >= 1)
         {
             Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
             out << "listening for " << _endpoint->protocol() << " connections\n" << _acceptor->toDetailedString();
         }
 
-        _adapter->getThreadPool()->initialize(this);
-
+        _adapter->getThreadPool()->initialize(shared_from_this());
         if(_state == StateActive)
         {
-            _adapter->getThreadPool()->_register(this, SocketOperationRead);
+            _adapter->getThreadPool()->_register(shared_from_this(), SocketOperationRead);
         }
     }
     catch(const Ice::Exception&)
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index 616d3d9fe4c..578c728559b 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -27,6 +27,7 @@
 #include <Ice/EndpointI.h>
 #include <Ice/InstrumentationF.h>
 #include <Ice/ACMF.h>
+#include <Ice/Comparable.h>
 
 #include <list>
 #include <set>
@@ -36,18 +37,18 @@ namespace Ice
 
 class LocalException;
 class ObjectAdapterI;
-typedef IceUtil::Handle<ObjectAdapterI> ObjectAdapterIPtr;
+ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI);
 
 }
 
 namespace IceInternal
 {
 
-class OutgoingConnectionFactory : virtual public IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
+class OutgoingConnectionFactory : public virtual IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
-    class CreateConnectionCallback : virtual public IceUtil::Shared
+    class CreateConnectionCallback : public virtual IceUtil::Shared
     {
     public:
 
@@ -68,11 +69,11 @@ public:
     void removeAdapter(const Ice::ObjectAdapterPtr&);
     void flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr&);
 
-private:
-
     OutgoingConnectionFactory(const Ice::CommunicatorPtr&, const InstancePtr&);
     virtual ~OutgoingConnectionFactory();
     friend class Instance;
+    
+private:
 
     struct ConnectorInfo
     {
@@ -86,7 +87,9 @@ private:
         EndpointIPtr endpoint;
     };
 
-    class ConnectCallback : public Ice::ConnectionI::StartCallback, public IceInternal::EndpointI_connectors
+    class ConnectCallback : public Ice::ConnectionI::StartCallback,
+                            public IceInternal::EndpointI_connectors,
+                            public Ice::EnableSharedFromThis<IceInternal::OutgoingConnectionFactory::ConnectCallback>
     {
     public:
 
@@ -129,7 +132,7 @@ private:
         std::vector<ConnectorInfo> _connectors;
         std::vector<ConnectorInfo>::const_iterator _iter;
     };
-    typedef IceUtil::Handle<ConnectCallback> ConnectCallbackPtr;
+    ICE_DEFINE_PTR(ConnectCallbackPtr, ConnectCallback);
     friend class ConnectCallback;
 
     std::vector<EndpointIPtr> applyOverrides(const std::vector<EndpointIPtr>&);
@@ -158,13 +161,18 @@ private:
     std::multimap<ConnectorPtr, Ice::ConnectionIPtr> _connections;
     std::map<ConnectorPtr, std::set<ConnectCallbackPtr> > _pending;
 
+#ifdef ICE_CPP11_MAPPING
+    std::multimap<EndpointIPtr, Ice::ConnectionIPtr, Ice::TargetLess<EndpointIPtr>> _connectionsByEndpoint;
+#else
     std::multimap<EndpointIPtr, Ice::ConnectionIPtr> _connectionsByEndpoint;
+#endif
     int _pendingConnectCount;
 };
 
 class IncomingConnectionFactory : public EventHandler,
                                   public Ice::ConnectionI::StartCallback,
-                                  public IceUtil::Monitor<IceUtil::Mutex>
+                                  public IceUtil::Monitor<IceUtil::Mutex>,
+                                  public Ice::EnableSharedFromThis<IncomingConnectionFactory>
 {
 public:
 
@@ -203,11 +211,12 @@ public:
     virtual void connectionStartCompleted(const Ice::ConnectionIPtr&);
     virtual void connectionStartFailed(const Ice::ConnectionIPtr&, const Ice::LocalException&);
 
-private:
-
     IncomingConnectionFactory(const InstancePtr&, const EndpointIPtr&, const Ice::ObjectAdapterIPtr&);
     void initialize();
     virtual ~IncomingConnectionFactory();
+    
+private:
+
     friend class Ice::ObjectAdapterI;
 
     enum State
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 50b3dffe9b3..d75a0dd2222 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -38,14 +38,15 @@ using namespace Ice;
 using namespace Ice::Instrumentation;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 Ice::LocalObject* Ice::upCast(ConnectionI* p) { return p; }
+#endif
 
 namespace
 {
 
 const ::std::string __flushBatchRequests_name = "flushBatchRequests";
 
-
 class TimeoutCallback : public IceUtil::TimerTask
 {
 public:
@@ -72,8 +73,8 @@ public:
     DispatchCall(const ConnectionIPtr& connection, const ConnectionI::StartCallbackPtr& startCB,
                  const vector<ConnectionI::OutgoingMessage>& sentCBs, Byte compress, Int requestId,
                  Int invokeNum, const ServantManagerPtr& servantManager, const ObjectAdapterPtr& adapter,
-                 const OutgoingAsyncBasePtr& outAsync, const ConnectionCallbackPtr& heartbeatCallback,
-                 BasicStream& stream) :
+                 const OutgoingAsyncBasePtr& outAsync, const ICE_HEARTBEAT_CALLBACK& heartbeatCallback,
+                 InputStream& stream) :
         DispatchWorkItem(connection),
         _connection(connection),
         _startCB(startCB),
@@ -108,8 +109,8 @@ private:
     const ServantManagerPtr _servantManager;
     const ObjectAdapterPtr _adapter;
     const OutgoingAsyncBasePtr _outAsync;
-    const ConnectionCallbackPtr _heartbeatCallback;
-    BasicStream _stream;
+    const ICE_HEARTBEAT_CALLBACK _heartbeatCallback;
+    InputStream _stream;
 };
 
 class FinishCall : public DispatchWorkItem
@@ -211,7 +212,7 @@ Ice::ConnectionI::Observer::attach(const Ice::Instrumentation::ConnectionObserve
 
 
 void
-Ice::ConnectionI::OutgoingMessage::adopt(BasicStream* str)
+Ice::ConnectionI::OutgoingMessage::adopt(OutputStream* str)
 {
     if(adopted)
     {
@@ -240,7 +241,7 @@ Ice::ConnectionI::OutgoingMessage::adopt(BasicStream* str)
     }
 
     assert(str);
-    stream = new BasicStream(str->instance(), currentProtocolEncoding);
+    stream = new OutputStream(str->instance(), currentProtocolEncoding);
     stream->swap(*str);
     adopted = true;
 }
@@ -295,9 +296,9 @@ Ice::ConnectionI::OutgoingMessage::completed(const Ice::LocalException& ex)
     }
     else if(outAsync)
     {
-        if(outAsync->completed(ex))
+        if(outAsync->exception(ex))
         {
-            outAsync->invokeCompleted();
+            outAsync->invokeException();
         }
     }
 
@@ -316,8 +317,8 @@ Ice::ConnectionI::start(const StartCallbackPtr& callback)
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
         if(_state >= StateClosed) // The connection might already be closed if the communicator was destroyed.
         {
-            assert(_exception.get());
-            _exception->ice_throw();
+            assert(ICE_EXCEPTION_ISSET(_exception));
+            ICE_RETHROW_EXCEPTION(_exception);
         }
 
         if(!initialize() || !validate())
@@ -338,8 +339,8 @@ Ice::ConnectionI::start(const StartCallbackPtr& callback)
 
             if(_state >= StateClosing)
             {
-                assert(_exception.get());
-                _exception->ice_throw();
+                assert(ICE_EXCEPTION_ISSET(_exception));
+                ICE_RETHROW_EXCEPTION(_exception);
             }
         }
 
@@ -353,7 +354,7 @@ Ice::ConnectionI::start(const StartCallbackPtr& callback)
         exception(ex);
         if(callback)
         {
-            callback->connectionStartFailed(this, *_exception.get());
+            callback->connectionStartFailed(shared_from_this(), ex);
             return;
         }
         else
@@ -365,7 +366,7 @@ Ice::ConnectionI::start(const StartCallbackPtr& callback)
 
     if(callback)
     {
-        callback->connectionStartCompleted(this);
+        callback->connectionStartCompleted(shared_from_this());
     }
 }
 
@@ -486,10 +487,10 @@ Ice::ConnectionI::throwException() const
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
 
-    if(_exception.get())
+    if(ICE_EXCEPTION_ISSET(_exception))
     {
         assert(_state >= StateClosing);
-        _exception->ice_throw();
+        ICE_RETHROW_EXCEPTION(_exception);
     }
 }
 
@@ -538,10 +539,12 @@ Ice::ConnectionI::updateObserver()
     }
 
     assert(_instance->initializationData().observer);
-    _observer.attach(_instance->initializationData().observer->getConnectionObserver(initConnectionInfo(),
-                                                                                     _endpoint,
-                                                                                     toConnectionState(_state),
-                                                                                     _observer.get()));
+
+    ConnectionObserverPtr o = _instance->initializationData().observer->getConnectionObserver(initConnectionInfo(),
+                                                                                              _endpoint,
+                                                                                              toConnectionState(_state),
+                                                                                              _observer.get());
+    _observer.attach(o);
 }
 
 void
@@ -611,17 +614,21 @@ Ice::ConnectionI::monitor(const IceUtil::Time& now, const ACMConfig& acm)
 bool
 Ice::ConnectionI::sendRequest(OutgoingBase* out, bool compress, bool response, int batchRequestNum)
 {
-    BasicStream* os = out->os();
+    OutputStream* os = out->os();
 
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-    if(_exception.get())
+    //
+    // If the connection is closed before we even have a chance
+    // to send our request, we always try to send the request
+    // again.
+    //
+    if(ICE_EXCEPTION_ISSET(_exception))
     {
-        //
-        // If the connection is closed before we even have a chance
-        // to send our request, we always try to send the request
-        // again.
-        //
+#ifdef ICE_CPP11_MAPPING
+        throw RetryException(_exception);
+#else
         throw RetryException(*_exception.get());
+#endif
     }
 
     assert(_state > StateNotValidated);
@@ -681,8 +688,8 @@ Ice::ConnectionI::sendRequest(OutgoingBase* out, bool compress, bool response, i
     catch(const LocalException& ex)
     {
         setState(StateClosed, ex);
-        assert(_exception.get());
-        _exception->ice_throw();
+        assert(ICE_EXCEPTION_ISSET(_exception));
+        ICE_RETHROW_EXCEPTION(_exception);
     }
 
     if(response)
@@ -699,19 +706,22 @@ Ice::ConnectionI::sendRequest(OutgoingBase* out, bool compress, bool response, i
 AsyncStatus
 Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncBasePtr& out, bool compress, bool response, int batchRequestNum)
 {
-    BasicStream* os = out->getOs();
+    OutputStream* os = out->getOs();
 
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-    if(_exception.get())
+    //
+    // If the exception is closed before we even have a chance
+    // to send our request, we always try to send the request
+    // again.
+    //
+    if(ICE_EXCEPTION_ISSET(_exception))
     {
-        //
-        // If the exception is closed before we even have a chance
-        // to send our request, we always try to send the request
-        // again.
-        //
+#ifdef ICE_CPP11_MAPPING
+        throw RetryException(_exception);
+#else
         throw RetryException(*_exception.get());
+#endif
     }
-
     assert(_state > StateNotValidated);
     assert(_state < StateClosing);
 
@@ -725,8 +735,7 @@ Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncBasePtr& out, bool compres
     // Notify the request that it's cancelable with this connection.
     // This will throw if the request is canceled.
     //
-    out->cancelable(this);
-
+    out->cancelable(shared_from_this());
     Int requestId = 0;
     if(response)
     {
@@ -771,8 +780,8 @@ Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncBasePtr& out, bool compres
     catch(const LocalException& ex)
     {
         setState(StateClosed, ex);
-        assert(_exception.get());
-        _exception->ice_throw();
+        assert(ICE_EXCEPTION_ISSET(_exception));
+        ICE_RETHROW_EXCEPTION(_exception);
     }
 
     if(response)
@@ -792,6 +801,34 @@ Ice::ConnectionI::getBatchRequestQueue() const
     return _batchRequestQueue;
 }
 
+#ifdef ICE_CPP11_MAPPING
+void
+Ice::ConnectionI::flushBatchRequests()
+{
+    Connection::flushBatchRequestsAsync().get();
+}
+
+std::function<void()>
+Ice::ConnectionI::flushBatchRequestsAsync(::std::function<void(::std::exception_ptr)> ex,
+                                           ::std::function<void(bool)> sent)
+{
+    class ConnectionFlushBatchLambda : public ConnectionFlushBatchAsync, public LambdaInvoke
+    {
+    public:
+
+        ConnectionFlushBatchLambda(std::shared_ptr<Ice::ConnectionI>&& connection,
+                                   const InstancePtr& instance,
+                                   std::function<void(std::exception_ptr)> ex,
+                                   std::function<void(bool)> sent) :
+            ConnectionFlushBatchAsync(connection, instance), LambdaInvoke(std::move(ex), std::move(sent))
+        {
+        }
+    };
+    auto outAsync = make_shared<ConnectionFlushBatchLambda>(shared_from_this(), _instance, ex, sent);
+    outAsync->invoke(__flushBatchRequests_name);
+    return [outAsync]() { outAsync->cancel(); };
+}
+#else
 void
 Ice::ConnectionI::flushBatchRequests()
 {
@@ -819,55 +856,49 @@ Ice::ConnectionI::begin_flushBatchRequests(const Callback_Connection_flushBatchR
 }
 
 AsyncResultPtr
-Ice::ConnectionI::begin_flushBatchRequests(const IceInternal::Function<void (const Exception&)>& exception,
-                                           const IceInternal::Function<void (bool)>& sent)
+Ice::ConnectionI::__begin_flushBatchRequests(const CallbackBasePtr& cb, const LocalObjectPtr& cookie)
 {
-#ifdef ICE_CPP11
-    class Cpp11CB : public IceInternal::Cpp11FnCallbackNC
+    class ConnectionFlushBatchAsyncWithCallback : public ConnectionFlushBatchAsync, public CallbackCompletion
     {
     public:
 
-        Cpp11CB(const IceInternal::Function<void (const Exception&)>& excb,
-                const IceInternal::Function<void (bool)>& sentcb) :
-            IceInternal::Cpp11FnCallbackNC(excb, sentcb)
+        ConnectionFlushBatchAsyncWithCallback(const Ice::ConnectionIPtr& connection,
+                                              const Ice::CommunicatorPtr& communicator,
+                                              const InstancePtr& instance,
+                                              const CallbackBasePtr& callback,
+                                              const Ice::LocalObjectPtr& cookie) :
+            ConnectionFlushBatchAsync(connection, instance),
+            CallbackCompletion(callback, cookie),
+            _communicator(communicator),
+            _connection(connection)
         {
-            CallbackBase::checkCallback(true, excb != nullptr);
+            _cookie = cookie;
         }
 
-        virtual void
-        completed(const AsyncResultPtr& __result) const
+        virtual Ice::CommunicatorPtr getCommunicator() const
         {
-            ConnectionPtr __con = __result->getConnection();
-            assert(__con);
-            try
-            {
-                __con->end_flushBatchRequests(__result);
-                assert(false);
-            }
-            catch(const Exception& ex)
-            {
-                IceInternal::Cpp11FnCallbackNC::exception(__result, ex);
-            }
+            return _communicator;
         }
-    };
 
-    return __begin_flushBatchRequests(new Cpp11CB(exception, sent), 0);
-#else
-    assert(false); // Ice not built with C++11 support.
-    return 0;
-#endif
-}
+        virtual Ice::ConnectionPtr getConnection() const
+        {
+            return _connection;
+        }
 
-AsyncResultPtr
-Ice::ConnectionI::__begin_flushBatchRequests(const CallbackBasePtr& cb, const LocalObjectPtr& cookie)
-{
-    ConnectionFlushBatchAsyncPtr result = new ConnectionFlushBatchAsync(this,
-                                                                        _communicator,
-                                                                        _instance,
-                                                                        __flushBatchRequests_name,
-                                                                        cb,
-                                                                        cookie);
-    result->invoke();
+        virtual const std::string&
+        getOperation() const
+        {
+            return __flushBatchRequests_name;
+        }
+
+    private:
+
+        Ice::CommunicatorPtr _communicator;
+        Ice::ConnectionPtr _connection;
+    };
+
+    ConnectionFlushBatchAsyncPtr result = new ConnectionFlushBatchAsyncWithCallback(this, _communicator, _instance, cb, cookie);
+    result->invoke(__flushBatchRequests_name);
     return result;
 }
 
@@ -877,52 +908,70 @@ Ice::ConnectionI::end_flushBatchRequests(const AsyncResultPtr& r)
     AsyncResult::__check(r, this, __flushBatchRequests_name);
     r->__wait();
 }
+#endif
+
+void
+Ice::ConnectionI::setHeartbeatCallback(ICE_IN(ICE_HEARTBEAT_CALLBACK) callback)
+{
+    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+    _heartbeatCallback = callback;
+}
 
 void
-Ice::ConnectionI::setCallback(const ConnectionCallbackPtr& callback)
+Ice::ConnectionI::setCloseCallback(ICE_IN(ICE_CLOSE_CALLBACK) callback)
 {
+    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+    if(_state >= StateClosed)
     {
-        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-        if(_state >= StateClosed)
+        if(callback)
         {
-            if(callback)
+            class CallbackWorkItem : public DispatchWorkItem
             {
-                class CallbackWorkItem : public DispatchWorkItem
-                {
-                public:
+            public:
 
-                    CallbackWorkItem(const ConnectionIPtr& connection, const ConnectionCallbackPtr& callback) :
-                        _connection(connection),
-                        _callback(callback)
-                    {
-                    }
+                CallbackWorkItem(const ConnectionIPtr& connection, ICE_IN(ICE_CLOSE_CALLBACK) callback) :
+                    _connection(connection),
+#ifdef ICE_CPP11_MAPPING
+                    _callback(move(callback))
+#else
+                    _callback(callback)
+#endif
+                {
+                }
 
-                    virtual void run()
-                    {
-                        _connection->closeCallback(_callback);
-                    }
+                virtual void run()
+                {
+                    _connection->closeCallback(_callback);
+                }
 
-                private:
+            private:
 
-                    const ConnectionIPtr _connection;
-                    const ConnectionCallbackPtr _callback;
-                };
-                _threadPool->dispatch(new CallbackWorkItem(this, callback));
-            }
-        }
-        else
-        {
-            _callback = callback;
+                const ConnectionIPtr _connection;
+                const ICE_CLOSE_CALLBACK _callback;
+            };
+#ifdef ICE_CPP11_MAPPING
+            _threadPool->dispatch(new CallbackWorkItem(shared_from_this(), move(callback)));
+#else
+            _threadPool->dispatch(new CallbackWorkItem(shared_from_this(), callback));
+#endif
         }
     }
+    else
+    {
+        _closeCallback = callback;
+    }
 }
 
 void
-Ice::ConnectionI::closeCallback(const ConnectionCallbackPtr& callback)
+Ice::ConnectionI::closeCallback(const ICE_CLOSE_CALLBACK& callback)
 {
     try
     {
-        callback->closed(this);
+#ifdef ICE_CPP11_MAPPING
+        callback(shared_from_this());
+#else
+        callback->closed(shared_from_this());
+#endif
     }
     catch(const std::exception& ex)
     {
@@ -949,7 +998,7 @@ Ice::ConnectionI::setACM(const IceUtil::Optional<int>& timeout,
 
     if(_state == StateActive)
     {
-        _monitor->remove(this);
+        _monitor->remove(shared_from_this());
     }
     _monitor = _monitor->acm(timeout, close, heartbeat);
 
@@ -964,7 +1013,7 @@ Ice::ConnectionI::setACM(const IceUtil::Optional<int>& timeout,
 
     if(_state == StateActive)
     {
-        _monitor->add(this);
+        _monitor->add(shared_from_this());
     }
 }
 
@@ -1089,7 +1138,7 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con
             if(o->requestId)
             {
                 if(_asyncRequestsHint != _asyncRequests.end() &&
-                   _asyncRequestsHint->second == OutgoingAsyncPtr::dynamicCast(outAsync))
+                   _asyncRequestsHint->second == ICE_DYNAMIC_CAST(OutgoingAsync, outAsync))
                 {
                     _asyncRequests.erase(_asyncRequestsHint);
                     _asyncRequestsHint = _asyncRequests.end();
@@ -1119,16 +1168,16 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con
                     o->canceled(false);
                     _sendStreams.erase(o);
                 }
-                if(outAsync->completed(ex))
+                if(outAsync->exception(ex))
                 {
-                    outAsync->invokeCompletedAsync();
+                    outAsync->invokeExceptionAsync();
                 }
             }
             return;
         }
     }
 
-    if(OutgoingAsyncPtr::dynamicCast(outAsync))
+    if(ICE_DYNAMIC_CAST(OutgoingAsync, outAsync))
     {
         if(_asyncRequestsHint != _asyncRequests.end())
         {
@@ -1142,9 +1191,9 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con
                 {
                     _asyncRequests.erase(_asyncRequestsHint);
                     _asyncRequestsHint = _asyncRequests.end();
-                    if(outAsync->completed(ex))
+                    if(outAsync->exception(ex))
                     {
-                        outAsync->invokeCompletedAsync();
+                        outAsync->invokeExceptionAsync();
                     }
                 }
                 return;
@@ -1163,9 +1212,9 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con
                 {
                     assert(p != _asyncRequestsHint);
                     _asyncRequests.erase(p);
-                    if(outAsync->completed(ex))
+                    if(outAsync->exception(ex))
                     {
-                        outAsync->invokeCompletedAsync();
+                        outAsync->invokeExceptionAsync();
                     }
                 }
                 return;
@@ -1175,7 +1224,7 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con
 }
 
 void
-Ice::ConnectionI::sendResponse(Int, BasicStream* os, Byte compressFlag, bool /*amd*/)
+Ice::ConnectionI::sendResponse(Int, OutputStream* os, Byte compressFlag, bool /*amd*/)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
     assert(_state > StateNotValidated);
@@ -1193,8 +1242,8 @@ Ice::ConnectionI::sendResponse(Int, BasicStream* os, Byte compressFlag, bool /*a
 
         if(_state >= StateClosed)
         {
-            assert(_exception.get());
-            _exception->ice_throw();
+            assert(ICE_EXCEPTION_ISSET(_exception));
+            ICE_RETHROW_EXCEPTION(_exception);
         }
 
         OutgoingMessage message(os, compressFlag > 0);
@@ -1232,8 +1281,8 @@ Ice::ConnectionI::sendNoResponse()
 
         if(_state >= StateClosed)
         {
-            assert(_exception.get());
-            _exception->ice_throw();
+            assert(ICE_EXCEPTION_ISSET(_exception));
+            ICE_RETHROW_EXCEPTION(_exception);
         }
 
         if(_state == StateClosing && _dispatchCount == 0)
@@ -1335,15 +1384,15 @@ Ice::ConnectionI::getEndpoint() const
     return _endpoint; // No mutex protection necessary, _endpoint is immutable.
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ConnectionI::createProxy(const Identity& ident) const
 {
     //
     // Create a reference and return a reverse proxy for this
     // reference.
     //
-    ConnectionIPtr self = const_cast<ConnectionI*>(this);
-    return _instance->proxyFactory()->referenceToProxy(_instance->referenceFactory()->create(ident, self));
+    return _instance->proxyFactory()->referenceToProxy(
+        _instance->referenceFactory()->create(ident, shared_from_this()));
 }
 
 #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
@@ -1372,19 +1421,12 @@ Ice::ConnectionI::startAsync(SocketOperation operation)
         }
         else if(operation & SocketOperationRead)
         {
-            if(!_hasMoreData)
-            {
-                if(_observer && !_readHeader)
-                {
-                    _observer.startRead(_readStream);
-                }
-
-                _transceiver->startRead(_readStream);
-            }
-            else
+            if(_observer && !_readHeader)
             {
-                _transceiver->getNativeInfo()->completed(IceInternal::SocketOperationRead);
+                _observer.startRead(_readStream);
             }
+
+            _transceiver->startRead(_readStream);
         }
     }
     catch(const Ice::LocalException& ex)
@@ -1422,29 +1464,26 @@ Ice::ConnectionI::finishAsync(SocketOperation operation)
         }
         else if(operation & SocketOperationRead)
         {
-            if(!_hasMoreData)
+            Buffer::Container::iterator start = _readStream.i;
+            _transceiver->finishRead(_readStream);
+            if(_instance->traceLevels()->network >= 3 && _readStream.i != start)
             {
-                Buffer::Container::iterator start = _readStream.i;
-                _transceiver->finishRead(_readStream, _hasMoreData);
-                if(_instance->traceLevels()->network >= 3 && _readStream.i != start)
+                Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
+                out << "received ";
+                if(_endpoint->datagram())
                 {
-                    Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
-                    out << "received ";
-                    if(_endpoint->datagram())
-                    {
-                        out << _readStream.b.size();
-                    }
-                    else
-                    {
-                        out << (_readStream.i - start) << " of " << (_readStream.b.end() - start);
-                    }
-                    out << " bytes via " << _endpoint->protocol() << "\n" << toString();
+                    out << _readStream.b.size();
                 }
-
-                if(_observer && !_readHeader)
+                else
                 {
-                    _observer.finishRead(_readStream);
+                    out << (_readStream.i - start) << " of " << (_readStream.b.end() - start);
                 }
+                out << " bytes via " << _endpoint->protocol() << "\n" << toString();
+            }
+
+            if(_observer && !_readHeader)
+            {
+                _observer.finishRead(_readStream);
             }
         }
     }
@@ -1467,11 +1506,10 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
     ServantManagerPtr servantManager;
     ObjectAdapterPtr adapter;
     OutgoingAsyncBasePtr outAsync;
-    ConnectionCallbackPtr heartbeatCallback;
+    ICE_HEARTBEAT_CALLBACK heartbeatCallback;
     int dispatchCount = 0;
 
     ThreadPoolMessage<ConnectionI> msg(current, *this);
-
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
 
@@ -1603,7 +1641,7 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
                     // satisfied before continuing.
                     //
                     scheduleTimeout(newOp);
-                    _threadPool->update(this, current.operation, newOp);
+                    _threadPool->update(shared_from_this(), current.operation, newOp);
                     return;
                 }
 
@@ -1617,7 +1655,7 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
                     return;
                 }
 
-                _threadPool->unregister(this, current.operation);
+                _threadPool->unregister(shared_from_this(), current.operation);
 
                 //
                 // We start out in holding state.
@@ -1665,7 +1703,7 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
                 if(_state < StateClosed)
                 {
                     scheduleTimeout(newOp);
-                    _threadPool->update(this, current.operation, newOp);
+                    _threadPool->update(shared_from_this(), current.operation, newOp);
                 }
             }
 
@@ -1727,9 +1765,10 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
     }
     else
     {
-        _threadPool->dispatchFromThisThread(new DispatchCall(this, startCB, sentCBs, compress, requestId, invokeNum,
-                                                             servantManager, adapter, outAsync, heartbeatCallback,
-                                                             current.stream));
+        _threadPool->dispatchFromThisThread(new DispatchCall(shared_from_this(), startCB, sentCBs, compress, requestId,
+                                                             invokeNum, servantManager, adapter, outAsync,
+                                                             heartbeatCallback, current.stream));
+
     }
 }
 
@@ -1737,7 +1776,7 @@ void
 ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingMessage>& sentCBs,
                       Byte compress, Int requestId, Int invokeNum, const ServantManagerPtr& servantManager,
                       const ObjectAdapterPtr& adapter, const OutgoingAsyncBasePtr& outAsync,
-                      const ConnectionCallbackPtr& heartbeatCallback, BasicStream& stream)
+                      const ICE_HEARTBEAT_CALLBACK& heartbeatCallback, InputStream& stream)
 {
     int dispatchedCount = 0;
 
@@ -1747,7 +1786,7 @@ ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingMess
     //
     if(startCB)
     {
-        startCB->connectionStartCompleted(this);
+        startCB->connectionStartCompleted(shared_from_this());
         ++dispatchedCount;
     }
 
@@ -1765,10 +1804,10 @@ ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingMess
             }
             if(p->receivedReply)
             {
-                OutgoingAsyncPtr outAsync = OutgoingAsyncPtr::dynamicCast(p->outAsync);
-                if(outAsync->completed())
+                OutgoingAsyncPtr o = ICE_DYNAMIC_CAST(OutgoingAsync, p->outAsync);
+                if(o->response())
                 {
-                    outAsync->invokeCompleted();
+                    o->invokeResponse();
                 }
             }
 #else
@@ -1784,7 +1823,7 @@ ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingMess
     //
     if(outAsync)
     {
-        outAsync->invokeCompleted();
+        outAsync->invokeResponse();
         ++dispatchedCount;
     }
 
@@ -1792,7 +1831,11 @@ ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingMess
     {
         try
         {
-            heartbeatCallback->heartbeat(this);
+#ifdef ICE_CPP11_MAPPING
+            heartbeatCallback(shared_from_this());
+#else
+            heartbeatCallback->heartbeat(shared_from_this());
+#endif
         }
         catch(const std::exception& ex)
         {
@@ -1871,7 +1914,7 @@ Ice::ConnectionI::finished(ThreadPoolCurrent& current, bool close)
     // to call code that will potentially block (this avoids promoting a new leader and
     // unecessary thread creation, especially if this is called on shutdown).
     //
-    if(!_startCallback && _sendStreams.empty() && _asyncRequests.empty() && !_callback)
+    if(!_startCallback && _sendStreams.empty() && _asyncRequests.empty() && !_closeCallback && !_heartbeatCallback)
     {
         finish(close);
         return;
@@ -1884,7 +1927,7 @@ Ice::ConnectionI::finished(ThreadPoolCurrent& current, bool close)
     }
     else
     {
-        _threadPool->dispatchFromThisThread(new FinishCall(this, close));
+        _threadPool->dispatchFromThisThread(new FinishCall(shared_from_this(), close));
     }
 }
 
@@ -1897,8 +1940,15 @@ Ice::ConnectionI::finish(bool close)
         {
             string verb = _connector ? "establish" : "accept";
             Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
-            out << "failed to " << verb << " " << _endpoint->protocol() << " connection\n" << toString()
-                << "\n" << *_exception.get();
+            try
+            {
+                ICE_RETHROW_EXCEPTION(_exception);
+            }
+            catch(const Ice::Exception& ex)
+            {
+                out << "failed to " << verb << " " << _endpoint->protocol() << " connection\n" << toString()
+                << "\n" << ex;
+            }
         }
     }
     else
@@ -1911,25 +1961,47 @@ Ice::ConnectionI::finish(bool close)
             //
             // Trace the cause of unexpected connection closures
             //
-            if(!(dynamic_cast<const CloseConnectionException*>(_exception.get()) ||
-                 dynamic_cast<const ForcedCloseConnectionException*>(_exception.get()) ||
-                 dynamic_cast<const ConnectionTimeoutException*>(_exception.get()) ||
-                 dynamic_cast<const CommunicatorDestroyedException*>(_exception.get()) ||
-                 dynamic_cast<const ObjectAdapterDeactivatedException*>(_exception.get())))
+            try
+            {
+                ICE_RETHROW_EXCEPTION(_exception);
+            }
+            catch(const Ice::LocalException& ex)
             {
-                out << "\n" << *_exception.get();
+                if(!(dynamic_cast<const CloseConnectionException*>(&ex) ||
+                     dynamic_cast<const ForcedCloseConnectionException*>(&ex) ||
+                     dynamic_cast<const ConnectionTimeoutException*>(&ex) ||
+                     dynamic_cast<const CommunicatorDestroyedException*>(&ex) ||
+                     dynamic_cast<const ObjectAdapterDeactivatedException*>(&ex)))
+                {
+                    out << "\n" << ex;
+                }
             }
         }
     }
 
     if(close)
     {
-        _transceiver->close();
+        try
+        {
+            _transceiver->close();
+        }
+        catch(const Ice::LocalException& ex)
+        {
+            Error out(_logger);
+            out << "unexpected connection exception:\n" << ex << '\n' << _desc;
+        }
     }
 
     if(_startCallback)
     {
-        _startCallback->connectionStartFailed(this, *_exception.get());
+        try
+        {
+            ICE_RETHROW_EXCEPTION(_exception);
+        }
+        catch(const LocalException& ex)
+        {
+            _startCallback->connectionStartFailed(shared_from_this(), ex);
+        }
         _startCallback = 0;
     }
 
@@ -1958,10 +2030,10 @@ Ice::ConnectionI::finish(bool close)
                 }
                 if(message->receivedReply)
                 {
-                    OutgoingAsyncPtr outAsync = OutgoingAsyncPtr::dynamicCast(message->outAsync);
-                    if(outAsync->completed())
+                    OutgoingAsyncPtr outAsync = ICE_DYNAMIC_CAST(OutgoingAsync, message->outAsync);
+                    if(outAsync->response())
                     {
-                        outAsync->invokeCompleted();
+                        outAsync->invokeResponse();
                     }
                 }
                 _sendStreams.pop_front();
@@ -1969,37 +2041,53 @@ Ice::ConnectionI::finish(bool close)
 #endif
         }
 
-        for(deque<OutgoingMessage>::iterator o = _sendStreams.begin(); o != _sendStreams.end(); ++o)
+        try
+        {
+            ICE_RETHROW_EXCEPTION(_exception);
+        }
+        catch(const Ice::LocalException& ex)
         {
-            o->completed(*_exception.get());
-            if(o->requestId) // Make sure finished isn't called twice.
+            for(deque<OutgoingMessage>::iterator o = _sendStreams.begin(); o != _sendStreams.end(); ++o)
             {
-                if(o->out)
-                {
-                    _requests.erase(o->requestId);
-                }
-                else
+                o->completed(ex);
+                if(o->requestId) // Make sure finished isn't called twice.
                 {
-                    _asyncRequests.erase(o->requestId);
+                    if(o->out)
+                    {
+                        _requests.erase(o->requestId);
+                    }
+                    else
+                    {
+                        _asyncRequests.erase(o->requestId);
+                    }
                 }
             }
         }
         _sendStreams.clear(); // Must be cleared before _requests because of Outgoing* references in OutgoingMessage
     }
 
-    for(map<Int, OutgoingBase*>::const_iterator p = _requests.begin(); p != _requests.end(); ++p)
+    try
     {
-        p->second->completed(*_exception.get());
+        ICE_RETHROW_EXCEPTION(_exception);
     }
-    _requests.clear();
-
-    for(map<Int, OutgoingAsyncBasePtr>::const_iterator q = _asyncRequests.begin(); q != _asyncRequests.end(); ++q)
+    catch(const Ice::LocalException& ex)
     {
-        if(q->second->completed(*_exception.get()))
+        for(map<Int, OutgoingBase*>::const_iterator p = _requests.begin(); p != _requests.end(); ++p)
+        {
+            p->second->completed(ex);
+        }
+
+        _requests.clear();
+
+        for(map<Int, OutgoingAsyncBasePtr>::const_iterator q = _asyncRequests.begin(); q != _asyncRequests.end(); ++q)
         {
-            q->second->invokeCompleted();
+            if(q->second->exception(ex))
+            {
+                q->second->invokeException();
+            }
         }
     }
+
     _asyncRequests.clear();
 
     //
@@ -2010,12 +2098,14 @@ Ice::ConnectionI::finish(bool close)
     _readStream.clear();
     _readStream.b.clear();
 
-    if(_callback)
+    if(_closeCallback)
     {
-        closeCallback(_callback);
-        _callback = 0;
+        closeCallback(_closeCallback);
+        _closeCallback = ICE_NULLPTR;
     }
 
+    _heartbeatCallback = ICE_NULLPTR;
+
     //
     // This must be done last as this will cause waitUntilFinished() to return (and communicator
     // objects such as the timer might be destroyed too).
@@ -2079,7 +2169,7 @@ Ice::ConnectionI::getInfo() const
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
     if(_state >= StateClosed)
     {
-        _exception->ice_throw();
+        ICE_RETHROW_EXCEPTION(_exception);
     }
     return initConnectionInfo();
 }
@@ -2090,7 +2180,7 @@ Ice::ConnectionI::setBufferSize(Ice::Int rcvSize, Ice::Int sndSize)
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
     if(_state >= StateClosed)
     {
-        _exception->ice_throw();
+        ICE_RETHROW_EXCEPTION(_exception);
     }
     _transceiver->setBufferSize(rcvSize, sndSize);
     _info = 0; // Invalidate the cached connection info
@@ -2166,32 +2256,36 @@ Ice::ConnectionI::ConnectionI(const CommunicatorPtr& communicator,
     {
         _acmLastActivity = IceUtil::Time::now(IceUtil::Time::Monotonic);
     }
+}
 
-    __setNoDelete(true);
-    try
+Ice::ConnectionIPtr
+Ice::ConnectionI::create(const CommunicatorPtr& communicator,
+                         const InstancePtr& instance,
+                         const ACMMonitorPtr& monitor,
+                         const TransceiverPtr& transceiver,
+                         const ConnectorPtr& connector,
+                         const EndpointIPtr& endpoint,
+                         const ObjectAdapterIPtr& adapter)
+{
+    Ice::ConnectionIPtr conn(new ConnectionI(communicator, instance, monitor, transceiver, connector,
+                                             endpoint, adapter));
+    if(adapter)
     {
-        if(adapter)
-        {
-            const_cast<ThreadPoolPtr&>(_threadPool) = adapter->getThreadPool();
-        }
-        else
-        {
-            const_cast<ThreadPoolPtr&>(_threadPool) = _instance->clientThreadPool();
-        }
-        _threadPool->initialize(this);
+        const_cast<ThreadPoolPtr&>(conn->_threadPool) = adapter->getThreadPool();
     }
-    catch(const IceUtil::Exception&)
+    else
     {
-        __setNoDelete(false);
-        throw;
+        const_cast<ThreadPoolPtr&>(conn->_threadPool) = conn->_instance->clientThreadPool();
     }
-    __setNoDelete(false);
+    conn->_threadPool->initialize(conn);
+    return conn;
 }
 
 Ice::ConnectionI::~ConnectionI()
 {
     assert(!_startCallback);
-    assert(!_callback);
+    assert(!_closeCallback);
+    assert(!_heartbeatCallback);
     assert(_state == StateFinished);
     assert(_dispatchCount == 0);
     assert(_sendStreams.empty());
@@ -2213,15 +2307,13 @@ Ice::ConnectionI::setState(State state, const LocalException& ex)
         return;
     }
 
-    if(!_exception.get())
+    if(!ICE_EXCEPTION_ISSET(_exception))
     {
         //
         // If we are in closed state, an exception must be set.
         //
         assert(_state != StateClosed);
-
-        _exception.reset(ex.ice_clone());
-
+        ICE_RESET_EXCEPTION(_exception, ex.ice_clone());
         //
         // We don't warn if we are not validated.
         //
@@ -2230,15 +2322,15 @@ Ice::ConnectionI::setState(State state, const LocalException& ex)
             //
             // Don't warn about certain expected exceptions.
             //
-            if(!(dynamic_cast<const CloseConnectionException*>(_exception.get()) ||
-                 dynamic_cast<const ForcedCloseConnectionException*>(_exception.get()) ||
-                 dynamic_cast<const ConnectionTimeoutException*>(_exception.get()) ||
-                 dynamic_cast<const CommunicatorDestroyedException*>(_exception.get()) ||
-                 dynamic_cast<const ObjectAdapterDeactivatedException*>(_exception.get()) ||
-                 (dynamic_cast<const ConnectionLostException*>(_exception.get()) && _state >= StateClosing)))
+            if(!(dynamic_cast<const CloseConnectionException*>(&ex) ||
+                 dynamic_cast<const ForcedCloseConnectionException*>(&ex) ||
+                 dynamic_cast<const ConnectionTimeoutException*>(&ex) ||
+                 dynamic_cast<const CommunicatorDestroyedException*>(&ex) ||
+                 dynamic_cast<const ObjectAdapterDeactivatedException*>(&ex) ||
+                 (dynamic_cast<const ConnectionLostException*>(&ex) && _state >= StateClosing)))
             {
                 Warning out(_logger);
-                out << "connection exception:\n" << *_exception.get() << '\n' << _desc;
+                out << "connection exception:\n" << ex << '\n' << _desc;
             }
         }
     }
@@ -2306,7 +2398,7 @@ Ice::ConnectionI::setState(State state)
             {
                 return;
             }
-            _threadPool->_register(this, SocketOperationRead);
+            _threadPool->_register(shared_from_this(), SocketOperationRead);
             break;
         }
 
@@ -2322,7 +2414,7 @@ Ice::ConnectionI::setState(State state)
             }
             if(_state == StateActive)
             {
-                _threadPool->unregister(this, SocketOperationRead);
+                _threadPool->unregister(shared_from_this(), SocketOperationRead);
             }
             break;
         }
@@ -2347,13 +2439,20 @@ Ice::ConnectionI::setState(State state)
                 return;
             }
 
-            _batchRequestQueue->destroy(*_exception.get());
+            try
+            {
+                ICE_RETHROW_EXCEPTION(_exception);
+            }
+            catch(const Ice::LocalException& ex)
+            {
+                _batchRequestQueue->destroy(ex);
+            }
 
             //
             // Don't need to close now for connections so only close the transceiver
             // if the selector request it.
             //
-            if(_threadPool->finish(this, false))
+            if(_threadPool->finish(shared_from_this(), false))
             {
                 _transceiver->close();
             }
@@ -2388,11 +2487,11 @@ Ice::ConnectionI::setState(State state)
             {
                 _acmLastActivity = IceUtil::Time::now(IceUtil::Time::Monotonic);
             }
-            _monitor->add(this);
+            _monitor->add(shared_from_this());
         }
         else if(_state == StateActive)
         {
-            _monitor->remove(this);
+            _monitor->remove(shared_from_this());
         }
     }
 
@@ -2407,16 +2506,23 @@ Ice::ConnectionI::setState(State state)
                                                                                              newState,
                                                                                              _observer.get()));
         }
-        if(_observer && state == StateClosed && _exception.get())
+        if(_observer && state == StateClosed && ICE_EXCEPTION_ISSET(_exception))
         {
-            if(!(dynamic_cast<const CloseConnectionException*>(_exception.get()) ||
-                 dynamic_cast<const ForcedCloseConnectionException*>(_exception.get()) ||
-                 dynamic_cast<const ConnectionTimeoutException*>(_exception.get()) ||
-                 dynamic_cast<const CommunicatorDestroyedException*>(_exception.get()) ||
-                 dynamic_cast<const ObjectAdapterDeactivatedException*>(_exception.get()) ||
-                 (dynamic_cast<const ConnectionLostException*>(_exception.get()) && _state >= StateClosing)))
+            try
+            {
+                ICE_RETHROW_EXCEPTION(_exception);
+            }
+            catch(const Ice::LocalException& ex)
             {
-                _observer->failed(_exception->ice_name());
+                if(!(dynamic_cast<const CloseConnectionException*>(&ex) ||
+                    dynamic_cast<const ForcedCloseConnectionException*>(&ex) ||
+                    dynamic_cast<const ConnectionTimeoutException*>(&ex) ||
+                    dynamic_cast<const CommunicatorDestroyedException*>(&ex) ||
+                    dynamic_cast<const ObjectAdapterDeactivatedException*>(&ex) ||
+                    (dynamic_cast<const ConnectionLostException*>(&ex) && _state >= StateClosing)))
+                {
+                    _observer->failed(ex.ice_id());
+                }
             }
         }
     }
@@ -2454,7 +2560,7 @@ Ice::ConnectionI::initiateShutdown()
         //
         // Before we shut down, we send a close connection message.
         //
-        BasicStream os(_instance.get(), Ice::currentProtocolEncoding);
+        OutputStream os(_instance.get(), Ice::currentProtocolEncoding);
         os.write(magic[0]);
         os.write(magic[1]);
         os.write(magic[2]);
@@ -2473,11 +2579,15 @@ Ice::ConnectionI::initiateShutdown()
             //
             // Notify the the transceiver of the graceful connection closure.
             //
+#ifdef ICE_CPP11_MAPPING
+            SocketOperation op = _transceiver->closing(true, _exception);
+#else
             SocketOperation op = _transceiver->closing(true, *_exception.get());
+#endif
             if(op)
             {
                 scheduleTimeout(op);
-                _threadPool->_register(this, op);
+                _threadPool->_register(shared_from_this(), op);
             }
         }
     }
@@ -2490,7 +2600,7 @@ Ice::ConnectionI::heartbeat()
 
     if(!_endpoint->datagram())
     {
-        BasicStream os(_instance.get(), Ice::currentProtocolEncoding);
+        OutputStream os(_instance.get(), Ice::currentProtocolEncoding);
         os.write(magic[0]);
         os.write(magic[1]);
         os.write(magic[2]);
@@ -2509,7 +2619,7 @@ Ice::ConnectionI::heartbeat()
         catch(const LocalException& ex)
         {
             setState(StateClosed, ex);
-            assert(_exception.get());
+            assert(ICE_EXCEPTION_ISSET(_exception));
         }
     }
 }
@@ -2517,11 +2627,11 @@ Ice::ConnectionI::heartbeat()
 bool
 Ice::ConnectionI::initialize(SocketOperation operation)
 {
-    SocketOperation s = _transceiver->initialize(_readStream, _writeStream, _hasMoreData);
+    SocketOperation s = _transceiver->initialize(_readStream, _writeStream);
     if(s != SocketOperationNone)
     {
         scheduleTimeout(s);
-        _threadPool->update(this, operation, s);
+        _threadPool->update(shared_from_this(), operation, s);
         return false;
     }
 
@@ -2567,7 +2677,7 @@ Ice::ConnectionI::validate(SocketOperation operation)
                 if(op)
                 {
                     scheduleTimeout(op);
-                    _threadPool->update(this, operation, op);
+                    _threadPool->update(shared_from_this(), operation, op);
                     return false;
                 }
             }
@@ -2596,7 +2706,7 @@ Ice::ConnectionI::validate(SocketOperation operation)
                 if(op)
                 {
                     scheduleTimeout(op);
-                    _threadPool->update(this, operation, op);
+                    _threadPool->update(shared_from_this(), operation, op);
                     return false;
                 }
             }
@@ -2740,7 +2850,7 @@ Ice::ConnectionI::sendNextMessage(vector<OutgoingMessage>& callbacks)
                 //
                 // Do compression.
                 //
-                BasicStream stream(_instance.get(), Ice::currentProtocolEncoding);
+                OutputStream stream(_instance.get(), Ice::currentProtocolEncoding);
                 doCompress(*message->stream, stream);
 
                 if(message->outAsync)
@@ -2819,7 +2929,11 @@ Ice::ConnectionI::sendNextMessage(vector<OutgoingMessage>& callbacks)
         if(_state == StateClosing && _shutdownInitiated)
         {
             setState(StateClosingPending);
+#ifdef ICE_CPP11_MAPPING
+            SocketOperation op = _transceiver->closing(true, _exception);
+#else
             SocketOperation op = _transceiver->closing(true, *_exception.get());
+#endif
             if(op)
             {
                 return op;
@@ -2865,7 +2979,7 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message)
         //
         // Do compression.
         //
-        BasicStream stream(_instance.get(), Ice::currentProtocolEncoding);
+        OutputStream stream(_instance.get(), Ice::currentProtocolEncoding);
         doCompress(*message.stream, stream);
         stream.i = stream.b.begin();
 
@@ -2974,7 +3088,7 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message)
 
     _writeStream.swap(*_sendStreams.back().stream);
     scheduleTimeout(op);
-    _threadPool->_register(this, op);
+    _threadPool->_register(shared_from_this(), op);
     return AsyncStatusQueued;
 }
 
@@ -3041,7 +3155,7 @@ getBZ2Error(int bzError)
 }
 
 void
-Ice::ConnectionI::doCompress(BasicStream& uncompressed, BasicStream& compressed)
+Ice::ConnectionI::doCompress(OutputStream& uncompressed, OutputStream& compressed)
 {
     const Byte* p;
 
@@ -3096,7 +3210,7 @@ Ice::ConnectionI::doCompress(BasicStream& uncompressed, BasicStream& compressed)
 }
 
 void
-Ice::ConnectionI::doUncompress(BasicStream& compressed, BasicStream& uncompressed)
+Ice::ConnectionI::doUncompress(InputStream& compressed, InputStream& uncompressed)
 {
     Int uncompressedSize;
     compressed.i = compressed.b.begin() + headerSize;
@@ -3131,9 +3245,9 @@ Ice::ConnectionI::doUncompress(BasicStream& compressed, BasicStream& uncompresse
 #endif
 
 SocketOperation
-Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& requestId, Byte& compress,
+Ice::ConnectionI::parseMessage(InputStream& stream, Int& invokeNum, Int& requestId, Byte& compress,
                                ServantManagerPtr& servantManager, ObjectAdapterPtr& adapter,
-                               OutgoingAsyncBasePtr& outAsync, ConnectionCallbackPtr& heartbeatCallback,
+                               OutgoingAsyncBasePtr& outAsync, ICE_HEARTBEAT_CALLBACK& heartbeatCallback,
                                int& dispatchCount)
 {
     assert(_state > StateNotValidated && _state < StateClosed);
@@ -3169,7 +3283,7 @@ Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& request
         if(compress == 2)
         {
 #ifdef ICE_HAS_BZIP2
-            BasicStream ustream(_instance.get(), Ice::currentProtocolEncoding);
+            InputStream ustream(_instance.get(), Ice::currentProtocolEncoding);
             doUncompress(stream, ustream);
             stream.b.swap(ustream.b);
 #else
@@ -3200,7 +3314,11 @@ Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& request
                     //
                     // Notify the the transceiver of the graceful connection closure.
                     //
+#ifdef ICE_CPP11_MAPPING
+                    SocketOperation op = _transceiver->closing(false, _exception);
+#else
                     SocketOperation op = _transceiver->closing(false, *_exception.get());
+#endif
                     if(op)
                     {
                         return op;
@@ -3333,7 +3451,7 @@ Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& request
                         message->receivedReply = true;
                         outAsync = 0;
                     }
-                    else if(outAsync->completed())
+                    else if(outAsync->response())
                     {
                         ++dispatchCount;
                     }
@@ -3342,7 +3460,7 @@ Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& request
                         outAsync = 0;
                     }
 #else
-                    if(outAsync->completed())
+                    if(outAsync->response())
                     {
                         ++dispatchCount;
                     }
@@ -3360,9 +3478,9 @@ Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& request
             case validateConnectionMsg:
             {
                 traceRecv(stream, _logger, _traceLevels);
-                if(_callback)
+                if(_heartbeatCallback)
                 {
-                    heartbeatCallback = _callback;
+                    heartbeatCallback = _heartbeatCallback;
                     ++dispatchCount;
                 }
                 break;
@@ -3395,7 +3513,7 @@ Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& request
 }
 
 void
-Ice::ConnectionI::invokeAll(BasicStream& stream, Int invokeNum, Int requestId, Byte compress,
+Ice::ConnectionI::invokeAll(InputStream& stream, Int invokeNum, Int requestId, Byte compress,
                             const ServantManagerPtr& servantManager, const ObjectAdapterPtr& adapter)
 {
     //
@@ -3530,11 +3648,17 @@ Ice::ConnectionI::initConnectionInfo() const
     }
     catch(const Ice::LocalException&)
     {
-        _info = new ConnectionInfo();
+        _info = ICE_MAKE_SHARED(ConnectionInfo);
+    }
+
+    Ice::ConnectionInfoPtr info = _info;
+    while(info)
+    {
+        info->connectionId = _endpoint->connectionId();
+        info->incoming = _connector == 0;
+        info->adapterName = _adapter ? _adapter->getName() : string();
+        info = info->underlying;
     }
-    _info->connectionId = _endpoint->connectionId();
-    _info->incoming = _connector == 0;
-    _info->adapterName = _adapter ? _adapter->getName() : string();
     return _info;
 }
 
@@ -3548,7 +3672,7 @@ SocketOperation
 ConnectionI::read(Buffer& buf)
 {
     Buffer::Container::iterator start = buf.i;
-    SocketOperation op = _transceiver->read(buf, _hasMoreData);
+    SocketOperation op = _transceiver->read(buf);
     if(_instance->traceLevels()->network >= 3 && buf.i != start)
     {
         Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
@@ -3589,7 +3713,7 @@ ConnectionI::reap()
 {
     if(_monitor)
     {
-        _monitor->reap(this);
+        _monitor->reap(shared_from_this());
     }
     if(_observer)
     {
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
index 39fcea41d1f..d10213fa5c4 100644
--- a/cpp/src/Ice/ConnectionI.h
+++ b/cpp/src/Ice/ConnectionI.h
@@ -29,7 +29,7 @@
 #include <Ice/ConnectorF.h>
 #include <Ice/LoggerF.h>
 #include <Ice/TraceLevelsF.h>
-#include <Ice/OutgoingAsyncF.h>
+#include <Ice/OutgoingAsync.h>
 #include <Ice/EventHandler.h>
 #include <Ice/RequestHandler.h>
 #include <Ice/ResponseHandler.h>
@@ -38,10 +38,13 @@
 #include <Ice/ConnectionAsync.h>
 #include <Ice/BatchRequestQueueF.h>
 #include <Ice/ACM.h>
+#include <Ice/VirtualShared.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 
 #include <deque>
 
-#if TARGET_OS_IPHONE == 0 && !defined(ICE_OS_WINRT)
+#if !defined(ICE_OS_WINRT)
 #    ifndef ICE_HAS_BZIP2
 #        define ICE_HAS_BZIP2
 #    endif
@@ -60,13 +63,14 @@ namespace Ice
 
 class LocalException;
 class ObjectAdapterI;
-typedef IceUtil::Handle<ObjectAdapterI> ObjectAdapterIPtr;
+ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI);
 
 class ConnectionI : public Connection,
                     public IceInternal::EventHandler,
                     public IceInternal::ResponseHandler,
                     public IceInternal::CancellationHandler,
-                    public IceUtil::Monitor<IceUtil::Mutex>
+                    public IceUtil::Monitor<IceUtil::Mutex>,
+                    public EnableSharedFromThis<ConnectionI>
 {
     class Observer : public IceInternal::ObserverHelperT<Ice::Instrumentation::ConnectionObserver>
     {
@@ -91,7 +95,7 @@ public:
 
     struct OutgoingMessage
     {
-        OutgoingMessage(IceInternal::BasicStream* str, bool comp) :
+        OutgoingMessage(Ice::OutputStream* str, bool comp) :
             stream(str), out(0), compress(comp), requestId(0), adopted(false)
 #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
             , isSent(false), invokeSent(false), receivedReply(false)
@@ -99,7 +103,7 @@ public:
         {
         }
 
-        OutgoingMessage(IceInternal::OutgoingBase* o, IceInternal::BasicStream* str, bool comp, int rid) :
+        OutgoingMessage(IceInternal::OutgoingBase* o, Ice::OutputStream* str, bool comp, int rid) :
             stream(str), out(o), compress(comp), requestId(rid), adopted(false)
 #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
             , isSent(false), invokeSent(false), receivedReply(false)
@@ -107,7 +111,7 @@ public:
         {
         }
 
-        OutgoingMessage(const IceInternal::OutgoingAsyncBasePtr& o, IceInternal::BasicStream* str,
+        OutgoingMessage(const IceInternal::OutgoingAsyncBasePtr& o, Ice::OutputStream* str,
                         bool comp, int rid) :
             stream(str), out(0), outAsync(o), compress(comp), requestId(rid), adopted(false)
 #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
@@ -116,12 +120,12 @@ public:
         {
         }
 
-        void adopt(IceInternal::BasicStream*);
+        void adopt(Ice::OutputStream*);
         void canceled(bool);
         bool sent();
         void completed(const Ice::LocalException&);
 
-        IceInternal::BasicStream* stream;
+        Ice::OutputStream* stream;
         IceInternal::OutgoingBase* out;
         IceInternal::OutgoingAsyncBasePtr outAsync;
         bool compress;
@@ -134,7 +138,18 @@ public:
 #endif
     };
 
-    class StartCallback : virtual public IceUtil::Shared
+
+#ifdef ICE_CPP11_MAPPING
+    class StartCallback
+    {
+    public:
+
+        virtual void connectionStartCompleted(const ConnectionIPtr&) = 0;
+        virtual void connectionStartFailed(const ConnectionIPtr&, const Ice::LocalException&) = 0;
+    };
+    typedef ::std::shared_ptr<StartCallback> StartCallbackPtr;
+#else
+    class StartCallback : public virtual IceUtil::Shared
     {
     public:
 
@@ -142,6 +157,7 @@ public:
         virtual void connectionStartFailed(const ConnectionIPtr&, const Ice::LocalException&) = 0;
     };
     typedef IceUtil::Handle<StartCallback> StartCallbackPtr;
+#endif
 
     enum DestructionReason
     {
@@ -172,20 +188,24 @@ public:
 
     IceInternal::BatchRequestQueuePtr getBatchRequestQueue() const;
 
-    virtual void flushBatchRequests(); // From Connection.
+    virtual void flushBatchRequests();
 
+#ifdef ICE_CPP11_MAPPING
+    virtual std::function<void()>
+    flushBatchRequestsAsync(::std::function<void(::std::exception_ptr)>,
+                             ::std::function<void(bool)> = nullptr);
+#else
     virtual AsyncResultPtr begin_flushBatchRequests();
     virtual AsyncResultPtr begin_flushBatchRequests(const CallbackPtr&, const LocalObjectPtr& = 0);
     virtual AsyncResultPtr begin_flushBatchRequests(const Callback_Connection_flushBatchRequestsPtr&,
                                                     const LocalObjectPtr& = 0);
 
-    virtual AsyncResultPtr begin_flushBatchRequests(
-        const ::IceInternal::Function<void (const ::Ice::Exception&)>&,
-        const ::IceInternal::Function<void (bool)>& = ::IceInternal::Function<void (bool)>());
-
     virtual void end_flushBatchRequests(const AsyncResultPtr&);
+#endif
+
+    virtual void setCloseCallback(ICE_IN(ICE_CLOSE_CALLBACK));
+    virtual void setHeartbeatCallback(ICE_IN(ICE_HEARTBEAT_CALLBACK));
 
-    virtual void setCallback(const ConnectionCallbackPtr&);
     virtual void setACM(const IceUtil::Optional<int>&,
                         const IceUtil::Optional<ACMClose>&,
                         const IceUtil::Optional<ACMHeartbeat>&);
@@ -194,7 +214,7 @@ public:
     virtual void requestCanceled(IceInternal::OutgoingBase*, const LocalException&);
     virtual void asyncRequestCanceled(const IceInternal::OutgoingAsyncBasePtr&, const LocalException&);
 
-    virtual void sendResponse(Int, IceInternal::BasicStream*, Byte, bool);
+    virtual void sendResponse(Int, Ice::OutputStream*, Byte, bool);
     virtual void sendNoResponse();
     virtual bool systemException(Int, const SystemException&, bool);
     virtual void invokeException(Ice::Int, const LocalException&, int, bool);
@@ -205,7 +225,7 @@ public:
     virtual void setAdapter(const ObjectAdapterPtr&); // From Connection.
     virtual ObjectAdapterPtr getAdapter() const; // From Connection.
     virtual EndpointPtr getEndpoint() const; // From Connection.
-    virtual ObjectPrx createProxy(const Identity& ident) const; // From Connection.
+    virtual ObjectPrxPtr createProxy(const Identity& ident) const; // From Connection.
 
     //
     // Operations from EventHandler
@@ -233,13 +253,26 @@ public:
     void dispatch(const StartCallbackPtr&, const std::vector<OutgoingMessage>&, Byte, Int, Int,
                   const IceInternal::ServantManagerPtr&, const ObjectAdapterPtr&,
                   const IceInternal::OutgoingAsyncBasePtr&,
-                  const ConnectionCallbackPtr&, IceInternal::BasicStream&);
+                  const ICE_HEARTBEAT_CALLBACK&, Ice::InputStream&);
     void finish(bool);
 
-    void closeCallback(const ConnectionCallbackPtr&);
+    void closeCallback(const ICE_CLOSE_CALLBACK&);
+
+    virtual ~ConnectionI();
+
+    using EnableSharedFromThis<ConnectionI>::shared_from_this;
 
 private:
 
+    ConnectionI(const Ice::CommunicatorPtr&, const IceInternal::InstancePtr&, const IceInternal::ACMMonitorPtr&,
+                const IceInternal::TransceiverPtr&, const IceInternal::ConnectorPtr&,
+                const IceInternal::EndpointIPtr&, const ObjectAdapterIPtr&);
+
+    static ConnectionIPtr
+    create(const Ice::CommunicatorPtr&, const IceInternal::InstancePtr&, const IceInternal::ACMMonitorPtr&,
+           const IceInternal::TransceiverPtr&, const IceInternal::ConnectorPtr&,
+           const IceInternal::EndpointIPtr&, const ObjectAdapterIPtr&);
+
     enum State
     {
         StateNotInitialized,
@@ -252,11 +285,6 @@ private:
         StateFinished
     };
 
-    ConnectionI(const Ice::CommunicatorPtr&, const IceInternal::InstancePtr&, const IceInternal::ACMMonitorPtr&,
-                const IceInternal::TransceiverPtr&, const IceInternal::ConnectorPtr&,
-                const IceInternal::EndpointIPtr&, const ObjectAdapterIPtr&);
-    virtual ~ConnectionI();
-
     friend class IceInternal::IncomingConnectionFactory;
     friend class IceInternal::OutgoingConnectionFactory;
 
@@ -272,15 +300,15 @@ private:
     IceInternal::AsyncStatus sendMessage(OutgoingMessage&);
 
 #ifdef ICE_HAS_BZIP2
-    void doCompress(IceInternal::BasicStream&, IceInternal::BasicStream&);
-    void doUncompress(IceInternal::BasicStream&, IceInternal::BasicStream&);
+    void doCompress(Ice::OutputStream&, Ice::OutputStream&);
+    void doUncompress(Ice::InputStream&, Ice::InputStream&);
 #endif
 
-    IceInternal::SocketOperation parseMessage(IceInternal::BasicStream&, Int&, Int&, Byte&,
+    IceInternal::SocketOperation parseMessage(Ice::InputStream&, Int&, Int&, Byte&,
                                               IceInternal::ServantManagerPtr&, ObjectAdapterPtr&,
-                                              IceInternal::OutgoingAsyncBasePtr&, ConnectionCallbackPtr&, int&);
+                                              IceInternal::OutgoingAsyncBasePtr&, ICE_HEARTBEAT_CALLBACK&, int&);
 
-    void invokeAll(IceInternal::BasicStream&, Int, Int, Byte,
+    void invokeAll(Ice::InputStream&, Int, Int, Byte,
                    const IceInternal::ServantManagerPtr&, const ObjectAdapterPtr&);
 
     void scheduleTimeout(IceInternal::SocketOperation status);
@@ -294,7 +322,9 @@ private:
 
     void reap();
 
+#ifndef ICE_CPP11_MAPPING
     AsyncResultPtr __begin_flushBatchRequests(const IceInternal::CallbackBasePtr&, const LocalObjectPtr&);
+#endif
 
     Ice::CommunicatorPtr _communicator;
     const IceInternal::InstancePtr _instance;
@@ -338,16 +368,20 @@ private:
     std::map<Int, IceInternal::OutgoingAsyncBasePtr> _asyncRequests;
     std::map<Int, IceInternal::OutgoingAsyncBasePtr>::iterator _asyncRequestsHint;
 
+#ifdef ICE_CPP11_MAPPING
+    std::exception_ptr _exception;
+#else
     IceUtil::UniquePtr<LocalException> _exception;
+#endif
 
     const size_t _messageSizeMax;
     IceInternal::BatchRequestQueuePtr _batchRequestQueue;
 
     std::deque<OutgoingMessage> _sendStreams;
 
-    IceInternal::BasicStream _readStream;
+    Ice::InputStream _readStream;
     bool _readHeader;
-    IceInternal::BasicStream _writeStream;
+    Ice::OutputStream _writeStream;
 
     Observer _observer;
 
@@ -358,7 +392,8 @@ private:
     bool _initialized;
     bool _validated;
 
-    Ice::ConnectionCallbackPtr _callback;
+    ICE_CLOSE_CALLBACK _closeCallback;
+    ICE_HEARTBEAT_CALLBACK _heartbeatCallback;
 };
 
 }
diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp
index d1eccb35d8d..e461bb7d510 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectionRequestHandler.cpp
@@ -51,7 +51,7 @@ ConnectionRequestHandler::update(const RequestHandlerPtr& previousHandler, const
     {
         // Ignore.
     }
-    return this;
+    return ICE_SHARED_FROM_THIS;
 }
 
 bool
diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h
index 5ca7f79bfd8..1a2129275b4 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.h
+++ b/cpp/src/Ice/ConnectionRequestHandler.h
@@ -13,11 +13,13 @@
 #include <Ice/RequestHandler.h>
 #include <Ice/ReferenceF.h>
 #include <Ice/ProxyF.h>
+#include <Ice/VirtualShared.h>
 
 namespace IceInternal
 {
 
-class ConnectionRequestHandler : public RequestHandler
+class ConnectionRequestHandler : public RequestHandler,
+                                 public Ice::EnableSharedFromThis<ConnectionRequestHandler>
 {
 public:
 
diff --git a/cpp/src/Ice/Connector.cpp b/cpp/src/Ice/Connector.cpp
index d251b1bb603..a9a2ec72e3e 100644
--- a/cpp/src/Ice/Connector.cpp
+++ b/cpp/src/Ice/Connector.cpp
@@ -13,4 +13,9 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+Connector::~Connector()
+{
+    // Out of line to avoid weak vtable
+}
+
 IceUtil::Shared* IceInternal::upCast(Connector* p) { return p; }
diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h
index c272808c666..377c0427f03 100644
--- a/cpp/src/Ice/Connector.h
+++ b/cpp/src/Ice/Connector.h
@@ -20,7 +20,9 @@ namespace IceInternal
 class ICE_API Connector : public ::IceUtil::Shared
 {
 public:
-    
+
+    virtual ~Connector();
+
     virtual TransceiverPtr connect() = 0;
 
     virtual Ice::Short type() const = 0;
diff --git a/cpp/src/IceUtil/CountDownLatch.cpp b/cpp/src/Ice/CountDownLatch.cpp
index cbdd4d5bcf2..eb0422ba7e9 100644
--- a/cpp/src/IceUtil/CountDownLatch.cpp
+++ b/cpp/src/Ice/CountDownLatch.cpp
@@ -15,7 +15,7 @@ IceUtilInternal::CountDownLatch::CountDownLatch(int count) :
 {
     if(count < 0)
     {
-        throw IceUtil::Exception(__FILE__, __LINE__);
+        throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "count must be greather than 0");
     }
 
 #ifdef _WIN32
@@ -34,12 +34,12 @@ IceUtilInternal::CountDownLatch::CountDownLatch(int count) :
     {
         throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, rc);
     }
-    
+
     rc = pthread_cond_init(&_cond, 0);
     if(rc != 0)
     {
         throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, rc);
-    }   
+    }
 #endif
 }
 
@@ -60,7 +60,7 @@ IceUtilInternal::CountDownLatch::~CountDownLatch()
 #endif
 }
 
-void 
+void
 IceUtilInternal::CountDownLatch::await() const
 {
 #ifdef _WIN32
@@ -72,7 +72,7 @@ IceUtilInternal::CountDownLatch::await() const
         DWORD rc = WaitForSingleObjectEx(_event, INFINITE, false);
 #   endif
         assert(rc == WAIT_OBJECT_0 || rc == WAIT_FAILED);
-        
+
         if(rc == WAIT_FAILED)
         {
             throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
@@ -90,11 +90,11 @@ IceUtilInternal::CountDownLatch::await() const
         }
     }
     unlock();
-    
+
 #endif
 }
 
-void 
+void
 IceUtilInternal::CountDownLatch::countDown()
 {
 #ifdef _WIN32
@@ -129,10 +129,10 @@ IceUtilInternal::CountDownLatch::countDown()
         }
     }
     unlock();
-    
+
 #else
     unlock();
-    
+
     if(broadcast)
     {
         int rc = pthread_cond_broadcast(&_cond);
@@ -146,7 +146,7 @@ IceUtilInternal::CountDownLatch::countDown()
 #endif
 }
 
-int 
+int
 IceUtilInternal::CountDownLatch::getCount() const
 {
 #ifdef _WIN32
diff --git a/cpp/src/Ice/DeprecatedStringConverter.cpp b/cpp/src/Ice/DeprecatedStringConverter.cpp
deleted file mode 100644
index 02f1b6a55f2..00000000000
--- a/cpp/src/Ice/DeprecatedStringConverter.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <IceUtil/DisableWarnings.h>
-#include <Ice/DeprecatedStringConverter.h>
-
-#include <Ice/Initialize.h>
-#include <Ice/Instance.h>
-#include <IceUtil/StringConverter.h>
-
-namespace Ice
-{
-
-StringConverterPlugin::StringConverterPlugin(const CommunicatorPtr& /*notused*/, 
-                                             const StringConverterPtr& stringConverter, 
-                                             const WstringConverterPtr& wstringConverter) 
-{
-    IceUtil::setProcessStringConverter(stringConverter);
-    IceUtil::setProcessWstringConverter(wstringConverter);
-}
-    
-void StringConverterPlugin::initialize()
-{
-    // no op
-}
-    
-void StringConverterPlugin::destroy()
-{
-    // no op
-}
-
-std::string
-nativeToUTF8(const StringConverterPtr& converter, const std::string& s)
-{
-    return IceUtil::nativeToUTF8(s, converter);
-}
-
-std::string
-nativeToUTF8(const CommunicatorPtr& communicator, const std::string& s)
-{
-    return IceUtil::nativeToUTF8(s, IceInternal::getInstance(communicator)->getStringConverter());
-}
-
-std::string
-UTF8toNative(const StringConverterPtr& converter, const std::string& s)
-{
-    return IceUtil::UTF8ToNative(s, converter);
-}
-
-std::string
-UTF8ToNative(const CommunicatorPtr& communicator, const std::string& s)
-{
-    return IceUtil::UTF8ToNative(s, IceInternal::getInstance(communicator)->getStringConverter());
-}
-
-}
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp
index a62fe7093df..75985b6ab06 100644
--- a/cpp/src/Ice/DynamicLibrary.cpp
+++ b/cpp/src/Ice/DynamicLibrary.cpp
@@ -22,7 +22,7 @@ using namespace std;
 IceUtil::Shared* IceInternal::upCast(DynamicLibrary* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(DynamicLibraryList* p) { return p; }
 
-IceInternal::DynamicLibrary::DynamicLibrary() : 
+IceInternal::DynamicLibrary::DynamicLibrary() :
     _hnd(0)
 {
 }
@@ -89,24 +89,23 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
     if(comma == string::npos)
     {
         libName = libSpec;
-#  if defined(ICE_CPP11) && defined(__GLIBCXX__)
+#  if defined(ICE_CPP11_MAPPING) && !defined(_WIN32)
         libName += "++11";
 #  endif
         if(useIceVersion)
         {
             int majorVersion = (ICE_INT_VERSION / 10000);
             int minorVersion = (ICE_INT_VERSION / 100) - majorVersion * 100;
+            int patchVersion = ICE_INT_VERSION % 100;
             ostringstream os;
             os << majorVersion * 10 + minorVersion;
-
-            int patchVersion = ICE_INT_VERSION % 100;
-            if(patchVersion > 50)
+            if(patchVersion >= 60)
             {
-                os << 'b';
-                if(patchVersion >= 52)
-                {
-                    os << (patchVersion - 50);
-                }
+                os << 'b' << (patchVersion - 60);
+            }
+            else if(patchVersion >= 50)
+            {
+                os << 'a' << (patchVersion - 50);
             }
             version = os.str();
         }
@@ -119,7 +118,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
             return 0;
         }
         libName = libSpec.substr(0, comma);
-#  if defined(ICE_CPP11) && defined(__GLIBCXX__)
+#  if defined(ICE_CPP11_MAPPING) && !defined(_WIN32)
         libName += "++11";
 #  endif
         version = libSpec.substr(comma + 1);
@@ -130,6 +129,13 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
 #ifdef _WIN32
     lib += libName;
     lib += version;
+#  ifdef ICE_OS_WINRT
+    lib += "uwp";
+#  endif
+
+#  ifdef ICE_CPP11_MAPPING
+    lib += "++11";
+#  endif
 
 #   if defined(_DEBUG) && !defined(__MINGW32__)
     lib += 'd';
@@ -273,9 +279,13 @@ IceInternal::DynamicLibrary::getErrorMessage() const
     return _err;
 }
 
+IceInternal::DynamicLibraryList::~DynamicLibraryList()
+{
+    // Out of line to avoid weak vtable
+}
+
 void
 IceInternal::DynamicLibraryList::add(const DynamicLibraryPtr& library)
 {
     _libraries.push_back(library);
 }
-
diff --git a/cpp/src/Ice/EndpointFactory.h b/cpp/src/Ice/EndpointFactory.h
index 2bc0980e501..07b3fbd32f2 100644
--- a/cpp/src/Ice/EndpointFactory.h
+++ b/cpp/src/Ice/EndpointFactory.h
@@ -17,10 +17,15 @@
 #include <Ice/CommunicatorF.h>
 #include <Ice/Plugin.h>
 
-namespace IceInternal
+namespace Ice
 {
 
-class BasicStream;
+class InputStream;
+
+}
+
+namespace IceInternal
+{
 
 class ICE_API EndpointFactory : public ::IceUtil::Shared
 {
@@ -31,10 +36,10 @@ public:
     virtual ::Ice::Short type() const = 0;
     virtual ::std::string protocol() const = 0;
     virtual EndpointIPtr create(std::vector<std::string>&, bool) const = 0;
-    virtual EndpointIPtr read(BasicStream*) const = 0;
+    virtual EndpointIPtr read(Ice::InputStream*) const = 0;
     virtual void destroy() = 0;
 
-    virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const = 0;
+    virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&, const EndpointFactoryPtr&) const = 0;
 
 protected:
 
diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp
index 6fea6b1897e..14a78b50d59 100644
--- a/cpp/src/Ice/EndpointFactoryManager.cpp
+++ b/cpp/src/Ice/EndpointFactoryManager.cpp
@@ -10,7 +10,8 @@
 #include <Ice/EndpointFactoryManager.h>
 #include <Ice/Endpoint.h>
 #include <Ice/OpaqueEndpointI.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/LocalException.h>
 #include <Ice/Instance.h>
 #include <Ice/Properties.h>
@@ -122,7 +123,7 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint)
         // Code below left in place for debugging.
 
         EndpointIPtr e = factory->create(str.substr(end), oaEndpoint);
-        BasicStream bs(_instance.get(), Ice::currentProtocolEncoding);
+        OutputStream bs(_instance.get(), Ice::currentProtocolEncoding);
         e->streamWrite(&bs);
         bs.i = bs.b.begin();
         short type;
@@ -140,7 +141,7 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint)
     //
     if(protocol == "opaque")
     {
-        EndpointIPtr ue = new OpaqueEndpointI(v);
+        EndpointIPtr ue = ICE_MAKE_SHARED(OpaqueEndpointI, v);
         if(!v.empty())
         {
             EndpointParseException ex(__FILE__, __LINE__);
@@ -155,15 +156,15 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint)
             // and ask the factory to read the endpoint data from that stream to create
             // the actual endpoint.
             //
-            BasicStream bs(_instance.get(), Ice::currentProtocolEncoding);
+            OutputStream bs(_instance.get(), Ice::currentProtocolEncoding);
             bs.write(ue->type());
             ue->streamWrite(&bs);
-            bs.i = bs.b.begin();
+            InputStream is(bs.instance(), bs.getEncoding(), bs);
             short type;
-            bs.read(type);
-            bs.startReadEncaps();
-            EndpointIPtr e = factory->read(&bs);
-            bs.endReadEncaps();
+            is.read(type);
+            is.startEncapsulation();
+            EndpointIPtr e = factory->read(&is);
+            is.endEncapsulation();
             return e;
         }
         return ue; // Endpoint is opaque, but we don't have a factory for its type.
@@ -173,7 +174,7 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint)
 }
 
 EndpointIPtr
-IceInternal::EndpointFactoryManager::read(BasicStream* s) const
+IceInternal::EndpointFactoryManager::read(InputStream* s) const
 {
     Short type;
     s->read(type);
@@ -181,7 +182,7 @@ IceInternal::EndpointFactoryManager::read(BasicStream* s) const
     EndpointFactoryPtr factory = get(type);
     EndpointIPtr e;
 
-    s->startReadEncaps();
+    s->startEncapsulation();
 
     if(factory)
     {
@@ -189,10 +190,10 @@ IceInternal::EndpointFactoryManager::read(BasicStream* s) const
     }
     else
     {
-        e = new OpaqueEndpointI(type, s);
+        e = ICE_MAKE_SHARED(OpaqueEndpointI, type, s);
     }
 
-    s->endReadEncaps();
+    s->endEncapsulation();
 
     return e;
 }
diff --git a/cpp/src/Ice/EndpointFactoryManager.h b/cpp/src/Ice/EndpointFactoryManager.h
index f4a080e65ac..3369b39cd83 100644
--- a/cpp/src/Ice/EndpointFactoryManager.h
+++ b/cpp/src/Ice/EndpointFactoryManager.h
@@ -17,10 +17,15 @@
 #include <Ice/EndpointFactoryF.h>
 #include <Ice/EndpointFactoryManagerF.h>
 
-namespace IceInternal
+namespace Ice
 {
 
-class BasicStream;
+class InputStream;
+
+}
+
+namespace IceInternal
+{
 
 class EndpointFactoryManager : public ::IceUtil::Shared, public ::IceUtil::Mutex
 {
@@ -29,7 +34,7 @@ public:
     void add(const EndpointFactoryPtr&);
     EndpointFactoryPtr get(::Ice::Short) const;
     EndpointIPtr create(const std::string&, bool) const;
-    EndpointIPtr read(BasicStream*) const;
+    EndpointIPtr read(Ice::InputStream*) const;
 
 private:
 
diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index 741d7a65a1f..663de016608 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -8,11 +8,28 @@
 // **********************************************************************
 
 #include <Ice/EndpointI.h>
+#include <Ice/OutputStream.h>
 
 using namespace std;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(EndpointI* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(EndpointI_connectors* p) { return p; }
+#endif
+
+
+IceInternal::EndpointI_connectors::~EndpointI_connectors()
+{
+    // Out of line to avoid weak vtable
+}
+
+void
+IceInternal::EndpointI::streamWrite(Ice::OutputStream* s) const
+{
+    s->startEncapsulation();
+    streamWriteImpl(s);
+    s->endEncapsulation();
+}
 
 string
 IceInternal::EndpointI::toString() const
diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h
index f14121c0e42..1dd10708142 100644
--- a/cpp/src/Ice/EndpointI.h
+++ b/cpp/src/Ice/EndpointI.h
@@ -16,30 +16,38 @@
 #include <Ice/TransceiverF.h>
 #include <Ice/ConnectorF.h>
 #include <Ice/AcceptorF.h>
+#include <Ice/VirtualShared.h>
 
-namespace IceInternal
+namespace Ice
 {
 
-class BasicStream;
+class OutputStream;
+class InputStream;
+
+}
+
+namespace IceInternal
+{
 
-class ICE_API EndpointI_connectors : public virtual IceUtil::Shared
+class ICE_API EndpointI_connectors : public virtual ICE_SHARED
 {
 public:
 
-    virtual ~EndpointI_connectors() { }
+    virtual ~EndpointI_connectors();
 
     virtual void connectors(const std::vector<ConnectorPtr>&) = 0;
     virtual void exception(const Ice::LocalException&) = 0;
 };
 
-class ICE_API EndpointI : public Ice::Endpoint
+class ICE_API EndpointI : public Ice::Endpoint, public virtual ICE_SHARED
 {
 public:
 
     //
     // Marshal the endpoint.
     //
-    virtual void streamWrite(BasicStream*) const = 0;
+    virtual void streamWrite(Ice::OutputStream*) const;
+    virtual void streamWriteImpl(Ice::OutputStream*) const = 0;
 
     //
     // Return the endpoint type.
@@ -131,8 +139,10 @@ public:
     //
     // Compare endpoints for sorting purposes.
     //
+#ifndef ICE_CPP11_MAPPING
     virtual bool operator==(const Ice::LocalObject&) const = 0;
     virtual bool operator<(const Ice::LocalObject&) const = 0;
+#endif
 
     virtual ::Ice::Int hash() const = 0;
 
@@ -150,6 +160,7 @@ protected:
 
 };
 
+#ifndef ICE_CPP11_MAPPING
 inline bool operator==(const EndpointI& l, const EndpointI& r)
 {
     return static_cast<const ::Ice::LocalObject&>(l) == static_cast<const ::Ice::LocalObject&>(r);
@@ -159,6 +170,7 @@ inline bool operator<(const EndpointI& l, const EndpointI& r)
 {
     return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
 }
+#endif
 
 template<typename T> class InfoI : public T
 {
@@ -166,6 +178,8 @@ public:
 
     InfoI(const EndpointIPtr& endpoint) : _endpoint(endpoint)
     {
+        T::compress = _endpoint->compress();
+        T::timeout = _endpoint->timeout();
     }
 
     virtual Ice::Short
diff --git a/cpp/src/Ice/EndpointIF.h b/cpp/src/Ice/EndpointIF.h
index a8f0eee1382..c3a4c767772 100644
--- a/cpp/src/Ice/EndpointIF.h
+++ b/cpp/src/Ice/EndpointIF.h
@@ -17,25 +17,38 @@ namespace IceInternal
 {
 
 class EndpointI;
+class TcpEndpointI;
+class UdpEndpointI;
+class WSEndpoint;
+class EndpointI_connectors;
+
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+typedef ::std::shared_ptr<EndpointI> EndpointIPtr;
+typedef ::std::shared_ptr<TcpEndpointI> TcpEndpointIPtr;
+typedef ::std::shared_ptr<UdpEndpointI> UdpEndpointIPtr;
+typedef ::std::shared_ptr<WSEndpoint> WSEndpointPtr;
+typedef ::std::shared_ptr<EndpointI_connectors> EndpointI_connectorsPtr;
+
+#else // C++98 mapping
+
 ICE_API IceUtil::Shared* upCast(EndpointI*);
 typedef Handle<EndpointI> EndpointIPtr;
 
-class TcpEndpointI;
 ICE_API IceUtil::Shared* upCast(TcpEndpointI*);
 typedef Handle<TcpEndpointI> TcpEndpointIPtr;
 
-class UdpEndpointI;
 ICE_API IceUtil::Shared* upCast(UdpEndpointI*);
 typedef Handle<UdpEndpointI> UdpEndpointIPtr;
 
-class WSEndpoint;
 ICE_API IceUtil::Shared* upCast(WSEndpoint*);
 typedef Handle<WSEndpoint> WSEndpointPtr;
 
-class EndpointI_connectors;
 ICE_API IceUtil::Shared* upCast(EndpointI_connectors*);
 typedef Handle<EndpointI_connectors> EndpointI_connectorsPtr;
 
+#endif
+
 }
 
 #endif
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index 4d1bf821782..78827685267 100644
--- a/cpp/src/Ice/EventHandler.cpp
+++ b/cpp/src/Ice/EventHandler.cpp
@@ -14,18 +14,20 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(EventHandler* p) { return p; }
+#endif
 
 IceInternal::EventHandler::EventHandler() :
 #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
-    _ready(SocketOperationNone),
     _pending(SocketOperationNone),
     _started(SocketOperationNone),
+    _completed(SocketOperationNone),
     _finish(false),
 #else
     _disabled(SocketOperationNone),
 #endif
-    _hasMoreData(false),
+    _ready(SocketOperationNone),
     _registered(SocketOperationNone)
 {
 }
diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h
index abdf7613dc6..ced022ed06a 100644
--- a/cpp/src/Ice/EventHandler.h
+++ b/cpp/src/Ice/EventHandler.h
@@ -14,13 +14,18 @@
 #include <Ice/EventHandlerF.h>
 #include <Ice/InstanceF.h>
 #include <Ice/ThreadPoolF.h>
-#include <Ice/BasicStream.h>
 #include <Ice/Network.h>
+#include <Ice/VirtualShared.h>
 
 namespace IceInternal
 {
 
-class ICE_API EventHandler : virtual public ::IceUtil::Shared
+class ICE_API EventHandler :
+#ifdef ICE_CPP11_MAPPING
+    public virtual Ice::VirtualEnableSharedFromThisBase
+#else
+    public virtual Ice::LocalObject
+#endif
 {
 public:
 
@@ -53,19 +58,19 @@ public:
     virtual NativeInfoPtr getNativeInfo() = 0;
 
 protected:
-    
+
     EventHandler();
     virtual ~EventHandler();
 
 #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
-    SocketOperation _ready;
     SocketOperation _pending;
     SocketOperation _started;
+    SocketOperation _completed;
     bool _finish;
 #else
     SocketOperation _disabled;
 #endif
-    bool _hasMoreData;
+    SocketOperation _ready;
     SocketOperation _registered;
 
     friend class ThreadPool;
diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h
index 63dcf7650d0..722329efa73 100644
--- a/cpp/src/Ice/EventHandlerF.h
+++ b/cpp/src/Ice/EventHandlerF.h
@@ -18,9 +18,12 @@ namespace IceInternal
 {
 
 class EventHandler;
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<EventHandler> EventHandlerPtr;
+#else
 ICE_API IceUtil::Shared* upCast(EventHandler*);
 typedef Handle<EventHandler> EventHandlerPtr;
-
+#endif
 }
 
 #endif
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 16ebe05aeb2..d9d1f929fc1 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -12,8 +12,8 @@
 #include <Ice/Network.h>
 #include <Ice/Plugin.h>
 #include <Ice/SlicedData.h>
-#include <Ice/BasicStream.h>
-#include <Ice/Stream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 #include <IceUtil/StringUtil.h>
 #ifdef ICE_OS_WINRT
 #    include <IceUtil/StringConverter.h>
@@ -66,17 +66,17 @@ namespace Ex
 {
 
 void
-throwUOE(const string& expectedType, const ObjectPtr& v)
+throwUOE(const string& expectedType, const ValuePtr& v)
 {
     //
     // If the object is an unknown sliced object, we didn't find an
-    // object factory, in this case raise a NoObjectFactoryException
+    // value factory, in this case raise a NoValueFactoryException
     // instead.
     //
-    UnknownSlicedObject* uso = dynamic_cast<UnknownSlicedObject*>(v.get());
-    if(uso)
+    UnknownSlicedValue* usv = dynamic_cast<UnknownSlicedValue*>(v.get());
+    if(usv)
     {
-        throw NoObjectFactoryException(__FILE__, __LINE__, "", uso->getUnknownTypeId());
+        throw NoValueFactoryException(__FILE__, __LINE__, "", usv->getUnknownTypeId());
     }
 
     string type = v->ice_id();
@@ -102,24 +102,24 @@ throwMarshalException(const char* file, int line, const string& reason)
 }
 }
 
-void
-Ice::UserException::__write(::IceInternal::BasicStream* os) const
+namespace
 {
-    os->startWriteException(0);
-    __writeImpl(os);
-    os->endWriteException();
-}
 
-void
-Ice::UserException::__read(::IceInternal::BasicStream* is)
+const string __Ice__UserException_ids[] =
 {
-    is->startReadException();
-    __readImpl(is);
-    is->endReadException(false);
+    "::Ice::UserException"
+};
+
 }
 
+const std::string&
+Ice::UserException::ice_staticId()
+{
+    return __Ice__UserException_ids[0];
+};
+
 void
-Ice::UserException::__write(const Ice::OutputStreamPtr& os) const
+Ice::UserException::__write(::Ice::OutputStream* os) const
 {
     os->startException(0);
     __writeImpl(os);
@@ -127,38 +127,46 @@ Ice::UserException::__write(const Ice::OutputStreamPtr& os) const
 }
 
 void
-Ice::UserException::__read(const Ice::InputStreamPtr& is)
+Ice::UserException::__read(::Ice::InputStream* is)
 {
     is->startException();
     __readImpl(is);
     is->endException(false);
 }
 
-void
-Ice::UserException::__writeImpl(const Ice::OutputStreamPtr&) const
+bool
+Ice::UserException::__usesClasses() const
 {
-    throw MarshalException(__FILE__, __LINE__, "user exception was not generated with stream support");
+    return false;
 }
 
-void
-Ice::UserException::__readImpl(const Ice::InputStreamPtr&)
+Ice::LocalException::LocalException(const char* file, int line) :
+    Exception(file, line)
 {
-    throw MarshalException(__FILE__, __LINE__, "user exception was not generated with stream support");
 }
 
-bool
-Ice::UserException::__usesClasses() const
+Ice::LocalException::~LocalException()
+#ifndef ICE_CPP11_COMPILER
+    throw()
+#endif
 {
-    return false;
+   // Out of line to avoid weak vtable
 }
 
-Ice::LocalException::LocalException(const char* file, int line) :
-    Exception(file, line)
+namespace
+{
+
+const string __Ice__LocalException_ids[] =
 {
+    "::Ice::LocalException"
+};
+
 }
 
-Ice::LocalException::~LocalException() throw()
+const std::string&
+Ice::LocalException::ice_staticId()
 {
+    return __Ice__LocalException_ids[0];
 }
 
 Ice::SystemException::SystemException(const char* file, int line) :
@@ -166,32 +174,28 @@ Ice::SystemException::SystemException(const char* file, int line) :
 {
 }
 
-Ice::SystemException::~SystemException() throw()
+Ice::SystemException::~SystemException()
+#ifndef ICE_CPP11_COMPILER
+    throw()
+#endif
 {
 }
 
-#if defined(__SUNPRO_CC)
-ostream&
-Ice::operator<<(ostream& out, const Ice::UserException& ex)
+namespace
 {
-    ex.ice_print(out);
-    return out;
-}
 
-ostream&
-Ice::operator<<(ostream& out, const Ice::LocalException& ex)
+const string __Ice__SystemException_ids[] =
 {
-    ex.ice_print(out);
-    return out;
+    "::Ice::SystemException"
+};
+
 }
 
-ostream&
-Ice::operator<<(ostream& out, const Ice::SystemException& ex)
+const std::string&
+Ice::SystemException::ice_staticId()
 {
-    ex.ice_print(out);
-    return out;
+    return __Ice__SystemException_ids[0];
 }
-#endif
 
 void
 Ice::InitializationException::ice_print(ostream& out) const
@@ -698,7 +702,7 @@ Ice::UnmarshalOutOfBoundsException::ice_print(ostream& out) const
 }
 
 void
-Ice::NoObjectFactoryException::ice_print(ostream& out) const
+Ice::NoValueFactoryException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
     out << ":\nprotocol error: no suitable object factory found for `" << type << "'";
@@ -831,11 +835,9 @@ Ice::ResponseSentException::ice_print(ostream& out) const
     out << ":\nresponse sent exception";
 }
 
-#ifdef ICE_USE_CFSTREAM
 void
 Ice::CFNetworkException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
     out << ":\nnetwork exception: domain: " << domain << " error: " << error;
 }
-#endif
diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp
index 680f15e98f3..78b8a1c8b2b 100644
--- a/cpp/src/Ice/FactoryTable.cpp
+++ b/cpp/src/Ice/FactoryTable.cpp
@@ -8,14 +8,22 @@
 // **********************************************************************
 
 #include <Ice/FactoryTable.h>
-#include <Ice/ObjectFactory.h>
+#include <Ice/ValueFactory.h>
+
+using namespace std;
+
+
+Ice::UserExceptionFactory::~UserExceptionFactory()
+{
+    // Out of line to avoid weak vtable
+}
 
 //
 // Add a factory to the exception factory table.
 // If the factory is present already, increment its reference count.
 //
 void
-IceInternal::FactoryTable::addExceptionFactory(const std::string& t, const IceInternal::UserExceptionFactoryPtr& f)
+IceInternal::FactoryTable::addExceptionFactory(const string& t, const Ice::UserExceptionFactoryPtr& f)
 {
     IceUtil::Mutex::Lock lock(_m);
     assert(f);
@@ -33,12 +41,12 @@ IceInternal::FactoryTable::addExceptionFactory(const std::string& t, const IceIn
 //
 // Return the exception factory for a given type ID
 //
-IceInternal::UserExceptionFactoryPtr
-IceInternal::FactoryTable::getExceptionFactory(const std::string& t) const
+Ice::UserExceptionFactoryPtr
+IceInternal::FactoryTable::getExceptionFactory(const string& t) const
 {
     IceUtil::Mutex::Lock lock(_m);
     EFTable::const_iterator i = _eft.find(t);
-    return i != _eft.end() ? i->second.first : IceInternal::UserExceptionFactoryPtr();
+    return i != _eft.end() ? i->second.first : Ice::UserExceptionFactoryPtr();
 }
 
 //
@@ -48,7 +56,7 @@ IceInternal::FactoryTable::getExceptionFactory(const std::string& t) const
 // entry from the table.
 //
 void
-IceInternal::FactoryTable::removeExceptionFactory(const std::string& t)
+IceInternal::FactoryTable::removeExceptionFactory(const string& t)
 {
     IceUtil::Mutex::Lock lock(_m);
     EFTable::iterator i = _eft.find(t);
@@ -62,17 +70,17 @@ IceInternal::FactoryTable::removeExceptionFactory(const std::string& t)
 }
 
 //
-// Add a factory to the object factory table.
+// Add a factory to the value factory table.
 //
 void
-IceInternal::FactoryTable::addObjectFactory(const std::string& t, const Ice::ObjectFactoryPtr& f)
+IceInternal::FactoryTable::addValueFactory(const string& t, ICE_IN(ICE_VALUE_FACTORY) f)
 {
     IceUtil::Mutex::Lock lock(_m);
     assert(f);
-    OFTable::iterator i = _oft.find(t);
-    if(i == _oft.end())
+    VFTable::iterator i = _vft.find(t);
+    if(i == _vft.end())
     {
-        _oft[t] = OFPair(f, 1);
+        _vft[t] = VFPair(f, 1);
     }
     else
     {
@@ -81,41 +89,41 @@ IceInternal::FactoryTable::addObjectFactory(const std::string& t, const Ice::Obj
 }
 
 //
-// Return the object factory for a given type ID
+// Return the value factory for a given type ID
 //
-Ice::ObjectFactoryPtr
-IceInternal::FactoryTable::getObjectFactory(const std::string& t) const
+ICE_VALUE_FACTORY
+IceInternal::FactoryTable::getValueFactory(const string& t) const
 {
     IceUtil::Mutex::Lock lock(_m);
-    OFTable::const_iterator i = _oft.find(t);
-    return i != _oft.end() ? i->second.first : Ice::ObjectFactoryPtr();
+    VFTable::const_iterator i = _vft.find(t);
+    return i != _vft.end() ? i->second.first : ICE_VALUE_FACTORY();
 }
 
 //
-// Remove a factory from the object factory table. If the factory
+// Remove a factory from the value factory table. If the factory
 // is not present, do nothing; otherwise, decrement the factory's
 // reference count if the count drops to zero, remove the factory's
 // entry from the table.
 //
 void
-IceInternal::FactoryTable::removeObjectFactory(const std::string& t)
+IceInternal::FactoryTable::removeValueFactory(const string& t)
 {
     IceUtil::Mutex::Lock lock(_m);
-    OFTable::iterator i = _oft.find(t);
-    if(i != _oft.end())
+    VFTable::iterator i = _vft.find(t);
+    if(i != _vft.end())
     {
         if(--i->second.second == 0)
         {
-            _oft.erase(i);
+            _vft.erase(i);
         }
     }
 }
 
 //
-// Add a factory to the object factory table.
+// Add a factory to the value factory table.
 //
 void
-IceInternal::FactoryTable::addTypeId(int compactId, const std::string& typeId)
+IceInternal::FactoryTable::addTypeId(int compactId, const string& typeId)
 {
     IceUtil::Mutex::Lock lock(_m);
     assert(!typeId.empty() && compactId >= 0);
@@ -133,12 +141,12 @@ IceInternal::FactoryTable::addTypeId(int compactId, const std::string& typeId)
 //
 // Return the type ID for the given compact ID
 //
-std::string
+string
 IceInternal::FactoryTable::getTypeId(int compactId) const
 {
     IceUtil::Mutex::Lock lock(_m);
     TypeIdTable::const_iterator i = _typeIdTable.find(compactId);
-    return i != _typeIdTable.end() ? i->second.first : std::string();
+    return i != _typeIdTable.end() ? i->second.first : string();
 }
 
 void
diff --git a/cpp/src/Ice/FactoryTableInit.cpp b/cpp/src/Ice/FactoryTableInit.cpp
index 5a6fbbf7d93..9bc14725634 100644
--- a/cpp/src/Ice/FactoryTableInit.cpp
+++ b/cpp/src/Ice/FactoryTableInit.cpp
@@ -90,6 +90,6 @@ IceInternal::CompactIdInit::CompactIdInit(const char* typeId, int compactId) :
 
 IceInternal::CompactIdInit::~CompactIdInit()
 {
-    factoryTable->removeTypeId(_compactId);  
+    factoryTable->removeTypeId(_compactId);
 }
 
diff --git a/cpp/src/Ice/GCObject.cpp b/cpp/src/Ice/GCObject.cpp
index c32623ab535..a78ebbc8f50 100644
--- a/cpp/src/Ice/GCObject.cpp
+++ b/cpp/src/Ice/GCObject.cpp
@@ -9,6 +9,8 @@
 
 #include <Ice/GCObject.h>
 
+#ifndef ICE_CPP11_MAPPING
+
 #include <set>
 #include <stack>
 
@@ -442,3 +444,4 @@ GCObject::collect(IceUtilInternal::MutexPtrLock<IceUtil::Mutex>& lock)
     }
     return true;
 }
+#endif
diff --git a/cpp/src/Ice/HttpParser.cpp b/cpp/src/Ice/HttpParser.cpp
index 0532d9cfea6..bda8c9b1211 100644
--- a/cpp/src/Ice/HttpParser.cpp
+++ b/cpp/src/Ice/HttpParser.cpp
@@ -9,7 +9,6 @@
 
 #include <IceUtil/Config.h>
 #include <Ice/HttpParser.h>
-#include <Ice/BasicStream.h>
 #include <Ice/LocalException.h>
 #include <IceUtil/StringUtil.h>
 
diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp
index 00b25825b3e..21f4def1c2d 100644
--- a/cpp/src/Ice/IPEndpointI.cpp
+++ b/cpp/src/Ice/IPEndpointI.cpp
@@ -18,6 +18,7 @@
 #include <IceUtil/MutexPtrLock.h>
 
 using namespace std;
+using namespace Ice;
 using namespace Ice::Instrumentation;
 using namespace IceInternal;
 
@@ -46,7 +47,9 @@ Init init;
 
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(IPEndpointI* p) { return p; }
+#endif
 IceUtil::Shared* IceInternal::upCast(EndpointHostResolver* p) { return p; }
 
 IceInternal::IPEndpointInfoI::IPEndpointInfoI(const EndpointIPtr& endpoint) : _endpoint(endpoint)
@@ -78,7 +81,7 @@ IceInternal::IPEndpointInfoI::secure() const
 Ice::EndpointInfoPtr
 IceInternal::IPEndpointI::getInfo() const
 {
-    Ice::IPEndpointInfoPtr info = new IPEndpointInfoI(const_cast<IPEndpointI*>(this));
+    Ice::IPEndpointInfoPtr info = ICE_MAKE_SHARED(IPEndpointInfoI, shared_from_this());
     fillEndpointInfo(info.get());
     return info;
 }
@@ -103,11 +106,10 @@ IceInternal::IPEndpointI::secure() const
 }
 
 void
-IceInternal::IPEndpointI::streamWrite(BasicStream* s) const
+IceInternal::IPEndpointI::streamWriteImpl(OutputStream* s) const
 {
-    s->startWriteEncaps();
-    streamWriteImpl(s);
-    s->endWriteEncaps();
+    s->write(_host, false);
+    s->write(_port);
 }
 
 const string&
@@ -121,7 +123,7 @@ IceInternal::IPEndpointI::connectionId(const string& connectionId) const
 {
     if(connectionId == _connectionId)
     {
-        return const_cast<IPEndpointI*>(this);
+        return shared_from_this();
     }
     else
     {
@@ -129,22 +131,10 @@ IceInternal::IPEndpointI::connectionId(const string& connectionId) const
     }
 }
 
-const std::string&
-IceInternal::IPEndpointI::host() const
-{
-    return _host;
-}
-
-int
-IceInternal::IPEndpointI::port() const
-{
-    return _port;
-}
-
 void
 IceInternal::IPEndpointI::connectors_async(Ice::EndpointSelectionType selType, const EndpointI_connectorsPtr& cb) const
 {
-    _instance->resolve(_host, _port, selType, const_cast<IPEndpointI*>(this), cb);
+    _instance->resolve(_host, _port, selType, shared_from_this(), cb);
 }
 
 vector<EndpointIPtr>
@@ -154,7 +144,7 @@ IceInternal::IPEndpointI::expand() const
     vector<string> hosts = getHostsForEndpointExpand(_host, _instance->protocolSupport(), false);
     if(hosts.empty())
     {
-        endps.push_back(const_cast<IPEndpointI*>(this));
+        endps.push_back(shared_from_this());
     }
     else
     {
@@ -229,7 +219,11 @@ IceInternal::IPEndpointI::options() const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::IPEndpointI::operator==(const Endpoint& r) const
+#else
 IceInternal::IPEndpointI::operator==(const LocalObject& r) const
+#endif
 {
     const IPEndpointI* p = dynamic_cast<const IPEndpointI*>(&r);
     if(!p)
@@ -261,12 +255,15 @@ IceInternal::IPEndpointI::operator==(const LocalObject& r) const
     {
         return false;
     }
-
     return true;
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::IPEndpointI::operator<(const Endpoint& r) const
+#else
 IceInternal::IPEndpointI::operator<(const LocalObject& r) const
+#endif
 {
     const IPEndpointI* p = dynamic_cast<const IPEndpointI*>(&r);
     if(!p)
@@ -345,13 +342,6 @@ IceInternal::IPEndpointI::connectors(const vector<Address>& addresses, const Net
 }
 
 void
-IceInternal::IPEndpointI::streamWriteImpl(BasicStream* s) const
-{
-    s->write(_host, false);
-    s->write(_port);
-}
-
-void
 IceInternal::IPEndpointI::hashInit(Ice::Int& h) const
 {
     hashAdd(h, _host);
@@ -487,7 +477,7 @@ IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance) :
 {
 }
 
-IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance, BasicStream* s) :
+IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance, InputStream* s) :
     _instance(instance),
     _port(0),
     _hashInitialized(false)
@@ -659,7 +649,7 @@ IceInternal::EndpointHostResolver::run()
             }
             if(r.observer)
             {
-                r.observer->failed(ex.ice_name());
+                r.observer->failed(ex.ice_id());
                 r.observer->detach();
             }
             r.callback->exception(ex);
@@ -671,7 +661,7 @@ IceInternal::EndpointHostResolver::run()
         Ice::CommunicatorDestroyedException ex(__FILE__, __LINE__);
         if(p->observer)
         {
-            p->observer->failed(ex.ice_name());
+            p->observer->failed(ex.ice_id());
             p->observer->detach();
         }
         p->callback->exception(ex);
diff --git a/cpp/src/Ice/IPEndpointI.h b/cpp/src/Ice/IPEndpointI.h
index 4226dffa2f4..a2ed7984037 100644
--- a/cpp/src/Ice/IPEndpointI.h
+++ b/cpp/src/Ice/IPEndpointI.h
@@ -43,15 +43,16 @@ private:
     const EndpointIPtr _endpoint;
 };
 
-class ICE_API IPEndpointI : public EndpointI
+class ICE_API IPEndpointI : public EndpointI, public Ice::EnableSharedFromThis<IPEndpointI>
 {
 public:
 
+    virtual void streamWriteImpl(Ice::OutputStream*) const;
+
     virtual Ice::EndpointInfoPtr getInfo() const;
     virtual Ice::Short type() const;
     virtual const std::string& protocol() const;
     virtual bool secure() const;
-    virtual void streamWrite(BasicStream*) const;
 
     virtual const std::string& connectionId() const;
     virtual EndpointIPtr connectionId(const ::std::string&) const;
@@ -62,14 +63,16 @@ public:
     virtual ::Ice::Int hash() const;
     virtual std::string options() const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const Ice::Endpoint&) const;
+    virtual bool operator<(const Ice::Endpoint&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
+#endif
 
     virtual std::vector<ConnectorPtr> connectors(const std::vector<Address>&, const NetworkProxyPtr&) const;
-    const std::string& host() const;
-    int port() const;
 
-    virtual void streamWriteImpl(BasicStream*) const;
     virtual void hashInit(Ice::Int&) const;
     virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const;
 
@@ -88,7 +91,7 @@ protected:
 
     IPEndpointI(const ProtocolInstancePtr&, const std::string&, int, const Address&, const std::string&);
     IPEndpointI(const ProtocolInstancePtr&);
-    IPEndpointI(const ProtocolInstancePtr&, BasicStream*);
+    IPEndpointI(const ProtocolInstancePtr&, Ice::InputStream*);
 
     const ProtocolInstancePtr _instance;
     const std::string _host;
@@ -143,6 +146,7 @@ private:
 #endif
 };
 
+#ifndef ICE_CPP11_MAPPING
 inline bool operator==(const IPEndpointI& l, const IPEndpointI& r)
 {
     return static_cast<const ::Ice::LocalObject&>(l) == static_cast<const ::Ice::LocalObject&>(r);
@@ -152,6 +156,7 @@ inline bool operator<(const IPEndpointI& l, const IPEndpointI& r)
 {
     return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
 }
+#endif
 
 }
 
diff --git a/cpp/src/Ice/IPEndpointIF.h b/cpp/src/Ice/IPEndpointIF.h
index 12004aa9a1c..bc8513b4bd4 100644
--- a/cpp/src/Ice/IPEndpointIF.h
+++ b/cpp/src/Ice/IPEndpointIF.h
@@ -17,13 +17,17 @@ namespace IceInternal
 {
 
 class IPEndpointI;
+
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<IPEndpointI> IPEndpointIPtr;
+#else
 ICE_API IceUtil::Shared* upCast(IPEndpointI*);
 typedef Handle<IPEndpointI> IPEndpointIPtr;
+#endif
 
 class EndpointHostResolver;
 ICE_API IceUtil::Shared* upCast(EndpointHostResolver*);
 typedef Handle<EndpointHostResolver> EndpointHostResolverPtr;
-
 }
 
 #endif
diff --git a/cpp/src/Ice/Ice.rc b/cpp/src/Ice/Ice.rc
index f8577c30208..989f57eefea 100644
--- a/cpp/src/Ice/Ice.rc
+++ b/cpp/src/Ice/Ice.rc
@@ -1,18 +1,17 @@
 #include "winver.h"
-#include "EventLoggerMsg.rc"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "ice36d\0"
- #define ORIGINALFILENAME "ice36d.dll\0"
+ #define INTERNALNAME "ice37a2d\0"
+ #define ORIGINALFILENAME "ice37a2d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "ice36\0"
- #define ORIGINALFILENAME "ice36.dll\0"
+ #define INTERNALNAME "ice37a2\0"
+ #define ORIGINALFILENAME "ice37a2.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -24,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice C++ Core Library\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp
index d23e3afd62c..fb9e578d6a1 100644
--- a/cpp/src/Ice/ImplicitContextI.cpp
+++ b/cpp/src/Ice/ImplicitContextI.cpp
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 #include <Ice/ImplicitContextI.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
 #include <Ice/Object.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
@@ -22,7 +22,7 @@ namespace
 class SharedImplicitContext : public ImplicitContextI
 {
 public:
-    
+
     virtual Context getContext() const;
     virtual void setContext(const Context&);
 
@@ -31,7 +31,7 @@ public:
     virtual string put(const string&, const string&);
     virtual string remove(const string&);
 
-    virtual void write(const Context&, ::IceInternal::BasicStream*) const;
+    virtual void write(const Context&, ::Ice::OutputStream*) const;
     virtual void combine(const Context&, Context&) const;
 
 private:
@@ -43,7 +43,7 @@ private:
 class PerThreadImplicitContext : public ImplicitContextI
 {
 public:
-    
+
     PerThreadImplicitContext();
     virtual ~PerThreadImplicitContext();
 
@@ -55,7 +55,7 @@ public:
     virtual string put(const string&, const string&);
     virtual string remove(const string&);
 
-    virtual void write(const Context&, ::IceInternal::BasicStream*) const;
+    virtual void write(const Context&, ::Ice::OutputStream*) const;
     virtual void combine(const Context&, Context&) const;
 
     struct Slot
@@ -76,7 +76,7 @@ public:
     // is assigned a slot in this vector.
     //
     typedef std::vector<Slot> SlotVector;
-    
+
     //
     // We remember which slot-indices are in use (to be able to reuse indices)
     //
@@ -90,7 +90,7 @@ public:
     static DWORD _key;
 #else
     static pthread_key_t _key;
-#endif    
+#endif
 
 private:
 
@@ -107,7 +107,7 @@ extern "C" void iceImplicitContextThreadDestructor(void*);
 
 
 
-/*static*/ ImplicitContextI*
+ImplicitContextIPtr
 ImplicitContextI::create(const std::string& kind)
 {
     if(kind == "None" || kind == "")
@@ -116,14 +116,14 @@ ImplicitContextI::create(const std::string& kind)
     }
     else if(kind == "Shared")
     {
-        return new SharedImplicitContext;
+        return ICE_MAKE_SHARED(SharedImplicitContext);
     }
     else if(kind == "PerThread")
     {
 #ifndef ICE_OS_WINRT
-        return new PerThreadImplicitContext;
+        return ICE_MAKE_SHARED(PerThreadImplicitContext);
 #else
-        throw InitializationException(__FILE__, __LINE__, 
+        throw InitializationException(__FILE__, __LINE__,
                                       "'PerThread' Ice.ImplicitContext isn't supported for WinRT.");
         return 0; // Keep the compiler happy.
 #endif
@@ -132,7 +132,7 @@ ImplicitContextI::create(const std::string& kind)
     {
         throw Ice::InitializationException(
             __FILE__, __LINE__,
-            "'" + kind + "' is not a valid value for Ice.ImplicitContext"); 
+            "'" + kind + "' is not a valid value for Ice.ImplicitContext");
         return 0; // Keep the compiler happy.
     }
 }
@@ -144,7 +144,7 @@ ImplicitContextI::cleanupThread()
     if(PerThreadImplicitContext::_nextId > 0)
     {
         iceImplicitContextThreadDestructor(TlsGetValue(PerThreadImplicitContext::_key));
-    } 
+    }
 }
 #endif
 
@@ -167,7 +167,7 @@ SharedImplicitContext::setContext(const Context& newContext)
     _context = newContext;
 }
 
-bool 
+bool
 SharedImplicitContext::containsKey(const string& k) const
 {
     IceUtil::Mutex::Lock lock(_mutex);
@@ -175,7 +175,7 @@ SharedImplicitContext::containsKey(const string& k) const
     return p != _context.end();
 }
 
-string 
+string
 SharedImplicitContext::get(const string& k) const
 {
     IceUtil::Mutex::Lock lock(_mutex);
@@ -188,12 +188,12 @@ SharedImplicitContext::get(const string& k) const
 }
 
 
-string 
+string
 SharedImplicitContext::put(const string& k, const string& v)
 {
     IceUtil::Mutex::Lock lock(_mutex);
     string& val = _context[k];
-    
+
     string oldVal = val;
     val = v;
     return oldVal;
@@ -216,8 +216,8 @@ SharedImplicitContext::remove(const string& k)
     }
 }
 
-void 
-SharedImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream* s) const
+void
+SharedImplicitContext::write(const Context& proxyCtx, ::Ice::OutputStream* s) const
 {
     IceUtil::Mutex::Lock lock(_mutex);
     if(proxyCtx.size() == 0)
@@ -238,7 +238,7 @@ SharedImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream
     }
 }
 
-void 
+void
 SharedImplicitContext::combine(const Context& proxyCtx, Context& ctx) const
 {
     IceUtil::Mutex::Lock lock(_mutex);
@@ -318,7 +318,7 @@ PerThreadImplicitContext::PerThreadImplicitContext()
         }
 #   endif
     }
-    
+
     //
     // Now grabs an index
     //
@@ -444,7 +444,7 @@ PerThreadImplicitContext::clearThreadContext() const
         size_t i = sv->size();
 
         bool clear = true;
-        while(i != 0) 
+        while(i != 0)
         {
             i--;
             if((*sv)[i].context != 0)
@@ -509,7 +509,7 @@ PerThreadImplicitContext::setContext(const Context& newContext)
     }
 }
 
-bool 
+bool
 PerThreadImplicitContext::containsKey(const string& k) const
 {
     const Context* ctx = getThreadContext(false);
@@ -521,7 +521,7 @@ PerThreadImplicitContext::containsKey(const string& k) const
     return p != ctx->end();
 }
 
-string 
+string
 PerThreadImplicitContext::get(const string& k) const
 {
     const Context* ctx = getThreadContext(false);
@@ -537,13 +537,13 @@ PerThreadImplicitContext::get(const string& k) const
     return p->second;
 }
 
-string 
+string
 PerThreadImplicitContext::put(const string& k, const string& v)
 {
     Context* ctx = getThreadContext(true);
 
     string& val = (*ctx)[k];
-    
+
     string oldVal = val;
     val = v;
     return oldVal;
@@ -557,7 +557,7 @@ PerThreadImplicitContext::remove(const string& k)
      {
          return "";
      }
-     
+
      Context::iterator p = ctx->find(k);
      if(p == ctx->end())
      {
@@ -576,8 +576,8 @@ PerThreadImplicitContext::remove(const string& k)
     }
 }
 
-void 
-PerThreadImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream* s) const
+void
+PerThreadImplicitContext::write(const Context& proxyCtx, ::Ice::OutputStream* s) const
 {
     const Context* threadCtx = getThreadContext(false);
 
@@ -597,7 +597,7 @@ PerThreadImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStr
     }
 }
 
-void 
+void
 PerThreadImplicitContext::combine(const Context& proxyCtx, Context& ctx) const
 {
     const Context* threadCtx = getThreadContext(false);
diff --git a/cpp/src/Ice/ImplicitContextI.h b/cpp/src/Ice/ImplicitContextI.h
index 1a4971de13a..41a0f8341b1 100644
--- a/cpp/src/Ice/ImplicitContextI.h
+++ b/cpp/src/Ice/ImplicitContextI.h
@@ -18,12 +18,14 @@ namespace Ice
 //
 // The base class for all ImplicitContext implementations
 //
+class ImplicitContextI;
+ICE_DEFINE_PTR(ImplicitContextIPtr,ImplicitContextI);
 
 class ImplicitContextI : public ImplicitContext
 {
 public:
-    
-    static ImplicitContextI* create(const std::string&);
+
+    static ImplicitContextIPtr create(const std::string&);
 
 #ifdef _WIN32
     static void cleanupThread();
@@ -34,7 +36,7 @@ public:
     // (entries in the given context overwrite entries in
     // the underlying context)
     //
-    virtual void write(const Context&, ::IceInternal::BasicStream*) const = 0;
+    virtual void write(const Context&, ::Ice::OutputStream*) const = 0;
 
     //
     // Combines the underlying context plus the given context
@@ -45,7 +47,7 @@ public:
 
 };
 
-typedef IceInternal::Handle<ImplicitContextI> ImplicitContextIPtr;
+ICE_DEFINE_PTR(ImplicitContextIPtr, ImplicitContextI);
 
 }
 #endif
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 3e808ac6f89..5bd91cb36c3 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -33,7 +33,7 @@ using namespace IceInternal;
 namespace IceUtilInternal
 {
 
-extern bool ICE_UTIL_API printStackTraces;
+extern bool printStackTraces;
 
 }
 
@@ -46,7 +46,12 @@ IceInternal::IncomingBase::IncomingBase(Instance* instance, ResponseHandler* res
     _responseHandler(responseHandler)
 {
     _current.adapter = adapter;
+#ifdef ICE_CPP11_MAPPING
+    ::Ice::ConnectionI* conn = dynamic_cast<::Ice::ConnectionI*>(connection);
+    _current.con = conn ? dynamic_pointer_cast<::Ice::ConnectionI>(conn->shared_from_this()) : nullptr;
+#else
     _current.con = connection;
+#endif
     _current.requestId = requestId;
 }
 
@@ -84,7 +89,7 @@ IceInternal::IncomingBase::__adopt(IncomingBase& other)
     other._responseHandler = 0;
 }
 
-BasicStream*
+OutputStream*
 IncomingBase::__startWriteParams(FormatType format)
 {
     if(!_response)
@@ -95,7 +100,7 @@ IncomingBase::__startWriteParams(FormatType format)
     assert(_os.b.size() == headerSize + 4); // Reply status position.
     assert(_current.encoding >= Ice::Encoding_1_0); // Encoding for reply is known.
     _os.write(static_cast<Ice::Byte>(0));
-    _os.startWriteEncaps(_current.encoding, format);
+    _os.startEncapsulation(_current.encoding, format);
 
     //
     // We still return the stream even if no response is expected. The
@@ -118,7 +123,7 @@ IncomingBase::__endWriteParams(bool ok)
     if(_response)
     {
         *(_os.b.begin() + headerSize + 4) = ok ? replyOK : replyUserException; // Reply status position.
-        _os.endWriteEncaps();
+        _os.endEncapsulation();
     }
 }
 
@@ -130,7 +135,7 @@ IncomingBase::__writeEmptyParams()
         assert(_os.b.size() == headerSize + 4); // Reply status position.
         assert(_current.encoding >= Ice::Encoding_1_0); // Encoding for reply is known.
         _os.write(replyOK);
-        _os.writeEmptyEncaps(_current.encoding);
+        _os.writeEmptyEncapsulation(_current.encoding);
     }
 }
 
@@ -149,11 +154,11 @@ IncomingBase::__writeParamEncaps(const Byte* v, Ice::Int sz, bool ok)
         _os.write(ok ? replyOK : replyUserException);
         if(sz == 0)
         {
-            _os.writeEmptyEncaps(_current.encoding);
+            _os.writeEmptyEncapsulation(_current.encoding);
         }
         else
         {
-            _os.writeEncaps(v, sz);
+            _os.writeEncapsulation(v, sz);
         }
     }
 }
@@ -161,7 +166,7 @@ IncomingBase::__writeParamEncaps(const Byte* v, Ice::Int sz, bool ok)
 void
 IncomingBase::__writeUserException(const Ice::UserException& ex, Ice::FormatType format)
 {
-    ::IceInternal::BasicStream* __os = __startWriteParams(format);
+    ::Ice::OutputStream* __os = __startWriteParams(format);
     __os->write(ex);
     __endWriteParams(false);
 }
@@ -172,17 +177,20 @@ IceInternal::IncomingBase::__warning(const Exception& ex) const
     Warning out(_os.instance()->initializationData().logger);
 
     out << "dispatch exception: " << ex;
-    out << "\nidentity: " << _os.instance()->identityToString(_current.id);
+    out << "\nidentity: " << Ice::identityToString(_current.id);
     out << "\nfacet: " << IceUtilInternal::escapeString(_current.facet, "");
     out << "\noperation: " << _current.operation;
 
     if(_current.con)
     {
-        Ice::ConnectionInfoPtr connInfo = _current.con->getInfo();
-        Ice::IPConnectionInfoPtr ipConnInfo = Ice::IPConnectionInfoPtr::dynamicCast(connInfo);
-        if(ipConnInfo)
+        for(Ice::ConnectionInfoPtr connInfo = _current.con->getInfo(); connInfo; connInfo = connInfo->underlying)
         {
-            out << "\nremote host: " << ipConnInfo->remoteAddress << " remote port: " << ipConnInfo->remotePort;
+            Ice::IPConnectionInfoPtr ipConnInfo = ICE_DYNAMIC_CAST(Ice::IPConnectionInfo, connInfo);
+            if(ipConnInfo)
+            {
+                out << "\nremote host: " << ipConnInfo->remoteAddress << " remote port: " << ipConnInfo->remotePort;
+                break;
+            }
         }
     }
 }
@@ -193,17 +201,20 @@ IceInternal::IncomingBase::__warning(const string& msg) const
     Warning out(_os.instance()->initializationData().logger);
 
     out << "dispatch exception: " << msg;
-    out << "\nidentity: " << _os.instance()->identityToString(_current.id);
+    out << "\nidentity: " << Ice::identityToString(_current.id);
     out << "\nfacet: " << IceUtilInternal::escapeString(_current.facet, "");
     out << "\noperation: " << _current.operation;
 
     if(_current.con)
     {
-        Ice::ConnectionInfoPtr connInfo = _current.con->getInfo();
-        Ice::IPConnectionInfoPtr ipConnInfo = Ice::IPConnectionInfoPtr::dynamicCast(connInfo);
-        if(ipConnInfo)
+        for(Ice::ConnectionInfoPtr connInfo = _current.con->getInfo(); connInfo; connInfo = connInfo->underlying)
         {
-            out << "\nremote host: " << ipConnInfo->remoteAddress << " remote port: " << ipConnInfo->remotePort;
+            Ice::IPConnectionInfoPtr ipConnInfo = ICE_DYNAMIC_CAST(Ice::IPConnectionInfo, connInfo);
+            if(ipConnInfo)
+            {
+                out << "\nremote host: " << ipConnInfo->remoteAddress << " remote port: " << ipConnInfo->remotePort;
+                break;
+            }
         }
     }
 }
@@ -230,9 +241,9 @@ IceInternal::IncomingBase::__servantLocatorFinished(bool amd)
         {
             _os.b.resize(headerSize + 4); // Reply status position.
             _os.write(replyUserException);
-            _os.startWriteEncaps(_current.encoding, DefaultFormat);
+            _os.startEncapsulation(_current.encoding, DefaultFormat);
             _os.write(ex);
-            _os.endWriteEncaps();
+            _os.endEncapsulation();
             _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4));
             _responseHandler->sendResponse(_current.requestId, &_os, _compress, amd);
         }
@@ -295,7 +306,7 @@ IceInternal::IncomingBase::__handleException(const std::exception& exc, bool amd
 
         if(_observer)
         {
-            _observer.failed(rfe->ice_name());
+            _observer.failed(rfe->ice_id());
         }
 
         if(_response)
@@ -351,7 +362,7 @@ IceInternal::IncomingBase::__handleException(const std::exception& exc, bool amd
 
         if(_observer)
         {
-            _observer.failed(ex->ice_name());
+            _observer.failed(ex->ice_id());
         }
 
         if(_response)
@@ -552,18 +563,25 @@ IceInternal::Incoming::killAsync()
 }
 
 void
-IceInternal::Incoming::setActive(IncomingAsync& cb)
+IceInternal::Incoming::setActive(IncomingAsyncPtr cb)
 {
     assert(_cb == 0);
-    _cb = &cb; // acquires a ref-count
+    //
+    // acquires a ref-count
+    //
+#ifdef ICE_CPP11_MAPPING
+    _cb = move(cb);
+#else
+    _cb = cb;
+#endif
 }
 
 void
-IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStream* stream)
+IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, InputStream* stream)
 {
     _is = stream;
 
-    BasicStream::Container::iterator start = _is->i;
+    InputStream::Container::iterator start = _is->i;
 
     //
     // Read the current.
@@ -639,16 +657,16 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre
                 }
                 catch(const UserException& ex)
                 {
-                    Ice::EncodingVersion encoding = _is->skipEncaps(); // Required for batch requests.
+                    Ice::EncodingVersion encoding = _is->skipEncapsulation(); // Required for batch requests.
 
                     _observer.userException();
 
                     if(_response)
                     {
                         _os.write(replyUserException);
-                        _os.startWriteEncaps(encoding, DefaultFormat);
+                        _os.startEncapsulation(encoding, DefaultFormat);
                         _os.write(ex);
-                        _os.endWriteEncaps();
+                        _os.endEncapsulation();
                         _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4));
                         _responseHandler->sendResponse(_current.requestId, &_os, _compress, false);
                     }
@@ -663,13 +681,13 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre
                 }
                 catch(const std::exception& ex)
                 {
-                    _is->skipEncaps(); // Required for batch requests.
+                    _is->skipEncapsulation(); // Required for batch requests.
                     __handleException(ex, false);
                     return;
                 }
                 catch(...)
                 {
-                    _is->skipEncaps(); // Required for batch requests.
+                    _is->skipEncapsulation(); // Required for batch requests.
                     __handleException(false);
                     return;
                 }
@@ -701,7 +719,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre
             // Skip the input parameters, this is required for reading
             // the next batch request if dispatching batch requests.
             //
-            _is->skipEncaps();
+            _is->skipEncapsulation();
 
             if(servantManager && servantManager->hasServant(_current.id))
             {
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index e49243aceb4..d6a8059bba7 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -23,9 +23,21 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(IncomingAsync* p) { return p; }
 IceUtil::Shared* Ice::upCast(AMD_Object_ice_invoke* p) { return p; }
 
+Ice::AMDCallback::~AMDCallback()
+{
+    // Out of line to avoid weak vtable
+}
+
+Ice::AMD_Object_ice_invoke::~AMD_Object_ice_invoke()
+{
+    // Out of line to avoid weak vtable
+}
+#endif
+
 namespace
 {
 
@@ -54,15 +66,30 @@ Init init;
 IceInternal::IncomingAsync::IncomingAsync(Incoming& in) :
     IncomingBase(in),
     _instanceCopy(_os.instance()),
-    _responseHandlerCopy(_responseHandler),
+    _responseHandlerCopy(_responseHandler->shared_from_this()), // Acquire reference on response handler
     _retriable(in.isRetriable()),
     _active(true)
 {
+#ifndef ICE_CPP11_MAPPING
     if(_retriable)
     {
-        in.setActive(*this);
+        in.setActive(this);
+    }
+#endif
+}
+
+#ifdef ICE_CPP11_MAPPING
+IncomingAsyncPtr
+IceInternal::IncomingAsync::create(Incoming& in)
+{
+    IncomingAsyncPtr self = make_shared<IncomingAsync>(in);
+    if(in.isRetriable())
+    {
+        in.setActive(self->shared_from_this());
     }
+    return self;
 }
+#endif
 
 void
 IceInternal::IncomingAsync::__deactivate(Incoming& in)
@@ -110,7 +137,7 @@ IceInternal::IncomingAsync::ice_exception(const ::std::exception& ex)
         {
             return;
         }
-    
+
         IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
         if(!_active)
         {
@@ -161,7 +188,7 @@ IceInternal::IncomingAsync::ice_exception()
         {
             return;
         }
-    
+
         IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
         if(!_active)
         {
@@ -280,7 +307,7 @@ IceInternal::IncomingAsync::__validateResponse(bool ok)
         {
             return false;
         }
-        
+
         IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
         if(!_active)
         {
@@ -291,6 +318,7 @@ IceInternal::IncomingAsync::__validateResponse(bool ok)
     return true;
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceAsync::Ice::AMD_Object_ice_invoke::AMD_Object_ice_invoke(Incoming& in) :
     IncomingAsync(in)
 {
@@ -338,3 +366,4 @@ IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const pair<const Byt
         __response();
     }
 }
+#endif
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index acf261c46b8..f558c0d78e4 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -8,11 +8,11 @@
 // **********************************************************************
 
 #include <IceUtil/ArgVector.h>
+#include <IceUtil/DisableWarnings.h>
 #include <Ice/CommunicatorI.h>
 #include <Ice/PropertiesI.h>
 #include <Ice/Initialize.h>
 #include <Ice/LocalException.h>
-#include <Ice/StreamI.h>
 #include <Ice/LoggerI.h>
 #include <Ice/Instance.h>
 #include <Ice/PluginManagerI.h>
@@ -28,19 +28,6 @@ using namespace IceInternal;
 namespace
 {
 
-pair<const Byte*, const Byte*>
-makePair(const vector<Byte>& v)
-{
-    if(v.empty())
-    {
-        return pair<const Byte*, const Byte*>(static_cast<Byte*>(0), static_cast<Byte*>(0));
-    }
-    else
-    {
-        return pair<const Byte*, const Byte*>(&v[0], &v[0] + v.size());
-    }
-}
-
 IceUtil::Mutex* globalMutex = 0;
 Ice::LoggerPtr processLogger;
 
@@ -135,13 +122,13 @@ Ice::stringSeqToArgs(const StringSeq& args, int& argc, char* argv[])
 PropertiesPtr
 Ice::createProperties()
 {
-    return new PropertiesI(IceUtil::getProcessStringConverter());
+    return PropertiesPtr(new PropertiesI(IceUtil::getProcessStringConverter()));
 }
 
 PropertiesPtr
 Ice::createProperties(StringSeq& args, const PropertiesPtr& defaults)
 {
-    return new PropertiesI(args, defaults, IceUtil::getProcessStringConverter());
+    return PropertiesPtr(new PropertiesI(args, defaults, IceUtil::getProcessStringConverter()));
 }
 
 PropertiesPtr
@@ -153,6 +140,20 @@ Ice::createProperties(int& argc, char* argv[], const PropertiesPtr& defaults)
     return properties;
 }
 
+#ifdef ICE_CPP11_MAPPING
+Ice::ThreadHookPlugin::ThreadHookPlugin(const CommunicatorPtr& communicator,
+                                        function<void()> threadStart,
+                                        function<void()> threadStop)
+{
+    if(communicator == nullptr)
+    {
+        throw PluginInitializationException(__FILE__, __LINE__, "Communicator cannot be null");
+    }
+
+    IceInternal::InstancePtr instance = IceInternal::getInstance(communicator);
+    instance->setThreadHook(move(threadStart), move(threadStop));
+}
+#else
 Ice::ThreadHookPlugin::ThreadHookPlugin(const CommunicatorPtr& communicator, const ThreadNotificationPtr& threadHook)
 {
     if(communicator == 0)
@@ -163,7 +164,7 @@ Ice::ThreadHookPlugin::ThreadHookPlugin(const CommunicatorPtr& communicator, con
     IceInternal::InstancePtr instance = IceInternal::getInstance(communicator);
     instance->setThreadHook(threadHook);
 }
-
+#endif
 void
 Ice::ThreadHookPlugin::initialize()
 {
@@ -222,7 +223,8 @@ inline void checkIceVersion(Int version)
 
 }
 
-CommunicatorPtr
+
+Ice::CommunicatorPtr
 Ice::initialize(int& argc, char* argv[], const InitializationData& initializationData, Int version)
 {
     checkIceVersion(version);
@@ -230,23 +232,21 @@ Ice::initialize(int& argc, char* argv[], const InitializationData& initializatio
     InitializationData initData = initializationData;
     initData.properties = createProperties(argc, argv, initData.properties);
 
-    CommunicatorI* communicatorI = new CommunicatorI(initData);
-    CommunicatorPtr result = communicatorI; // For exception safety.
-    communicatorI->finishSetup(argc, argv);
-    return result;
+    CommunicatorIPtr communicator = CommunicatorI::create(initData);
+    communicator->finishSetup(argc, argv);
+    return communicator;
 }
 
-CommunicatorPtr
+Ice::CommunicatorPtr
 Ice::initialize(StringSeq& args, const InitializationData& initializationData, Int version)
 {
-    CommunicatorPtr communicator;
     IceUtilInternal::ArgVector av(args);
-    communicator = initialize(av.argc, av.argv, initializationData, version);
+    CommunicatorPtr communicator = initialize(av.argc, av.argv, initializationData, version);
     args = argsToStringSeq(av.argc, av.argv);
     return communicator;
 }
 
-CommunicatorPtr
+Ice::CommunicatorPtr
 Ice::initialize(const InitializationData& initData, Int version)
 {
     //
@@ -255,109 +255,93 @@ Ice::initialize(const InitializationData& initData, Int version)
     //
     checkIceVersion(version);
 
-    CommunicatorI* communicatorI = new CommunicatorI(initData);
-    CommunicatorPtr result = communicatorI; // For exception safety.
+    CommunicatorIPtr communicator = CommunicatorI::create(initData);
     int argc = 0;
     char* argv[] = { 0 };
-    communicatorI->finishSetup(argc, argv);
-    return result;
-}
-
-InputStreamPtr
-Ice::createInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes)
-{
-    return new InputStreamI(communicator, makePair(bytes), true);
+    communicator->finishSetup(argc, argv);
+    return communicator;
 }
 
-InputStreamPtr
-Ice::createInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes, const EncodingVersion& v)
+LoggerPtr
+Ice::getProcessLogger()
 {
-    return new InputStreamI(communicator, makePair(bytes), v, true);
-}
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
 
-InputStreamPtr
-Ice::wrapInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes)
-{
-    return new InputStreamI(communicator, makePair(bytes), false);
+    if(processLogger == ICE_NULLPTR)
+    {
+       //
+       // TODO: Would be nice to be able to use process name as prefix by default.
+       //
+       processLogger = ICE_MAKE_SHARED(Ice::LoggerI, "", "", true, IceUtil::getProcessStringConverter());
+    }
+    return processLogger;
 }
 
-InputStreamPtr
-Ice::wrapInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes, const EncodingVersion& v)
+void
+Ice::setProcessLogger(const LoggerPtr& logger)
 {
-    return new InputStreamI(communicator, makePair(bytes), v, false);
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
+    processLogger = logger;
 }
 
-InputStreamPtr
-Ice::createInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes)
+void
+Ice::registerPluginFactory(const std::string& name, PluginFactory factory, bool loadOnInitialize)
 {
-    return new InputStreamI(communicator, bytes, true);
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
+    PluginManagerI::registerPluginFactory(name, factory, loadOnInitialize);
 }
 
-InputStreamPtr
-Ice::createInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes,
-                       const EncodingVersion& v)
+#ifdef ICE_CPP11_MAPPING
+Ice::CommunicatorHolder::CommunicatorHolder(shared_ptr<Communicator> communicator) :
+    _communicator(std::move(communicator))
 {
-    return new InputStreamI(communicator, bytes, v, true);
 }
 
-InputStreamPtr
-Ice::wrapInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes)
-{
-    return new InputStreamI(communicator, bytes, false);
-}
+#else
 
-InputStreamPtr
-Ice::wrapInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes,
-                     const EncodingVersion& v)
+Ice::CommunicatorHolder::CommunicatorHolder(const CommunicatorPtr& communicator) :
+    _communicator(communicator)
 {
-    return new InputStreamI(communicator, bytes, v, false);
 }
 
-OutputStreamPtr
-Ice::createOutputStream(const CommunicatorPtr& communicator)
-{
-    return new OutputStreamI(communicator);
-}
+#endif
 
-OutputStreamPtr
-Ice::createOutputStream(const CommunicatorPtr& communicator, const EncodingVersion& v)
+Ice::CommunicatorHolder::~CommunicatorHolder()
 {
-    return new OutputStreamI(communicator, v);
+    if(_communicator)
+    {
+        _communicator->destroy();
+    }
 }
 
-LoggerPtr
-Ice::getProcessLogger()
+const Ice::CommunicatorPtr&
+Ice::CommunicatorHolder::communicator() const
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
-
-    if(processLogger == 0)
-    {
-       //
-       // TODO: Would be nice to be able to use process name as prefix by default.
-       //
-       processLogger = new Ice::LoggerI("", "", true, IceUtil::getProcessStringConverter());
-    }
-    return processLogger;
+    return _communicator;
 }
 
-void
-Ice::setProcessLogger(const LoggerPtr& logger)
+Ice::CommunicatorPtr
+Ice::CommunicatorHolder::release()
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
-    processLogger = logger;
+#ifdef ICE_CPP11_MAPPING
+    return std::move(_communicator);
+#else
+    CommunicatorPtr result;
+    result.swap(_communicator);
+    return result;
+#endif
 }
 
-void
-Ice::registerPluginFactory(const std::string& name, PLUGIN_FACTORY factory, bool loadOnInitialize)
+const Ice::CommunicatorPtr&
+Ice::CommunicatorHolder::operator->() const
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
-    PluginManagerI::registerPluginFactory(name, factory, loadOnInitialize);
+    return _communicator;
 }
 
 InstancePtr
 IceInternal::getInstance(const CommunicatorPtr& communicator)
 {
-    CommunicatorI* p = dynamic_cast<CommunicatorI*>(communicator.get());
+    CommunicatorIPtr p = ICE_DYNAMIC_CAST(::Ice::CommunicatorI, communicator);
     assert(p);
     return p->_instance;
 }
@@ -365,63 +349,11 @@ IceInternal::getInstance(const CommunicatorPtr& communicator)
 IceUtil::TimerPtr
 IceInternal::getInstanceTimer(const CommunicatorPtr& communicator)
 {
-    CommunicatorI* p = dynamic_cast<CommunicatorI*>(communicator.get());
+    CommunicatorIPtr p = ICE_DYNAMIC_CAST(::Ice::CommunicatorI, communicator);
     assert(p);
     return p->_instance->timer();
 }
 
-#ifdef ICE_CPP11
-Ice::DispatcherPtr
-Ice::newDispatcher(const ::std::function<void (const DispatcherCallPtr&, const ConnectionPtr)>& cb)
-{
-    class Cpp11Dispatcher : public Dispatcher
-    {
-    public:
-
-        Cpp11Dispatcher(const ::std::function<void (const DispatcherCallPtr&, const ConnectionPtr)>& cb) :
-            _cb(cb)
-        {
-        }
-
-        virtual void dispatch(const DispatcherCallPtr& call, const ConnectionPtr& conn)
-        {
-            _cb(call, conn);
-        }
-
-    private:
-        const ::std::function<void (const DispatcherCallPtr&, const ConnectionPtr)> _cb;
-    };
-
-    return new Cpp11Dispatcher(cb);
-}
-#endif
-
-#ifdef ICE_CPP11
-Ice::BatchRequestInterceptorPtr
-Ice::newBatchRequestInterceptor(const ::std::function<void (const BatchRequest&, int, int)>& cb)
-{
-    class Cpp11BatchRequestInterceptor : public BatchRequestInterceptor
-    {
-    public:
-
-        Cpp11BatchRequestInterceptor(const ::std::function<void (const BatchRequest&, int, int)>& cb) :
-            _cb(cb)
-        {
-        }
-
-        virtual void enqueue(const BatchRequest& request, int count, int size)
-        {
-            _cb(request, count, size);
-        }
-
-    private:
-        const ::std::function<void (const BatchRequest&, int, int)> _cb;
-    };
-
-    return new Cpp11BatchRequestInterceptor(cb);
-}
-#endif
-
 Identity
 Ice::stringToIdentity(const string& s)
 {
diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp
new file mode 100644
index 00000000000..20bba90db7e
--- /dev/null
+++ b/cpp/src/Ice/InputStream.cpp
@@ -0,0 +1,2701 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceUtil/DisableWarnings.h>
+#include <Ice/InputStream.h>
+#include <Ice/DefaultsAndOverrides.h>
+#include <Ice/Instance.h>
+#include <Ice/Object.h>
+#include <Ice/Proxy.h>
+#include <Ice/ProxyFactory.h>
+#include <Ice/ValueFactory.h>
+#include <Ice/UserExceptionFactory.h>
+#include <Ice/LocalException.h>
+#include <Ice/Protocol.h>
+#include <Ice/FactoryTableInit.h>
+#include <Ice/TraceUtil.h>
+#include <Ice/TraceLevels.h>
+#include <Ice/LoggerUtil.h>
+#include <Ice/SlicedData.h>
+#include <IceUtil/StringConverter.h>
+#include <iterator>
+
+#ifndef ICE_UNALIGNED
+#   if defined(__i386) || defined(_M_IX86) || defined(__x86_64) || defined(_M_X64)
+#       define ICE_UNALIGNED
+#   endif
+#endif
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+Ice::InputStream::InputStream()
+{
+    initialize(currentEncoding);
+}
+
+Ice::InputStream::InputStream(const vector<Byte>& v) :
+    Buffer(v)
+{
+    initialize(currentEncoding);
+}
+
+Ice::InputStream::InputStream(const pair<const Byte*, const Byte*>& p) :
+    Buffer(p.first, p.second)
+{
+    initialize(currentEncoding);
+}
+
+Ice::InputStream::InputStream(Buffer& buf, bool adopt) :
+    Buffer(buf, adopt)
+{
+    initialize(currentEncoding);
+}
+
+Ice::InputStream::InputStream(const CommunicatorPtr& communicator)
+{
+    initialize(communicator);
+}
+
+Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const vector<Byte>& v) :
+    Buffer(v)
+{
+    initialize(communicator);
+}
+
+Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const pair<const Byte*, const Byte*>& p) :
+    Buffer(p.first, p.second)
+{
+    initialize(communicator);
+}
+
+Ice::InputStream::InputStream(const CommunicatorPtr& communicator, Buffer& buf, bool adopt) :
+    Buffer(buf, adopt)
+{
+    initialize(communicator);
+}
+
+Ice::InputStream::InputStream(const EncodingVersion& encoding)
+{
+    initialize(encoding);
+}
+
+Ice::InputStream::InputStream(const EncodingVersion& encoding, const vector<Byte>& v) :
+    Buffer(v)
+{
+    initialize(encoding);
+}
+
+Ice::InputStream::InputStream(const EncodingVersion& encoding, const pair<const Byte*, const Byte*>& p) :
+    Buffer(p.first, p.second)
+{
+    initialize(encoding);
+}
+
+Ice::InputStream::InputStream(const EncodingVersion& encoding, Buffer& buf, bool adopt) :
+    Buffer(buf, adopt)
+{
+    initialize(encoding);
+}
+
+Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding)
+{
+    initialize(communicator, encoding);
+}
+
+Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding,
+                              const vector<Byte>& v) :
+    Buffer(v)
+{
+    initialize(communicator, encoding);
+}
+
+Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding,
+                              const pair<const Byte*, const Byte*>& p) :
+    Buffer(p.first, p.second)
+{
+    initialize(communicator, encoding);
+}
+
+Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding,
+                              Buffer& buf, bool adopt) :
+    Buffer(buf, adopt)
+{
+    initialize(communicator, encoding);
+}
+
+Ice::InputStream::InputStream(Instance* instance, const EncodingVersion& encoding)
+{
+    initialize(instance, encoding);
+}
+
+Ice::InputStream::InputStream(Instance* instance, const EncodingVersion& encoding, Buffer& buf, bool adopt) :
+    Buffer(buf, adopt)
+{
+    initialize(instance, encoding);
+}
+
+void
+Ice::InputStream::initialize(const CommunicatorPtr& communicator)
+{
+    Instance* instance = getInstance(communicator).get();
+    initialize(instance, instance->defaultsAndOverrides()->defaultEncoding);
+}
+
+void
+Ice::InputStream::initialize(const CommunicatorPtr& communicator, const EncodingVersion& encoding)
+{
+    initialize(getInstance(communicator).get(), encoding);
+}
+
+void
+Ice::InputStream::initialize(Instance* instance, const EncodingVersion& encoding)
+{
+    initialize(encoding);
+
+    _instance = instance;
+
+    _stringConverter = _instance->getStringConverter();
+    _wstringConverter = _instance->getWstringConverter();
+
+#ifndef ICE_CPP11_MAPPING
+    _collectObjects = _instance->collectObjects();
+#endif
+    _traceSlicing = _instance->traceLevels()->slicing > 0;
+}
+
+void
+Ice::InputStream::initialize(const EncodingVersion& encoding)
+{
+    _instance = 0;
+    _encoding = encoding;
+    _currentEncaps = 0;
+#ifndef ICE_CPP11_MAPPING
+    _collectObjects = false;
+#endif
+    _traceSlicing = false;
+    _closure = 0;
+    _sliceValues = true;
+    _startSeq = -1;
+    _minSeqSize = 0;
+}
+
+void
+Ice::InputStream::clear()
+{
+    while(_currentEncaps && _currentEncaps != &_preAllocatedEncaps)
+    {
+        Encaps* oldEncaps = _currentEncaps;
+        _currentEncaps = _currentEncaps->previous;
+        delete oldEncaps;
+    }
+
+    _startSeq = -1;
+    _sliceValues = true;
+}
+
+void
+Ice::InputStream::setStringConverters(const IceUtil::StringConverterPtr& sc, const IceUtil::WstringConverterPtr& wsc)
+{
+    _stringConverter = sc;
+    _wstringConverter = wsc;
+}
+
+void
+Ice::InputStream::setValueFactoryManager(const ValueFactoryManagerPtr& vfm)
+{
+    _valueFactoryManager = vfm;
+}
+
+void
+Ice::InputStream::setLogger(const LoggerPtr& logger)
+{
+    _logger = logger;
+}
+
+void
+#ifdef ICE_CPP11_MAPPING
+Ice::InputStream::setCompactIdResolver(std::function<std::string(int)> r)
+#else
+Ice::InputStream::setCompactIdResolver(const CompactIdResolverPtr& r)
+#endif
+{
+    _compactIdResolver = r;
+}
+
+#ifndef ICE_CPP11_MAPPING
+void
+Ice::InputStream::setCollectObjects(bool b)
+{
+    _collectObjects = b;
+}
+#endif
+
+void
+Ice::InputStream::setSliceValues(bool b)
+{
+    _sliceValues = b;
+}
+
+void
+Ice::InputStream::setTraceSlicing(bool b)
+{
+    _traceSlicing = b;
+}
+
+void*
+Ice::InputStream::getClosure() const
+{
+    return _closure;
+}
+
+void*
+Ice::InputStream::setClosure(void* p)
+{
+    void* prev = _closure;
+    _closure = p;
+    return prev;
+}
+
+void
+Ice::InputStream::swap(InputStream& other)
+{
+    swapBuffer(other);
+
+    std::swap(_instance, other._instance);
+    std::swap(_encoding, other._encoding);
+#ifndef ICE_CPP11_MAPPING
+    std::swap(_collectObjects, other._collectObjects);
+#endif
+    std::swap(_traceSlicing, other._traceSlicing);
+    std::swap(_closure, other._closure);
+    std::swap(_sliceValues, other._sliceValues);
+
+    //
+    // Swap is never called for streams that have encapsulations being read. However,
+    // encapsulations might still be set in case unmarshaling failed. We just
+    // reset the encapsulations if there are still some set.
+    //
+    resetEncapsulation();
+    other.resetEncapsulation();
+
+    std::swap(_startSeq, other._startSeq);
+    std::swap(_minSeqSize, other._minSeqSize);
+
+    std::swap(_stringConverter, other._stringConverter);
+    std::swap(_wstringConverter, other._wstringConverter);
+    std::swap(_valueFactoryManager, other._valueFactoryManager);
+    std::swap(_logger, other._logger);
+    std::swap(_compactIdResolver, other._compactIdResolver);
+}
+
+void
+Ice::InputStream::resetEncapsulation()
+{
+    while(_currentEncaps && _currentEncaps != &_preAllocatedEncaps)
+    {
+        Encaps* oldEncaps = _currentEncaps;
+        _currentEncaps = _currentEncaps->previous;
+        delete oldEncaps;
+    }
+
+    _preAllocatedEncaps.reset();
+}
+
+Int
+Ice::InputStream::getEncapsulationSize()
+{
+    assert(_currentEncaps);
+    return _currentEncaps->sz - static_cast<Int>(sizeof(Int)) - 2;
+}
+
+EncodingVersion
+Ice::InputStream::skipEncapsulation()
+{
+    Int sz;
+    read(sz);
+    if(sz < 6)
+    {
+        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
+    }
+    if(i - sizeof(Int) + sz > b.end())
+    {
+        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
+    }
+    EncodingVersion encoding;
+    read(encoding.major);
+    read(encoding.minor);
+    i += sz - sizeof(Int) - 2;
+    return encoding;
+}
+
+void
+Ice::InputStream::readPendingValues()
+{
+    if(_currentEncaps && _currentEncaps->decoder)
+    {
+        _currentEncaps->decoder->readPendingValues();
+    }
+    else if(getEncoding() == Ice::Encoding_1_0)
+    {
+        //
+        // If using the 1.0 encoding and no instances were read, we
+        // still read an empty sequence of pending instances if
+        // requested (i.e.: if this is called).
+        //
+        // This is required by the 1.0 encoding, even if no instances
+        // are written we do marshal an empty sequence if marshaled
+        // data types use classes.
+        //
+        skipSize();
+    }
+}
+
+Int
+Ice::InputStream::readAndCheckSeqSize(int minSize)
+{
+    Int sz = readSize();
+
+    if(sz == 0)
+    {
+        return sz;
+    }
+
+    //
+    // The _startSeq variable points to the start of the sequence for which
+    // we expect to read at least _minSeqSize bytes from the stream.
+    //
+    // If not initialized or if we already read more data than _minSeqSize,
+    // we reset _startSeq and _minSeqSize for this sequence (possibly a
+    // top-level sequence or enclosed sequence it doesn't really matter).
+    //
+    // Otherwise, we are reading an enclosed sequence and we have to bump
+    // _minSeqSize by the minimum size that this sequence will  require on
+    // the stream.
+    //
+    // The goal of this check is to ensure that when we start un-marshalling
+    // a new sequence, we check the minimal size of this new sequence against
+    // the estimated remaining buffer size. This estimatation is based on
+    // the minimum size of the enclosing sequences, it's _minSeqSize.
+    //
+    if(_startSeq == -1 || i > (b.begin() + _startSeq + _minSeqSize))
+    {
+        _startSeq = static_cast<int>(i - b.begin());
+        _minSeqSize = sz * minSize;
+    }
+    else
+    {
+        _minSeqSize += sz * minSize;
+    }
+
+    //
+    // If there isn't enough data to read on the stream for the sequence (and
+    // possibly enclosed sequences), something is wrong with the marshalled
+    // data: it's claiming having more data that what is possible to read.
+    //
+    if(_startSeq + _minSeqSize > static_cast<int>(b.size()))
+    {
+        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
+    }
+
+    return sz;
+}
+
+void
+Ice::InputStream::readBlob(vector<Byte>& v, Int sz)
+{
+    if(sz > 0)
+    {
+        if(b.end() - i < sz)
+        {
+            throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
+        }
+        vector<Byte>(i, i + sz).swap(v);
+        i += sz;
+    }
+    else
+    {
+        v.clear();
+    }
+}
+
+void
+Ice::InputStream::read(std::vector<Ice::Byte>& v)
+{
+    std::pair<const Ice::Byte*, const Ice::Byte*> p;
+    read(p);
+    if(p.first != p.second)
+    {
+        v.resize(static_cast<Ice::Int>(p.second - p.first));
+        copy(p.first, p.second, v.begin());
+    }
+    else
+    {
+        v.clear();
+    }
+}
+
+void
+Ice::InputStream::read(pair<const Byte*, const Byte*>& v)
+{
+    Int sz = readAndCheckSeqSize(1);
+    if(sz > 0)
+    {
+        v.first = i;
+        v.second = i + sz;
+        i += sz;
+    }
+    else
+    {
+        v.first = v.second = i;
+    }
+}
+
+void
+Ice::InputStream::read(vector<bool>& v)
+{
+    Int sz = readAndCheckSeqSize(1);
+    if(sz > 0)
+    {
+        v.resize(sz);
+        copy(i, i + sz, v.begin());
+        i += sz;
+    }
+    else
+    {
+        v.clear();
+    }
+}
+
+namespace
+{
+
+template<size_t boolSize>
+struct ReadBoolHelper
+{
+    static bool* read(pair<const bool*, const bool*>& v, Int sz, InputStream::Container::iterator& i)
+    {
+        bool* array = new bool[sz];
+        for(int idx = 0; idx < sz; ++idx)
+        {
+            array[idx] = static_cast<bool>(*(i + idx));
+        }
+        v.first = array;
+        v.second = array + sz;
+        return array;
+    }
+};
+
+template<>
+struct ReadBoolHelper<1>
+{
+    static bool* read(pair<const bool*, const bool*>& v, Int sz, InputStream::Container::iterator& i)
+    {
+        v.first = reinterpret_cast<bool*>(i);
+        v.second = reinterpret_cast<bool*>(i) + sz;
+        return 0;
+    }
+};
+
+}
+
+#ifdef ICE_CPP11_MAPPING
+void
+Ice::InputStream::read(pair<const bool*, const bool*>& v)
+{
+    Int sz = readAndCheckSeqSize(1);
+    if(sz > 0)
+    {
+        auto boolArray = ReadBoolHelper<sizeof(bool)>::read(v, sz, i);
+        if(boolArray)
+        {
+            _deleters.push_back([boolArray] { delete[] boolArray; });
+        }
+        i += sz;
+    }
+    else
+    {
+        v.first = v.second = reinterpret_cast<bool*>(i);
+    }
+}
+
+#else
+void
+Ice::InputStream::read(pair<const bool*, const bool*>& v, IceUtil::ScopedArray<bool>& result)
+{
+    Int sz = readAndCheckSeqSize(1);
+    if(sz > 0)
+    {
+        result.reset(ReadBoolHelper<sizeof(bool)>::read(v, sz, i));
+        i += sz;
+    }
+    else
+    {
+        result.reset();
+        v.first = v.second = reinterpret_cast<bool*>(i);
+    }
+}
+#endif
+
+void
+Ice::InputStream::read(Short& v)
+{
+    if(b.end() - i < static_cast<int>(sizeof(Short)))
+    {
+        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
+    }
+    const Byte* src = &(*i);
+    i += sizeof(Short);
+#ifdef ICE_BIG_ENDIAN
+    Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Short) - 1;
+    *dest-- = *src++;
+    *dest = *src;
+#else
+    Byte* dest = reinterpret_cast<Byte*>(&v);
+    *dest++ = *src++;
+    *dest = *src;
+#endif
+}
+
+void
+Ice::InputStream::read(vector<Short>& v)
+{
+    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Short)));
+    if(sz > 0)
+    {
+        Container::iterator begin = i;
+        i += sz * static_cast<int>(sizeof(Short));
+        v.resize(sz);
+#ifdef ICE_BIG_ENDIAN
+        const Byte* src = &(*begin);
+        Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Short) - 1;
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest-- = *src++;
+            *dest-- = *src++;
+            dest += 2 * sizeof(Short);
+        }
+#else
+        copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
+#endif
+    }
+    else
+    {
+        v.clear();
+    }
+}
+
+#ifdef ICE_CPP11_MAPPING
+void
+Ice::InputStream::read(pair<const short*, const short*>& v)
+#else
+void
+Ice::InputStream::read(pair<const Short*, const Short*>& v, IceUtil::ScopedArray<Short>& result)
+#endif
+{
+    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Short)));
+    if(sz > 0)
+    {
+#ifdef ICE_UNALIGNED
+        v.first = reinterpret_cast<Short*>(i);
+        i += sz * static_cast<int>(sizeof(Short));
+        v.second = reinterpret_cast<Short*>(i);
+#else
+#  ifdef ICE_CPP11_MAPPING
+        auto result = new short[sz];
+        _deleters.push_back([result] { delete[] result; });
+        v.first = result;
+        v.second = result + sz;
+#  else
+        result.reset(new Short[sz]);
+        v.first = result.get();
+        v.second = result.get() + sz;
+#   endif
+
+        Container::iterator begin = i;
+        i += sz * static_cast<int>(sizeof(Short));
+#  ifdef ICE_BIG_ENDIAN
+        const Byte* src = &(*begin);
+        Byte* dest = reinterpret_cast<Byte*>(&result[0]) + sizeof(Short) - 1;
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest-- = *src++;
+            *dest-- = *src++;
+            dest += 2 * sizeof(Short);
+        }
+#  else
+        copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
+#  endif
+#endif
+    }
+    else
+    {
+#ifndef ICE_CPP11_MAPPING
+        result.reset();
+#endif
+        v.first = v.second = 0;
+    }
+}
+
+void
+Ice::InputStream::read(vector<Int>& v)
+{
+    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Int)));
+    if(sz > 0)
+    {
+        Container::iterator begin = i;
+        i += sz * static_cast<int>(sizeof(Int));
+        v.resize(sz);
+#ifdef ICE_BIG_ENDIAN
+        const Byte* src = &(*begin);
+        Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Int) - 1;
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            dest += 2 * sizeof(Int);
+        }
+#else
+        copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
+#endif
+    }
+    else
+    {
+        v.clear();
+    }
+}
+
+#ifdef ICE_CPP11_MAPPING
+void
+Ice::InputStream::read(pair<const Int*, const Int*>& v)
+#else
+void
+Ice::InputStream::read(pair<const Int*, const Int*>& v, ::IceUtil::ScopedArray<Int>& result)
+#endif
+{
+    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Int)));
+    if(sz > 0)
+    {
+#ifdef ICE_UNALIGNED
+        v.first = reinterpret_cast<Int*>(i);
+        i += sz * static_cast<int>(sizeof(Int));
+        v.second = reinterpret_cast<Int*>(i);
+#else
+
+#  ifdef ICE_CPP11_MAPPING
+        auto result = new int[sz];
+        _deleters.push_back([result] { delete[] result; });
+        v.first = result;
+        v.second = result + sz;
+#  else
+        result.reset(new Int[sz]);
+        v.first = result.get();
+        v.second = result.get() + sz;
+#  endif
+
+        Container::iterator begin = i;
+        i += sz * static_cast<int>(sizeof(Int));
+#  ifdef ICE_BIG_ENDIAN
+        const Byte* src = &(*begin);
+        Byte* dest = reinterpret_cast<Byte*>(&result[0]) + sizeof(Int) - 1;
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            dest += 2 * sizeof(Int);
+        }
+#  else
+        copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
+#  endif
+#endif
+    }
+    else
+    {
+#ifndef ICE_CPP11_MAPPING
+        result.reset();
+#endif
+        v.first = v.second = 0;
+    }
+}
+
+void
+Ice::InputStream::read(Long& v)
+{
+    if(b.end() - i < static_cast<int>(sizeof(Long)))
+    {
+        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
+    }
+    const Byte* src = &(*i);
+    i += sizeof(Long);
+#ifdef ICE_BIG_ENDIAN
+    Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Long) - 1;
+    *dest-- = *src++;
+    *dest-- = *src++;
+    *dest-- = *src++;
+    *dest-- = *src++;
+    *dest-- = *src++;
+    *dest-- = *src++;
+    *dest-- = *src++;
+    *dest = *src;
+#else
+    Byte* dest = reinterpret_cast<Byte*>(&v);
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest = *src;
+#endif
+}
+
+void
+Ice::InputStream::read(vector<Long>& v)
+{
+    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Long)));
+    if(sz > 0)
+    {
+        Container::iterator begin = i;
+        i += sz * static_cast<int>(sizeof(Long));
+        v.resize(sz);
+#ifdef ICE_BIG_ENDIAN
+        const Byte* src = &(*begin);
+        Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Long) - 1;
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            dest += 2 * sizeof(Long);
+        }
+#else
+        copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
+#endif
+    }
+    else
+    {
+        v.clear();
+    }
+}
+
+#ifdef ICE_CPP11_MAPPING
+void
+Ice::InputStream::read(pair<const Long*, const Long*>& v)
+#else
+void
+Ice::InputStream::read(pair<const Long*, const Long*>& v, IceUtil::ScopedArray<Long>& result)
+#endif
+{
+    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Long)));
+    if(sz > 0)
+    {
+#ifdef ICE_UNALIGNED
+        v.first = reinterpret_cast<Long*>(i);
+        i += sz * static_cast<int>(sizeof(Long));
+        v.second = reinterpret_cast<Long*>(i);
+#else
+
+#  ifdef ICE_CPP11_MAPPING
+        auto result = new long long[sz];
+        _deleters.push_back([result] { delete[] result; });
+        v.first = result;
+        v.second = result + sz;
+#  else
+        result.reset(new Long[sz]);
+        v.first = result.get();
+        v.second = result.get() + sz;
+#  endif
+
+        Container::iterator begin = i;
+        i += sz * static_cast<int>(sizeof(Long));
+#  ifdef ICE_BIG_ENDIAN
+        const Byte* src = &(*begin);
+        Byte* dest = reinterpret_cast<Byte*>(&result[0]) + sizeof(Long) - 1;
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            dest += 2 * sizeof(Long);
+        }
+#  else
+        copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
+#  endif
+#endif
+    }
+    else
+    {
+#ifndef ICE_CPP11_MAPPING
+        result.reset();
+#endif
+        v.first = v.second = 0;
+    }
+}
+
+void
+Ice::InputStream::read(Float& v)
+{
+    if(b.end() - i < static_cast<int>(sizeof(Float)))
+    {
+        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
+    }
+    const Byte* src = &(*i);
+    i += sizeof(Float);
+#ifdef ICE_BIG_ENDIAN
+    Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Float) - 1;
+    *dest-- = *src++;
+    *dest-- = *src++;
+    *dest-- = *src++;
+    *dest = *src;
+#else
+    Byte* dest = reinterpret_cast<Byte*>(&v);
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest = *src;
+#endif
+}
+
+void
+Ice::InputStream::read(vector<Float>& v)
+{
+    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Float)));
+    if(sz > 0)
+    {
+        Container::iterator begin = i;
+        i += sz * static_cast<int>(sizeof(Float));
+        v.resize(sz);
+#ifdef ICE_BIG_ENDIAN
+        const Byte* src = &(*begin);
+        Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Float) - 1;
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            dest += 2 * sizeof(Float);
+        }
+#else
+        copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
+#endif
+    }
+    else
+    {
+        v.clear();
+    }
+}
+
+#ifdef ICE_CPP11_MAPPING
+void
+Ice::InputStream::read(pair<const Float*, const Float*>& v)
+#else
+void
+Ice::InputStream::read(pair<const Float*, const Float*>& v, IceUtil::ScopedArray<Float>& result)
+#endif
+{
+    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Float)));
+    if(sz > 0)
+    {
+#ifdef ICE_UNALIGNED
+        v.first = reinterpret_cast<Float*>(i);
+        i += sz * static_cast<int>(sizeof(Float));
+        v.second = reinterpret_cast<Float*>(i);
+#else
+
+#  ifdef ICE_CPP11_MAPPING
+        auto result = new float[sz];
+        _deleters.push_back([result] { delete[] result; });
+        v.first = result;
+        v.second = result + sz;
+#  else
+        result.reset(new Float[sz]);
+        v.first = result.get();
+        v.second = result.get() + sz;
+#  endif
+
+        Container::iterator begin = i;
+        i += sz * static_cast<int>(sizeof(Float));
+#  ifdef ICE_BIG_ENDIAN
+        const Byte* src = &(*begin);
+        Byte* dest = reinterpret_cast<Byte*>(&result[0]) + sizeof(Float) - 1;
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            dest += 2 * sizeof(Float);
+        }
+#  else
+        copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
+#  endif
+#endif
+    }
+    else
+    {
+#ifndef ICE_CPP11_MAPPING
+        result.reset();
+#endif
+        v.first = v.second = 0;
+    }
+}
+
+void
+Ice::InputStream::read(Double& v)
+{
+    if(b.end() - i < static_cast<int>(sizeof(Double)))
+    {
+        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
+    }
+    const Byte* src = &(*i);
+    i += sizeof(Double);
+#ifdef ICE_BIG_ENDIAN
+    Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Double) - 1;
+    *dest-- = *src++;
+    *dest-- = *src++;
+    *dest-- = *src++;
+    *dest-- = *src++;
+    *dest-- = *src++;
+    *dest-- = *src++;
+    *dest-- = *src++;
+    *dest = *src;
+#else
+    Byte* dest = reinterpret_cast<Byte*>(&v);
+#  if defined(ICE_LITTLEBYTE_BIGWORD)
+    dest[4] = *src++;
+    dest[5] = *src++;
+    dest[6] = *src++;
+    dest[7] = *src++;
+    dest[0] = *src++;
+    dest[1] = *src++;
+    dest[2] = *src++;
+    dest[3] = *src;
+#  else
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest = *src;
+#  endif
+#endif
+}
+
+void
+Ice::InputStream::read(vector<Double>& v)
+{
+    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Double)));
+    if(sz > 0)
+    {
+        Container::iterator begin = i;
+        i += sz * static_cast<int>(sizeof(Double));
+        v.resize(sz);
+#ifdef ICE_BIG_ENDIAN
+        const Byte* src = &(*begin);
+        Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Double) - 1;
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            dest += 2 * sizeof(Double);
+        }
+#elif defined(ICE_LITTLEBYTE_BIGWORD)
+        const Byte* src = &(*begin);
+        Byte* dest = reinterpret_cast<Byte*>(&v[0]);
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            dest[4] = *src++;
+            dest[5] = *src++;
+            dest[6] = *src++;
+            dest[7] = *src++;
+            dest[0] = *src++;
+            dest[1] = *src++;
+            dest[2] = *src++;
+            dest[3] = *src++;
+            dest += sizeof(Double);
+        }
+#else
+        copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
+#endif
+    }
+    else
+    {
+        v.clear();
+    }
+}
+
+
+#ifdef ICE_CPP11_MAPPING
+void
+Ice::InputStream::read(pair<const Double*, const Double*>& v)
+#else
+void
+Ice::InputStream::read(pair<const Double*, const Double*>& v, IceUtil::ScopedArray<Double>& result)
+#endif
+{
+    Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Double)));
+    if(sz > 0)
+    {
+#ifdef ICE_UNALIGNED
+        v.first = reinterpret_cast<Double*>(i);
+        i += sz * static_cast<int>(sizeof(Double));
+        v.second = reinterpret_cast<Double*>(i);
+#else
+
+#  ifdef ICE_CPP11_MAPPING
+        auto result = new double[sz];
+        _deleters.push_back([result] { delete[] result; });
+        v.first = result;
+        v.second = result + sz;
+#  else
+        result.reset(new Double[sz]);
+        v.first = result.get();
+        v.second = result.get() + sz;
+#  endif
+
+        Container::iterator begin = i;
+        i += sz * static_cast<int>(sizeof(Double));
+#  ifdef ICE_BIG_ENDIAN
+        const Byte* src = &(*begin);
+        Byte* dest = reinterpret_cast<Byte*>(&result[0]) + sizeof(Double) - 1;
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            *dest-- = *src++;
+            dest += 2 * sizeof(Double);
+        }
+#  elif defined(ICE_LITTLEBYTE_BIGWORD)
+        const Byte* src = &(*begin);
+        Byte* dest = reinterpret_cast<Byte*>(&result[0]);
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            dest[4] = *src++;
+            dest[5] = *src++;
+            dest[6] = *src++;
+            dest[7] = *src++;
+            dest[0] = *src++;
+            dest[1] = *src++;
+            dest[2] = *src++;
+            dest[3] = *src++;
+            dest += sizeof(Double);
+        }
+
+#  else
+        copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
+#  endif
+#endif
+    }
+    else
+    {
+#ifndef ICE_CPP11_MAPPING
+        result.reset();
+#endif
+        v.first = v.second = 0;
+    }
+}
+
+void
+Ice::InputStream::read(std::string& v, bool convert)
+{
+    Int sz = readSize();
+    if(sz > 0)
+    {
+        if(b.end() - i < sz)
+        {
+            throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
+        }
+        if(convert && _stringConverter)
+        {
+            readConverted(v, sz);
+        }
+        else
+        {
+            string(reinterpret_cast<const char*>(&*i), reinterpret_cast<const char*>(&*i) + sz).swap(v);
+        }
+        i += sz;
+    }
+    else
+    {
+        v.clear();
+    }
+}
+
+#ifdef ICE_CPP11_MAPPING
+void
+Ice::InputStream::read(const char*& vdata, size_t& vsize, bool convert)
+{
+    int sz = readSize();
+    if(sz > 0)
+    {
+        if(b.end() - i < sz)
+        {
+            throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
+        }
+
+        if(convert == false || !_stringConverter)
+        {
+            vdata = reinterpret_cast<const char*>(&*i);
+            vsize = static_cast<size_t>(sz);
+            i += sz;
+        }
+        else
+        {
+            string converted;
+            readConverted(converted, sz);
+            if(converted.size() <= static_cast<size_t>(sz))
+            {
+                //
+                // Write converted string directly into buffer
+                //
+                std::memcpy(i, converted.data(), converted.size());
+                vdata = reinterpret_cast<const char*>(&*i);
+                vsize = converted.size();
+            }
+            else
+            {
+                auto holder = new string(std::move(converted));
+                _deleters.push_back([holder] { delete holder; });
+                vdata = holder->data();
+                vsize = holder->size();
+            }
+            i += sz;
+        }
+    }
+    else
+    {
+        vdata = 0;
+        vsize = 0;
+    }
+}
+
+#else
+
+void
+Ice::InputStream::read(const char*& vdata, size_t& vsize)
+{
+    Int sz = readSize();
+    if(sz > 0)
+    {
+        if(b.end() - i < sz)
+        {
+            throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
+        }
+
+        vdata = reinterpret_cast<const char*>(&*i);
+        vsize = static_cast<size_t>(sz);
+        i += sz;
+    }
+    else
+    {
+        vdata = 0;
+        vsize = 0;
+    }
+}
+
+void
+Ice::InputStream::read(const char*& vdata, size_t& vsize, string& holder)
+{
+    if(!_stringConverter)
+    {
+        holder.clear();
+        read(vdata, vsize);
+    }
+    else
+    {
+        Int sz = readSize();
+        if(sz > 0)
+        {
+            if(b.end() - i < sz)
+            {
+                throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
+            }
+
+            readConverted(holder, sz);
+            i += sz;
+            vdata = holder.data();
+            vsize = holder.size();
+        }
+        else
+        {
+            holder.clear();
+            vdata = 0;
+            vsize = 0;
+        }
+    }
+}
+#endif
+
+void
+Ice::InputStream::readConverted(string& v, int sz)
+{
+    if(!_stringConverter)
+    {
+        throw MarshalException(__FILE__, __LINE__, "no string converter provided");
+    }
+
+    try
+    {
+        _stringConverter->fromUTF8(i, i + sz, v);
+    }
+    catch(const IceUtil::IllegalConversionException& ex)
+    {
+        throw StringConversionException(__FILE__, __LINE__, ex.reason());
+    }
+}
+
+void
+Ice::InputStream::read(vector<string>& v, bool convert)
+{
+    Int sz = readAndCheckSeqSize(1);
+    if(sz > 0)
+    {
+        v.resize(sz);
+        for(int j = 0; j < sz; ++j)
+        {
+            read(v[j], convert);
+        }
+    }
+    else
+    {
+       v.clear();
+    }
+}
+
+void
+Ice::InputStream::read(wstring& v)
+{
+    if(!_wstringConverter)
+    {
+        throw MarshalException(__FILE__, __LINE__, "no wstring converter provided");
+    }
+
+    Int sz = readSize();
+    if(sz > 0)
+    {
+        if(b.end() - i < sz)
+        {
+            throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
+        }
+
+        try
+        {
+            _wstringConverter->fromUTF8(i, i + sz, v);
+            i += sz;
+        }
+        catch(const IceUtil::IllegalConversionException& ex)
+        {
+            throw StringConversionException(__FILE__, __LINE__, ex.reason());
+        }
+    }
+    else
+    {
+        v.clear();
+    }
+}
+
+void
+Ice::InputStream::read(vector<wstring>& v)
+{
+    Int sz = readAndCheckSeqSize(1);
+    if(sz > 0)
+    {
+        v.resize(sz);
+        for(int j = 0; j < sz; ++j)
+        {
+            read(v[j]);
+        }
+    }
+    else
+    {
+       v.clear();
+    }
+}
+
+#ifdef ICE_CPP11_MAPPING
+shared_ptr<ObjectPrx>
+Ice::InputStream::readProxy()
+{
+    if(!_instance)
+    {
+        throw MarshalException(__FILE__, __LINE__, "cannot unmarshal a proxy without a communicator");
+    }
+
+    return _instance->proxyFactory()->streamToProxy(this);
+}
+#else
+void
+Ice::InputStream::read(ObjectPrx& v)
+{
+    if(!_instance)
+    {
+        throw MarshalException(__FILE__, __LINE__, "cannot unmarshal a proxy without a communicator");
+    }
+
+    v = _instance->proxyFactory()->streamToProxy(this);
+}
+#endif
+
+Int
+Ice::InputStream::readEnum(Int maxValue)
+{
+    if(getEncoding() == Encoding_1_0)
+    {
+        if(maxValue < 127)
+        {
+            Byte value;
+            read(value);
+            return value;
+        }
+        else if(maxValue < 32767)
+        {
+            Short value;
+            read(value);
+            return value;
+        }
+        else
+        {
+            Int value;
+            read(value);
+            return value;
+        }
+    }
+    else
+    {
+        return readSize();
+    }
+}
+
+void
+Ice::InputStream::throwException(const UserExceptionFactoryPtr& factory)
+{
+    initEncaps();
+    _currentEncaps->decoder->throwException(factory);
+}
+
+bool
+Ice::InputStream::readOptImpl(Int readTag, OptionalFormat expectedFormat)
+{
+    if(getEncoding() == Encoding_1_0)
+    {
+        return false; // Optional members aren't supported with the 1.0 encoding.
+    }
+
+    while(true)
+    {
+        if(i >= b.begin() + _currentEncaps->start + _currentEncaps->sz)
+        {
+            return false; // End of encapsulation also indicates end of optionals.
+        }
+
+        Byte v;
+        read(v);
+        if(v == OPTIONAL_END_MARKER)
+        {
+            --i; // Rewind
+            return false;
+        }
+
+        OptionalFormat format = static_cast<OptionalFormat>(v & 0x07); // First 3 bits.
+        Int tag = static_cast<Int>(v >> 3);
+        if(tag == 30)
+        {
+            tag = readSize();
+        }
+
+        if(tag > readTag)
+        {
+            i -= tag < 30 ? 1 : (tag < 255 ? 2 : 6); // Rewind
+            return false; // No optional data members with the requested tag.
+        }
+        else if(tag < readTag)
+        {
+            skipOptional(format); // Skip optional data members
+        }
+        else
+        {
+            if(format != expectedFormat)
+            {
+                ostringstream os;
+                os << "invalid optional data member `" << tag << "': unexpected format";
+                throw MarshalException(__FILE__, __LINE__, os.str());
+            }
+            return true;
+        }
+    }
+    return true; // Keep the compiler happy.
+}
+
+void
+Ice::InputStream::skipOptional(OptionalFormat type)
+{
+    switch(type)
+    {
+    case Ice::OptionalFormatF1:
+    {
+        skip(1);
+        break;
+    }
+    case Ice::OptionalFormatF2:
+    {
+        skip(2);
+        break;
+    }
+    case Ice::OptionalFormatF4:
+    {
+        skip(4);
+        break;
+    }
+    case Ice::OptionalFormatF8:
+    {
+        skip(8);
+        break;
+    }
+    case Ice::OptionalFormatSize:
+    {
+        skipSize();
+        break;
+    }
+    case Ice::OptionalFormatVSize:
+    {
+        skip(readSize());
+        break;
+    }
+    case Ice::OptionalFormatFSize:
+    {
+        Int sz;
+        read(sz);
+        if(sz < 0)
+        {
+            throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
+        }
+        skip(sz);
+        break;
+    }
+    case Ice::OptionalFormatClass:
+    {
+        read(0, 0);
+        break;
+    }
+    }
+}
+
+void
+Ice::InputStream::skipOptionals()
+{
+    //
+    // Skip remaining un-read optional members.
+    //
+    while(true)
+    {
+        if(i >= b.begin() + _currentEncaps->start + _currentEncaps->sz)
+        {
+            return; // End of encapsulation also indicates end of optionals.
+        }
+
+        Byte v;
+        read(v);
+        if(v == OPTIONAL_END_MARKER)
+        {
+            return;
+        }
+
+        OptionalFormat format = static_cast<OptionalFormat>(v & 0x07); // Read first 3 bits.
+        if(static_cast<Int>(v >> 3) == 30)
+        {
+            skipSize();
+        }
+        skipOptional(format);
+    }
+}
+
+void
+Ice::InputStream::throwUnmarshalOutOfBoundsException(const char* file, int line)
+{
+    throw UnmarshalOutOfBoundsException(file, line);
+}
+
+void
+Ice::InputStream::throwEncapsulationException(const char* file, int line)
+{
+    throw EncapsulationException(file, line);
+}
+
+string
+Ice::InputStream::resolveCompactId(int id) const
+{
+    string type;
+
+#ifdef ICE_CPP11_MAPPING
+    function<string(int)> resolver = compactIdResolver();
+#else
+    CompactIdResolverPtr resolver = compactIdResolver();
+#endif
+
+    if(resolver)
+    {
+        try
+        {
+#ifdef ICE_CPP11_MAPPING
+            type = resolver(id);
+#else
+            type = resolver->resolve(id);
+#endif
+        }
+        catch(const LocalException&)
+        {
+            throw;
+        }
+        catch(const std::exception& ex)
+        {
+            ostringstream ostr;
+            ostr << "exception in CompactIdResolver for ID " << id;
+            string msg = ostr.str();
+            string what = ex.what();
+            if(!what.empty())
+            {
+                msg += ":\n" + what;
+            }
+            throw MarshalException(__FILE__, __LINE__, msg);
+        }
+        catch(...)
+        {
+            ostringstream ostr;
+            ostr << "unknown exception in CompactIdResolver for ID " << id;
+            throw MarshalException(__FILE__, __LINE__, ostr.str());
+        }
+    }
+
+    return type;
+}
+
+void
+Ice::InputStream::postUnmarshal(const ValuePtr& v) const
+{
+    try
+    {
+#ifndef ICE_CPP11_MAPPING
+        if(_collectObjects)
+        {
+            v->ice_collectable(true);
+        }
+#endif
+        v->ice_postUnmarshal();
+    }
+    catch(const std::exception& ex)
+    {
+        if(logger())
+        {
+            Warning out(logger());
+            out << "std::exception raised by ice_postUnmarshal:\n" << ex;
+        }
+    }
+    catch(...)
+    {
+        if(logger())
+        {
+            Warning out(logger());
+            out << "unknown exception raised by ice_postUnmarshal";
+        }
+    }
+}
+
+void
+Ice::InputStream::traceSkipSlice(const string& typeId, SliceType sliceType) const
+{
+    if(_traceSlicing && logger())
+    {
+        traceSlicing(sliceType == ExceptionSlice ? "exception" : "object", typeId, "Slicing", logger());
+    }
+}
+
+ValueFactoryManagerPtr
+Ice::InputStream::valueFactoryManager() const
+{
+    if(_valueFactoryManager)
+    {
+        return _valueFactoryManager;
+    }
+    else if(_instance)
+    {
+        return _instance->initializationData().valueFactoryManager;
+    }
+
+    return 0;
+}
+
+LoggerPtr
+Ice::InputStream::logger() const
+{
+    if(_logger)
+    {
+        return _logger;
+    }
+    else if(_instance)
+    {
+        return _instance->initializationData().logger;
+    }
+
+    return 0;
+}
+
+#ifdef ICE_CPP11_MAPPING
+function<string(int)>
+Ice::InputStream::compactIdResolver() const
+{
+    if(_compactIdResolver)
+    {
+        return _compactIdResolver;
+    }
+    else if(_instance)
+    {
+        return _instance->initializationData().compactIdResolver;
+    }
+
+    return nullptr;
+}
+#else
+CompactIdResolverPtr
+Ice::InputStream::compactIdResolver() const
+{
+    if(_compactIdResolver)
+    {
+        return _compactIdResolver;
+    }
+    else if(_instance)
+    {
+        return _instance->initializationData().compactIdResolver;
+    }
+
+    return 0;
+}
+#endif
+
+void
+Ice::InputStream::initEncaps()
+{
+    if(!_currentEncaps) // Lazy initialization.
+    {
+        _currentEncaps = &_preAllocatedEncaps;
+        _currentEncaps->encoding = _encoding;
+        _currentEncaps->sz = static_cast<Ice::Int>(b.size());
+    }
+
+    if(!_currentEncaps->decoder) // Lazy initialization.
+    {
+        ValueFactoryManagerPtr vfm = valueFactoryManager();
+        if(_currentEncaps->encoding == Encoding_1_0)
+        {
+            _currentEncaps->decoder = new EncapsDecoder10(this, _currentEncaps, _sliceValues, vfm);
+        }
+        else
+        {
+            _currentEncaps->decoder = new EncapsDecoder11(this, _currentEncaps, _sliceValues, vfm);
+        }
+    }
+}
+
+Ice::InputStream::EncapsDecoder::~EncapsDecoder()
+{
+    // Out of line to avoid weak vtable
+}
+
+string
+Ice::InputStream::EncapsDecoder::readTypeId(bool isIndex)
+{
+    if(isIndex)
+    {
+        Int index = _stream->readSize();
+        TypeIdMap::const_iterator k = _typeIdMap.find(index);
+        if(k == _typeIdMap.end())
+        {
+            throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
+        }
+        return k->second;
+    }
+    else
+    {
+        string typeId;
+        _stream->read(typeId, false);
+        _typeIdMap.insert(make_pair(++_typeIdIndex, typeId));
+        return typeId;
+    }
+}
+
+Ice::ValuePtr
+Ice::InputStream::EncapsDecoder::newInstance(const string& typeId)
+{
+    Ice::ValuePtr v;
+
+    //
+    // Try to find a factory registered for the specific type.
+    //
+#ifdef ICE_CPP11_MAPPING
+    function<ValuePtr(const string&)> userFactory;
+    if(_valueFactoryManager)
+    {
+        userFactory = _valueFactoryManager->find(typeId);
+        if(userFactory)
+        {
+            v = userFactory(typeId);
+        }
+    }
+#else
+    ValueFactoryPtr userFactory;
+    if(_valueFactoryManager)
+    {
+        userFactory = _valueFactoryManager->find(typeId);
+        if(userFactory)
+        {
+            v = userFactory->create(typeId);
+        }
+    }
+#endif
+    //
+    // If that fails, invoke the default factory if one has been registered.
+    //
+    if(!v && _valueFactoryManager)
+    {
+        userFactory = _valueFactoryManager->find("");
+        if(userFactory)
+        {
+#ifdef ICE_CPP11_MAPPING
+            v = userFactory(typeId);
+#else
+            v = userFactory->create(typeId);
+#endif
+        }
+    }
+
+    //
+    // Last chance: check the table of static factories (i.e.,
+    // automatically generated factories for concrete classes).
+    //
+    if(!v)
+    {
+#ifdef ICE_CPP11_MAPPING
+        function<ValuePtr(const string&)> of = IceInternal::factoryTable->getValueFactory(typeId);
+        if(of)
+        {
+            v = of(typeId);
+            assert(v);
+        }
+#else
+        ValueFactoryPtr of = IceInternal::factoryTable->getValueFactory(typeId);
+        if(of)
+        {
+            v = of->create(typeId);
+            assert(v);
+        }
+#endif
+    }
+    return v;
+}
+
+void
+Ice::InputStream::EncapsDecoder::addPatchEntry(Int index, PatchFunc patchFunc, void* patchAddr)
+{
+    assert(index > 0);
+
+    //
+    // Check if we already unmarshaled the object. If that's the case,
+    // just patch the object smart pointer and we're done.
+    //
+    IndexToPtrMap::iterator p = _unmarshaledMap.find(index);
+    if(p != _unmarshaledMap.end())
+    {
+        (*patchFunc)(patchAddr, p->second);
+        return;
+    }
+
+    //
+    // Add a patch entry if the object isn't unmarshaled yet, the
+    // smart pointer will be patched when the instance is
+    // unmarshaled.
+    //
+
+    PatchMap::iterator q = _patchMap.find(index);
+    if(q == _patchMap.end())
+    {
+        //
+        // We have no outstanding instances to be patched for this
+        // index, so make a new entry in the patch map.
+        //
+        q = _patchMap.insert(make_pair(index, PatchList())).first;
+    }
+
+    //
+    // Append a patch entry for this instance.
+    //
+    PatchEntry e;
+    e.patchFunc = patchFunc;
+    e.patchAddr = patchAddr;
+    q->second.push_back(e);
+}
+
+void
+Ice::InputStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePtr& v)
+{
+    //
+    // Add the object to the map of unmarshaled instances, this must
+    // be done before reading the instances (for circular references).
+    //
+    _unmarshaledMap.insert(make_pair(index, v));
+
+    //
+    // Read the object.
+    //
+    v->__read(_stream);
+
+    //
+    // Patch all instances now that the object is unmarshaled.
+    //
+    PatchMap::iterator patchPos = _patchMap.find(index);
+    if(patchPos != _patchMap.end())
+    {
+        assert(patchPos->second.size() > 0);
+
+        //
+        // Patch all pointers that refer to the instance.
+        //
+        for(PatchList::iterator k = patchPos->second.begin(); k != patchPos->second.end(); ++k)
+        {
+            (*k->patchFunc)(k->patchAddr, v);
+        }
+
+        //
+        // Clear out the patch map for that index -- there is nothing left
+        // to patch for that index for the time being.
+        //
+        _patchMap.erase(patchPos);
+    }
+
+    if(_valueList.empty() && _patchMap.empty())
+    {
+        _stream->postUnmarshal(v);
+    }
+    else
+    {
+        _valueList.push_back(v);
+
+        if(_patchMap.empty())
+        {
+            //
+            // Iterate over the value list and invoke ice_postUnmarshal on
+            // each value. We must do this after all values have been
+            // unmarshaled in order to ensure that any value data members
+            // have been properly patched.
+            //
+            for(ValueList::iterator p = _valueList.begin(); p != _valueList.end(); ++p)
+            {
+                _stream->postUnmarshal(*p);
+            }
+            _valueList.clear();
+        }
+    }
+}
+
+void
+Ice::InputStream::EncapsDecoder10::read(PatchFunc patchFunc, void* patchAddr)
+{
+    assert(patchFunc && patchAddr);
+
+    //
+    // Object references are encoded as a negative integer in 1.0.
+    //
+    Int index;
+    _stream->read(index);
+    if(index > 0)
+    {
+        throw MarshalException(__FILE__, __LINE__, "invalid object id");
+    }
+    index = -index;
+
+    if(index == 0)
+    {
+        //
+        // Calling the patch function for null instances is necessary for correct functioning of Ice for
+        // Python and Ruby.
+        //
+        ValuePtr nil;
+        patchFunc(patchAddr, nil);
+    }
+    else
+    {
+        addPatchEntry(index, patchFunc, patchAddr);
+    }
+}
+
+void
+Ice::InputStream::EncapsDecoder10::throwException(const UserExceptionFactoryPtr& factory)
+{
+    assert(_sliceType == NoSlice);
+
+    //
+    // User exception with the 1.0 encoding start with a boolean flag
+    // that indicates whether or not the exception has classes.
+    //
+    // This allows reading the pending values even if some part of
+    // the exception was sliced.
+    //
+    bool usesClasses;
+    _stream->read(usesClasses);
+
+    _sliceType = ExceptionSlice;
+    _skipFirstSlice = false;
+
+    //
+    // Read the first slice header.
+    //
+    startSlice();
+    const string mostDerivedId = _typeId;
+    UserExceptionFactoryPtr exceptionFactory = factory;
+    while(true)
+    {
+        //
+        // Look for a statically-generated factory for this ID.
+        //
+        if(!exceptionFactory)
+        {
+            exceptionFactory = factoryTable->getExceptionFactory(_typeId);
+        }
+
+        //
+        // We found a factory, we get out of this loop.
+        //
+        if(exceptionFactory)
+        {
+            //
+            // Got factory -- ask the factory to instantiate the
+            // exception, initialize the exception members, and throw
+            // the exception.
+            //
+            try
+            {
+                exceptionFactory->createAndThrow(_typeId);
+            }
+            catch(UserException& ex)
+            {
+                ex.__read(_stream);
+                if(usesClasses)
+                {
+                    readPendingValues();
+                }
+                throw;
+
+                // Never reached.
+            }
+        }
+
+        //
+        // Slice off what we don't understand.
+        //
+        skipSlice();
+        try
+        {
+            startSlice();
+        }
+        catch(UnmarshalOutOfBoundsException& ex)
+        {
+            //
+            // An oversight in the 1.0 encoding means there is no marker to indicate
+            // the last slice of an exception. As a result, we just try to read the
+            // next type ID, which raises UnmarshalOutOfBoundsException when the
+            // input buffer underflows.
+            //
+            // Set the reason member to a more helpful message.
+            //
+            ex.reason = "unknown exception type `" + mostDerivedId + "'";
+            throw;
+        }
+    }
+}
+
+void
+#ifndef NDEBUG
+Ice::InputStream::EncapsDecoder10::startInstance(SliceType sliceType)
+#else
+Ice::InputStream::EncapsDecoder10::startInstance(SliceType)
+#endif
+{
+    assert(_sliceType == sliceType);
+    _skipFirstSlice = true;
+}
+
+SlicedDataPtr
+Ice::InputStream::EncapsDecoder10::endInstance(bool)
+{
+    //
+    // Read the Ice::Value slice.
+    //
+    if(_sliceType == ValueSlice)
+    {
+        startSlice();
+        Int sz = _stream->readSize(); // For compatibility with the old AFM.
+        if(sz != 0)
+        {
+            throw MarshalException(__FILE__, __LINE__, "invalid Object slice");
+        }
+        endSlice();
+    }
+    _sliceType = NoSlice;
+    return 0;
+}
+
+const std::string&
+Ice::InputStream::EncapsDecoder10::startSlice()
+{
+    //
+    // If first slice, don't read the header, it was already read in
+    // readInstance or throwException to find the factory.
+    //
+    if(_skipFirstSlice)
+    {
+        _skipFirstSlice = false;
+        return _typeId;
+    }
+
+    //
+    // For values, first read the type ID boolean which indicates
+    // whether or not the type ID is encoded as a string or as an
+    // index. For exceptions, the type ID is always encoded as a
+    // string.
+    //
+    if(_sliceType == ValueSlice)
+    {
+        bool isIndex;
+        _stream->read(isIndex);
+        _typeId = readTypeId(isIndex);
+    }
+    else
+    {
+        _stream->read(_typeId, false);
+    }
+
+    _stream->read(_sliceSize);
+    if(_sliceSize < 4)
+    {
+        throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
+    }
+    return _typeId;
+}
+
+void
+Ice::InputStream::EncapsDecoder10::endSlice()
+{
+}
+
+void
+Ice::InputStream::EncapsDecoder10::skipSlice()
+{
+    _stream->traceSkipSlice(_typeId, _sliceType);
+    assert(_sliceSize >= 4);
+    _stream->skip(_sliceSize - sizeof(Int));
+}
+
+void
+Ice::InputStream::EncapsDecoder10::readPendingValues()
+{
+    Int num;
+    do
+    {
+        num = _stream->readSize();
+        for(Int k = num; k > 0; --k)
+        {
+            readInstance();
+        }
+    }
+    while(num);
+
+    if(!_patchMap.empty())
+    {
+        //
+        // If any entries remain in the patch map, the sender has sent an index for an object, but failed
+        // to supply the object.
+        //
+        throw MarshalException(__FILE__, __LINE__, "index for class received, but no instance");
+    }
+}
+
+void
+Ice::InputStream::EncapsDecoder10::readInstance()
+{
+    Int index;
+    _stream->read(index);
+
+    if(index <= 0)
+    {
+        throw MarshalException(__FILE__, __LINE__, "invalid object id");
+    }
+
+    _sliceType = ValueSlice;
+    _skipFirstSlice = false;
+
+    //
+    // Read the first slice header.
+    //
+    startSlice();
+    const string mostDerivedId = _typeId;
+    ValuePtr v;
+    while(true)
+    {
+        //
+        // For the 1.0 encoding, the type ID for the base Object class
+        // marks the last slice.
+        //
+        if(_typeId == Object::ice_staticId())
+        {
+            throw NoValueFactoryException(__FILE__, __LINE__, "", mostDerivedId);
+        }
+
+        v = newInstance(_typeId);
+
+        //
+        // We found a factory, we get out of this loop.
+        //
+        if(v)
+        {
+            break;
+        }
+
+        //
+        // If value slicing is disabled, stop unmarshaling.
+        //
+        if(!_sliceValues)
+        {
+            throw NoValueFactoryException(__FILE__, __LINE__, "no value factory found and value slicing is disabled",
+                                           _typeId);
+        }
+
+        //
+        // Slice off what we don't understand.
+        //
+        skipSlice();
+        startSlice(); // Read next Slice header for next iteration.
+    }
+
+    //
+    // Unmarshal the instance and add it to the map of unmarshaled instances.
+    //
+    unmarshal(index, v);
+}
+
+void
+Ice::InputStream::EncapsDecoder11::read(PatchFunc patchFunc, void* patchAddr)
+{
+    Int index = _stream->readSize();
+    if(index < 0)
+    {
+        throw MarshalException(__FILE__, __LINE__, "invalid object id");
+    }
+    else if(index == 0)
+    {
+        //
+        // Calling the patch function for null instances is necessary for correct functioning of Ice for
+        // Python and Ruby.
+        //
+        if(patchFunc)
+        {
+            ValuePtr nil;
+            patchFunc(patchAddr, nil);
+        }
+    }
+    else if(_current && _current->sliceFlags & FLAG_HAS_INDIRECTION_TABLE)
+    {
+        //
+        // When reading an object within a slice and there's an
+        // indirect object table, always read an indirect reference
+        // that points to an object from the indirect object table
+        // marshaled at the end of the Slice.
+        //
+        // Maintain a list of indirect references. Note that the
+        // indirect index starts at 1, so we decrement it by one to
+        // derive an index into the indirection table that we'll read
+        // at the end of the slice.
+        //
+        if(patchFunc)
+        {
+            IndirectPatchEntry e;
+            e.index = index - 1;
+            e.patchFunc = patchFunc;
+            e.patchAddr = patchAddr;
+            _current->indirectPatchList.push_back(e);
+        }
+    }
+    else
+    {
+        readInstance(index, patchFunc, patchAddr);
+    }
+}
+
+void
+Ice::InputStream::EncapsDecoder11::throwException(const UserExceptionFactoryPtr& factory)
+{
+    assert(!_current);
+
+    push(ExceptionSlice);
+
+    //
+    // Read the first slice header.
+    //
+    startSlice();
+    const string mostDerivedId = _current->typeId;
+    UserExceptionFactoryPtr exceptionFactory = factory;
+    while(true)
+    {
+        //
+        // Look for a statically-generated factory for this ID.
+        //
+        if(!exceptionFactory)
+        {
+            exceptionFactory = factoryTable->getExceptionFactory(_current->typeId);
+        }
+
+        //
+        // We found a factory, we get out of this loop.
+        //
+        if(exceptionFactory)
+        {
+            //
+            // Got factory -- ask the factory to instantiate the
+            // exception, initialize the exception members, and throw
+            // the exception.
+            //
+            try
+            {
+                exceptionFactory->createAndThrow(_current->typeId);
+            }
+            catch(UserException& ex)
+            {
+                ex.__read(_stream);
+                throw;
+
+                // Never reached.
+            }
+        }
+
+        //
+        // Slice off what we don't understand.
+        //
+        skipSlice();
+
+        //
+        // If this is the last slice, raise an exception and stop un-marshalling.
+        //
+        if(_current->sliceFlags & FLAG_IS_LAST_SLICE)
+        {
+            throw UnknownUserException(__FILE__, __LINE__, mostDerivedId);
+        }
+
+        startSlice();
+    }
+}
+
+void
+#ifndef NDEBUG
+Ice::InputStream::EncapsDecoder11::startInstance(SliceType sliceType)
+#else
+Ice::InputStream::EncapsDecoder11::startInstance(SliceType)
+#endif
+{
+    assert(_current->sliceType == sliceType);
+    _current->skipFirstSlice = true;
+}
+
+SlicedDataPtr
+Ice::InputStream::EncapsDecoder11::endInstance(bool preserve)
+{
+    SlicedDataPtr slicedData;
+    if(preserve)
+    {
+        slicedData = readSlicedData();
+    }
+    _current->slices.clear();
+    _current->indirectionTables.clear();
+    _current = _current->previous;
+    return slicedData;
+}
+
+const std::string&
+Ice::InputStream::EncapsDecoder11::startSlice()
+{
+    //
+    // If first slice, don't read the header, it was already read in
+    // readInstance or throwException to find the factory.
+    //
+    if(_current->skipFirstSlice)
+    {
+        _current->skipFirstSlice = false;
+        return _current->typeId;
+    }
+
+    _stream->read(_current->sliceFlags);
+
+    //
+    // Read the type ID, for value slices the type ID is encoded as a
+    // string or as an index, for exceptions it's always encoded as a
+    // string.
+    //
+    if(_current->sliceType == ValueSlice)
+    {
+        if((_current->sliceFlags & FLAG_HAS_TYPE_ID_COMPACT) == FLAG_HAS_TYPE_ID_COMPACT) // Must be checked first!
+        {
+            _current->typeId.clear();
+            _current->compactId = _stream->readSize();
+        }
+        else if(_current->sliceFlags & (FLAG_HAS_TYPE_ID_STRING | FLAG_HAS_TYPE_ID_INDEX))
+        {
+            _current->typeId = readTypeId(_current->sliceFlags & FLAG_HAS_TYPE_ID_INDEX);
+            _current->compactId = -1;
+        }
+        else
+        {
+            // Only the most derived slice encodes the type ID for the compact format.
+            _current->typeId.clear();
+            _current->compactId = -1;
+        }
+    }
+    else
+    {
+        _stream->read(_current->typeId, false);
+    }
+
+    //
+    // Read the slice size if necessary.
+    //
+    if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE)
+    {
+        _stream->read(_current->sliceSize);
+        if(_current->sliceSize < 4)
+        {
+            throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
+        }
+    }
+    else
+    {
+        _current->sliceSize = 0;
+    }
+
+    return _current->typeId;
+}
+
+void
+Ice::InputStream::EncapsDecoder11::endSlice()
+{
+    if(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS)
+    {
+        _stream->skipOptionals();
+    }
+
+    //
+    // Read the indirect object table if one is present.
+    //
+    if(_current->sliceFlags & FLAG_HAS_INDIRECTION_TABLE)
+    {
+        IndexList indirectionTable(_stream->readAndCheckSeqSize(1));
+        for(IndexList::iterator p = indirectionTable.begin(); p != indirectionTable.end(); ++p)
+        {
+            *p = readInstance(_stream->readSize(), 0, 0);
+        }
+
+        //
+        // Sanity checks. If there are optional members, it's possible
+        // that not all object references were read if they are from
+        // unknown optional data members.
+        //
+        if(indirectionTable.empty())
+        {
+            throw MarshalException(__FILE__, __LINE__, "empty indirection table");
+        }
+        if(_current->indirectPatchList.empty() && !(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS))
+        {
+            throw MarshalException(__FILE__, __LINE__, "no references to indirection table");
+        }
+
+        //
+        // Convert indirect references into direct references.
+        //
+        IndirectPatchList::iterator p;
+        for(p = _current->indirectPatchList.begin(); p != _current->indirectPatchList.end(); ++p)
+        {
+            assert(p->index >= 0);
+            if(p->index >= static_cast<Int>(indirectionTable.size()))
+            {
+                throw MarshalException(__FILE__, __LINE__, "indirection out of range");
+            }
+            addPatchEntry(indirectionTable[p->index], p->patchFunc, p->patchAddr);
+        }
+        _current->indirectPatchList.clear();
+    }
+}
+
+void
+Ice::InputStream::EncapsDecoder11::skipSlice()
+{
+    _stream->traceSkipSlice(_current->typeId, _current->sliceType);
+
+    Container::iterator start = _stream->i;
+
+    if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE)
+    {
+        assert(_current->sliceSize >= 4);
+        _stream->skip(_current->sliceSize - sizeof(Int));
+    }
+    else
+    {
+        if(_current->sliceType == ValueSlice)
+        {
+            throw NoValueFactoryException(__FILE__, __LINE__,
+                                          "no value factory found and compact format prevents "
+                                          "slicing (the sender should use the sliced format instead)",
+                                          _current->typeId);
+        }
+        else
+        {
+            throw UnknownUserException(__FILE__, __LINE__, _current->typeId);
+        }
+    }
+
+    //
+    // Preserve this slice.
+    //
+    SliceInfoPtr info = ICE_MAKE_SHARED(SliceInfo);
+    info->typeId = _current->typeId;
+    info->compactId = _current->compactId;
+    info->hasOptionalMembers = _current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS;
+    info->isLastSlice = _current->sliceFlags & FLAG_IS_LAST_SLICE;
+    if(info->hasOptionalMembers)
+    {
+        //
+        // Don't include the optional member end marker. It will be re-written by
+        // endSlice when the sliced data is re-written.
+        //
+        vector<Byte>(start, _stream->i - 1).swap(info->bytes);
+    }
+    else
+    {
+        vector<Byte>(start, _stream->i).swap(info->bytes);
+    }
+
+    _current->indirectionTables.push_back(IndexList());
+
+    //
+    // Read the indirect object table. We read the instances or their
+    // IDs if the instance is a reference to an already un-marhsaled
+    // object.
+    //
+    // The SliceInfo object sequence is initialized only if
+    // readSlicedData is called.
+    //
+    if(_current->sliceFlags & FLAG_HAS_INDIRECTION_TABLE)
+    {
+        IndexList& table = _current->indirectionTables.back();
+        table.resize(_stream->readAndCheckSeqSize(1));
+        for(IndexList::iterator p = table.begin(); p != table.end(); ++p)
+        {
+            *p = readInstance(_stream->readSize(), 0, 0);
+        }
+    }
+
+    _current->slices.push_back(info);
+}
+
+bool
+Ice::InputStream::EncapsDecoder11::readOptional(Ice::Int readTag, Ice::OptionalFormat expectedFormat)
+{
+    if(!_current)
+    {
+        return _stream->readOptImpl(readTag, expectedFormat);
+    }
+    else if(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS)
+    {
+        return _stream->readOptImpl(readTag, expectedFormat);
+    }
+    return false;
+}
+
+Int
+Ice::InputStream::EncapsDecoder11::readInstance(Int index, PatchFunc patchFunc, void* patchAddr)
+{
+    assert(index > 0);
+
+    if(index > 1)
+    {
+        if(patchFunc)
+        {
+            addPatchEntry(index, patchFunc, patchAddr);
+        }
+        return index;
+    }
+
+    push(ValueSlice);
+
+    //
+    // Get the object ID before we start reading slices. If some
+    // slices are skiped, the indirect object table are still read and
+    // might read other instances.
+    //
+    index = ++_valueIdIndex;
+
+    //
+    // Read the first slice header.
+    //
+    startSlice();
+    const string mostDerivedId = _current->typeId;
+    Ice::ValuePtr v;
+    while(true)
+    {
+        if(_current->compactId >= 0)
+        {
+            //
+            // Translate a compact (numeric) type ID into a string type ID.
+            //
+            _current->typeId = _stream->resolveCompactId(_current->compactId);
+            if(_current->typeId.empty())
+            {
+                _current->typeId = IceInternal::factoryTable->getTypeId(_current->compactId);
+            }
+        }
+
+        if(!_current->typeId.empty())
+        {
+            v = newInstance(_current->typeId);
+
+            //
+            // We found a factory, we get out of this loop.
+            //
+            if(v)
+            {
+                break;
+            }
+        }
+
+        //
+        // If value slicing is disabled, stop unmarshaling.
+        //
+        if(!_sliceValues)
+        {
+            throw NoValueFactoryException(__FILE__, __LINE__, "no value factory found and value slicing is disabled",
+                                          _current->typeId);
+        }
+
+        //
+        // Slice off what we don't understand.
+        //
+        skipSlice();
+
+        //
+        // If this is the last slice, keep the object as an opaque UnknownSlicedValue.
+        //
+        if(_current->sliceFlags & FLAG_IS_LAST_SLICE)
+        {
+            //
+            // Provide a factory with an opportunity to supply the object.
+            // We pass the "::Ice::Object" ID to indicate that this is the
+            // last chance to preserve the object.
+            //
+            v = newInstance(Object::ice_staticId());
+            if(!v)
+            {
+                v = ICE_MAKE_SHARED(UnknownSlicedValue, mostDerivedId);
+            }
+
+            break;
+        }
+
+        startSlice(); // Read next Slice header for next iteration.
+    }
+
+    //
+    // Unmarshal the object.
+    //
+    unmarshal(index, v);
+
+    if(!_current && !_patchMap.empty())
+    {
+        //
+        // If any entries remain in the patch map, the sender has sent an index for an object, but failed
+        // to supply the object.
+        //
+        throw MarshalException(__FILE__, __LINE__, "index for class received, but no instance");
+    }
+
+    if(patchFunc)
+    {
+        patchFunc(patchAddr, v);
+    }
+    return index;
+}
+
+SlicedDataPtr
+Ice::InputStream::EncapsDecoder11::readSlicedData()
+{
+    if(_current->slices.empty()) // No preserved slices.
+    {
+        return 0;
+    }
+
+    //
+    // The indirectionTables member holds the indirection table for
+    // each slice in slices.
+    //
+    assert(_current->slices.size() == _current->indirectionTables.size());
+    for(SliceInfoSeq::size_type n = 0; n < _current->slices.size(); ++n)
+    {
+        //
+        // We use the "instances" list in SliceInfo to hold references
+        // to the target instances. Note that the instances might not have
+        // been read yet in the case of a circular reference to an
+        // enclosing instance.
+        //
+        const IndexList& table = _current->indirectionTables[n];
+        vector<ValuePtr>& instances = _current->slices[n]->instances;
+        instances.resize(table.size());
+        IndexList::size_type j = 0;
+        for(IndexList::const_iterator p = table.begin(); p != table.end(); ++p)
+        {
+#ifdef ICE_CPP11_MAPPING
+            addPatchEntry(*p, &patchHandle<Value>, &instances[j++]);
+#else
+            addPatchEntry(*p, &patchHandle<Object>, &instances[j++]);
+#endif
+        }
+    }
+    return ICE_MAKE_SHARED(SlicedData, _current->slices);
+}
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index be381b67dda..bb3260b9139 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -18,7 +18,7 @@
 #include <Ice/ProxyFactory.h>
 #include <Ice/ThreadPool.h>
 #include <Ice/ConnectionFactory.h>
-#include <Ice/ObjectFactoryManager.h>
+#include <Ice/ValueFactoryManagerI.h>
 #include <Ice/LocalException.h>
 #include <Ice/ObjectAdapterFactory.h>
 #include <Ice/Exception.h>
@@ -42,7 +42,9 @@
 #include <Ice/LoggerAdminI.h>
 #include <Ice/RegisterPluginsInit.h>
 #include <Ice/ObserverHelper.h>
+#include <Ice/Functional.h>
 
+#include <IceUtil/DisableWarnings.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/UUID.h>
 #include <IceUtil/Mutex.h>
@@ -72,8 +74,8 @@ using namespace IceInternal;
 namespace IceUtilInternal
 {
 
-extern bool ICE_UTIL_API nullHandleAbort;
-extern bool ICE_UTIL_API printStackTraces;
+extern bool nullHandleAbort;
+extern bool printStackTraces;
 
 };
 
@@ -396,20 +398,6 @@ IceInternal::Instance::outgoingConnectionFactory() const
     return _outgoingConnectionFactory;
 }
 
-ObjectFactoryManagerPtr
-IceInternal::Instance::servantFactoryManager() const
-{
-    Lock sync(*this);
-
-    if(_state == StateDestroyed)
-    {
-        throw CommunicatorDestroyedException(__FILE__, __LINE__);
-    }
-
-    assert(_servantFactoryManager);
-    return _servantFactoryManager;
-}
-
 ObjectAdapterFactoryPtr
 IceInternal::Instance::objectAdapterFactory() const
 {
@@ -576,122 +564,7 @@ IceInternal::Instance::serverACM() const
     return _serverACM;
 }
 
-Identity
-IceInternal::Instance::stringToIdentity(const string& s) const
-{
-    //
-    // This method only accepts printable ascii. Since printable ascii is a subset
-    // of all narrow string encodings, it is not necessary to convert the string
-    // from the native string encoding. Any characters other than printable-ASCII
-    // will cause an IllegalArgumentException. Note that it can contain Unicode
-    // encoded in the escaped form which is the reason why we call fromUTF8 after
-    // unespcaping the printable ASCII string.
-    //
-
-    Identity ident;
-
-    //
-    // Find unescaped separator; note that the string may contain an escaped
-    // backslash before the separator.
-    //
-    string::size_type slash = string::npos, pos = 0;
-    while((pos = s.find('/', pos)) != string::npos)
-    {
-        int escapes = 0;
-        while(static_cast<int>(pos)- escapes > 0 && s[pos - escapes - 1] == '\\')
-        {
-            escapes++;
-        }
-
-        //
-        // We ignore escaped escapes
-        //
-        if(escapes % 2 == 0)
-        {
-            if(slash == string::npos)
-            {
-                slash = pos;
-            }
-            else
-            {
-                //
-                // Extra unescaped slash found.
-                //
-                IdentityParseException ex(__FILE__, __LINE__);
-                ex.str = "unescaped backslash in identity `" + s + "'";
-                throw ex;
-            }
-        }
-        pos++;
-    }
-
-    if(slash == string::npos)
-    {
-        try
-        {
-            ident.name = IceUtilInternal::unescapeString(s, 0, s.size());
-        }
-        catch(const IceUtil::IllegalArgumentException& e)
-        {
-            IdentityParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid identity name `" + s + "': " + e.reason();
-            throw ex;
-        }
-    }
-    else
-    {
-        try
-        {
-            ident.category = IceUtilInternal::unescapeString(s, 0, slash);
-        }
-        catch(const IceUtil::IllegalArgumentException& e)
-        {
-            IdentityParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid category in identity `" + s + "': " + e.reason();
-            throw ex;
-        }
-        if(slash + 1 < s.size())
-        {
-            try
-            {
-                ident.name = IceUtilInternal::unescapeString(s, slash + 1, s.size());
-            }
-            catch(const IceUtil::IllegalArgumentException& e)
-            {
-                IdentityParseException ex(__FILE__, __LINE__);
-                ex.str = "invalid name in identity `" + s + "': " + e.reason();
-                throw ex;
-            }
-        }
-    }
-
-    ident.name = UTF8ToNative(ident.name, _stringConverter);
-    ident.category = UTF8ToNative(ident.category, _stringConverter);
-
-    return ident;
-}
-
-string
-IceInternal::Instance::identityToString(const Identity& ident) const
-{
-    //
-    // This method returns the stringified identity. The returned string only
-    // contains printable ascii. It can contain UTF8 in the escaped form.
-    //
-    string name = nativeToUTF8(ident.name, _stringConverter);
-    string category = nativeToUTF8(ident.category, _stringConverter);
-
-    if(category.empty())
-    {
-        return IceUtilInternal::escapeString(name, "/");
-    }
-    else
-    {
-        return IceUtilInternal::escapeString(category, "/") + '/' + IceUtilInternal::escapeString(name, "/");
-    }
-}
-
-Ice::ObjectPrx
+Ice::ObjectPrxPtr
 IceInternal::Instance::createAdmin(const ObjectAdapterPtr& adminAdapter, const Identity& adminIdentity)
 {
     ObjectAdapterPtr adapter = adminAdapter;
@@ -759,7 +632,7 @@ IceInternal::Instance::createAdmin(const ObjectAdapterPtr& adminAdapter, const I
     return adapter->createProxy(adminIdentity);
 }
 
-Ice::ObjectPrx
+Ice::ObjectPrxPtr
 IceInternal::Instance::getAdmin()
 {
     Lock sync(*this);
@@ -850,12 +723,12 @@ IceInternal::Instance::addAllAdminFacets()
 void
 IceInternal::Instance::setServerProcessProxy(const ObjectAdapterPtr& adminAdapter, const Identity& adminIdentity)
 {
-    ObjectPrx admin = adminAdapter->createProxy(adminIdentity);
-    LocatorPrx locator = adminAdapter->getLocator();
+    ObjectPrxPtr admin = adminAdapter->createProxy(adminIdentity);
+    LocatorPrxPtr locator = adminAdapter->getLocator();
     const string serverId = _initData.properties->getProperty("Ice.Admin.ServerId");
     if(locator && serverId != "")
     {
-        ProcessPrx process = ProcessPrx::uncheckedCast(admin->ice_facet("Process"));
+        ProcessPrxPtr process = ICE_UNCHECKED_CAST(ProcessPrx, admin->ice_facet("Process"));
         try
         {
             //
@@ -1009,7 +882,7 @@ IceInternal::Instance::findAllAdminFacets()
 }
 
 void
-IceInternal::Instance::setDefaultLocator(const Ice::LocatorPrx& defaultLocator)
+IceInternal::Instance::setDefaultLocator(const Ice::LocatorPrxPtr& defaultLocator)
 {
     Lock sync(*this);
 
@@ -1022,7 +895,7 @@ IceInternal::Instance::setDefaultLocator(const Ice::LocatorPrx& defaultLocator)
 }
 
 void
-IceInternal::Instance::setDefaultRouter(const Ice::RouterPrx& defaultRouter)
+IceInternal::Instance::setDefaultRouter(const Ice::RouterPrxPtr& defaultRouter)
 {
     Lock sync(*this);
 
@@ -1043,6 +916,14 @@ IceInternal::Instance::setLogger(const Ice::LoggerPtr& logger)
     _initData.logger = logger;
 }
 
+#ifdef ICE_CPP11_MAPPING
+void
+IceInternal::Instance::setThreadHook(function<void()> threadStart, function<void()> threadStop)
+{
+    _initData.threadStart = move(threadStart);
+    _initData.threadStop = move(threadStop);
+}
+#else
 void
 IceInternal::Instance::setThreadHook(const Ice::ThreadNotificationPtr& threadHook)
 {
@@ -1051,6 +932,7 @@ IceInternal::Instance::setThreadHook(const Ice::ThreadNotificationPtr& threadHoo
     //
     _initData.threadHook = threadHook;
 }
+#endif
 
 namespace
 {
@@ -1121,12 +1003,15 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
 
 #ifdef NDEBUG
                 if(_initData.properties->getPropertyAsIntWithDefault("Ice.PrintStackTraces", 0) > 0)
-#else
-                if(_initData.properties->getPropertyAsIntWithDefault("Ice.PrintStackTraces", 1) > 0)
-#endif
                 {
                     IceUtilInternal::printStackTraces = true;
                 }
+#else
+                if(_initData.properties->getPropertyAsIntWithDefault("Ice.PrintStackTraces", 1) == 0)
+                {
+                    IceUtilInternal::printStackTraces = false;
+                }
+#endif
 
 #ifndef _WIN32
                 string newUser = _initData.properties->getProperty("Ice.ChangeUser");
@@ -1222,25 +1107,24 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
                     throw InitializationException(__FILE__, __LINE__, "Both syslog and file logger cannot be enabled.");
                 }
 
-                _initData.logger =
-                    new SysLoggerI(_initData.properties->getProperty("Ice.ProgramName"),
-                                   _initData.properties->getPropertyWithDefault("Ice.SyslogFacility", "LOG_USER"));
+                _initData.logger = ICE_MAKE_SHARED(SysLoggerI,
+                                                   _initData.properties->getProperty("Ice.ProgramName"),
+                                                   _initData.properties->getPropertyWithDefault("Ice.SyslogFacility", "LOG_USER"));
             }
             else
 #endif
             if(!logfile.empty())
             {
-                _initData.logger =
-                        new LoggerI(_initData.properties->getProperty("Ice.ProgramName"), logfile, true, 0,
-                                    _initData.properties->getPropertyAsIntWithDefault("Ice.LogFile.SizeMax", 0));
+                _initData.logger = ICE_MAKE_SHARED(LoggerI, _initData.properties->getProperty("Ice.ProgramName"), logfile, true, ICE_NULLPTR,
+                                                            _initData.properties->getPropertyAsIntWithDefault("Ice.LogFile.SizeMax", 0));
             }
             else
             {
                 _initData.logger = getProcessLogger();
-                if(LoggerIPtr::dynamicCast(_initData.logger))
+                if(ICE_DYNAMIC_CAST(Logger, _initData.logger))
                 {
-                    _initData.logger = new LoggerI(_initData.properties->getProperty("Ice.ProgramName"), "",
-                                                   logStdErrConvert, _stringConverter);
+                    _initData.logger = ICE_MAKE_SHARED(LoggerI, _initData.properties->getProperty("Ice.ProgramName"), "",
+                                                       logStdErrConvert, _stringConverter);
                 }
             }
         }
@@ -1349,13 +1233,18 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
 
         _dynamicLibraryList = new DynamicLibraryList;
 
-        _pluginManager = new PluginManagerI(communicator, _dynamicLibraryList);
+        _pluginManager = ICE_MAKE_SHARED(PluginManagerI, communicator, _dynamicLibraryList);
 
-        _outgoingConnectionFactory = new OutgoingConnectionFactory(communicator, this);
+        if(!_initData.valueFactoryManager)
+        {
+            _initData.valueFactoryManager = ICE_MAKE_SHARED(ValueFactoryManagerI);
+        }
 
-        _servantFactoryManager = new ObjectFactoryManager();
+        _objectFactoryMapHint = _objectFactoryMap.end();
 
-        _objectAdapterFactory = new ObjectAdapterFactory(this, communicator);
+        _outgoingConnectionFactory = new OutgoingConnectionFactory(communicator, this);
+
+        _objectAdapterFactory = ICE_MAKE_SHARED(ObjectAdapterFactory, this, communicator);
 
         _retryQueue = new RetryQueue(this);
 
@@ -1364,7 +1253,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
         //
         if(!_wstringConverter)
         {
-            _wstringConverter = new IceUtil::UnicodeWstringConverter;
+            _wstringConverter = IceUtil::createUnicodeWstringConverter();
         }
 
         __setNoDelete(false);
@@ -1388,7 +1277,6 @@ IceInternal::Instance::~Instance()
     assert(!_proxyFactory);
     assert(!_outgoingConnectionFactory);
 
-    assert(!_servantFactoryManager);
     assert(!_objectAdapterFactory);
     assert(!_clientThreadPool);
     assert(!_serverThreadPool);
@@ -1442,13 +1330,13 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
     if(tcpFactory)
     {
         ProtocolInstancePtr instance = new ProtocolInstance(communicator, WSEndpointType, "ws", false);
-        _endpointFactoryManager->add(new WSEndpointFactory(instance, tcpFactory->clone(instance)));
+        _endpointFactoryManager->add(new WSEndpointFactory(instance, tcpFactory->clone(instance, 0)));
     }
     EndpointFactoryPtr sslFactory = _endpointFactoryManager->get(SSLEndpointType);
     if(sslFactory)
     {
         ProtocolInstancePtr instance = new ProtocolInstance(communicator, WSSEndpointType, "wss", true);
-        _endpointFactoryManager->add(new WSEndpointFactory(instance, sslFactory->clone(instance)));
+        _endpointFactoryManager->add(new WSEndpointFactory(instance, sslFactory->clone(instance, 0)));
     }
 
     //
@@ -1461,9 +1349,9 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
     {
         _wstringConverter = newWstringConverter;
     }
-    else if(!dynamic_cast<IceUtil::UnicodeWstringConverter*>(_wstringConverter.get()))
+    else
     {
-        _wstringConverter = new IceUtil::UnicodeWstringConverter;
+        _wstringConverter = IceUtil::createUnicodeWstringConverter();
     }
 
     //
@@ -1496,7 +1384,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
         const string processFacetName = "Process";
         if(_adminFacetFilter.empty() || _adminFacetFilter.find(processFacetName) != _adminFacetFilter.end())
         {
-            _adminFacets.insert(make_pair(processFacetName, new ProcessI(communicator)));
+            _adminFacets.insert(make_pair(processFacetName, ICE_MAKE_SHARED(ProcessI, communicator)));
         }
 
         //
@@ -1517,7 +1405,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
         PropertiesAdminIPtr propsAdmin;
         if(_adminFacetFilter.empty() || _adminFacetFilter.find(propertiesFacetName) != _adminFacetFilter.end())
         {
-            propsAdmin = new PropertiesAdminI(_initData.properties, _initData.logger);
+            propsAdmin = ICE_MAKE_SHARED(PropertiesAdminI, _initData.properties, _initData.logger);
             _adminFacets.insert(make_pair(propertiesFacetName, propsAdmin));
         }
 
@@ -1527,7 +1415,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
         const string metricsFacetName = "Metrics";
         if(_adminFacetFilter.empty() || _adminFacetFilter.find(metricsFacetName) != _adminFacetFilter.end())
         {
-            CommunicatorObserverIPtr observer = new CommunicatorObserverI(_initData);
+            CommunicatorObserverIPtr observer = ICE_MAKE_SHARED(CommunicatorObserverI, _initData);
             _initData.observer = observer;
             _adminFacets.insert(make_pair(metricsFacetName, observer->getFacet()));
 
@@ -1546,7 +1434,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
     //
     if(_initData.observer)
     {
-        _initData.observer->setObserverUpdater(new ObserverUpdaterI(this));
+        _initData.observer->setObserverUpdater(ICE_MAKE_SHARED(ObserverUpdaterI, this));
     }
 
     //
@@ -1591,7 +1479,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
     //
     if(!_referenceFactory->getDefaultRouter())
     {
-        RouterPrx router = RouterPrx::uncheckedCast(_proxyFactory->propertyToProxy("Ice.Default.Router"));
+        RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, _proxyFactory->propertyToProxy("Ice.Default.Router"));
         if(router)
         {
             _referenceFactory = _referenceFactory->setDefaultRouter(router);
@@ -1600,7 +1488,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
 
     if(!_referenceFactory->getDefaultLocator())
     {
-        LocatorPrx locator = LocatorPrx::uncheckedCast(_proxyFactory->propertyToProxy("Ice.Default.Locator"));
+        LocatorPrxPtr locator = ICE_UNCHECKED_CAST(LocatorPrx, _proxyFactory->propertyToProxy("Ice.Default.Locator"));
         if(locator)
         {
             _referenceFactory = _referenceFactory->setDefaultLocator(locator);
@@ -1717,7 +1605,7 @@ IceInternal::Instance::destroy()
 
     if(_initData.observer)
     {
-        CommunicatorObserverIPtr observer = CommunicatorObserverIPtr::dynamicCast(_initData.observer);
+        CommunicatorObserverIPtr observer = ICE_DYNAMIC_CAST(CommunicatorObserverI, _initData.observer);
         if(observer)
         {
             observer->destroy(); // Break cyclic reference counts. Don't clear _observer, it's immutable.
@@ -1725,7 +1613,7 @@ IceInternal::Instance::destroy()
         _initData.observer->setObserverUpdater(0); // Break cyclic reference count.
     }
 
-    LoggerAdminLoggerPtr logger = LoggerAdminLoggerPtr::dynamicCast(_initData.logger);
+    LoggerAdminLoggerPtr logger = ICE_DYNAMIC_CAST(LoggerAdminLogger, _initData.logger);
     if(logger)
     {
         //
@@ -1774,10 +1662,9 @@ IceInternal::Instance::destroy()
     }
 #endif
 
-    if(_servantFactoryManager)
-    {
-        _servantFactoryManager->destroy();
-    }
+    for_each(_objectFactoryMap.begin(), _objectFactoryMap.end(),
+        Ice::secondVoidMemFun<const string, ObjectFactory>(&ObjectFactory::destroy));
+    _objectFactoryMap.clear();
 
     if(_routerManager)
     {
@@ -1828,7 +1715,6 @@ IceInternal::Instance::destroy()
         _endpointHostResolver = 0;
         _timer = 0;
 
-        _servantFactoryManager = 0;
         _referenceFactory = 0;
         _requestHandlerFactory = 0;
         _proxyFactory = 0;
@@ -1941,6 +1827,82 @@ IceInternal::Instance::setRcvBufSizeWarn(Short type, int size)
     _setBufSizeWarn[type] =  info;
 }
 
+void
+IceInternal::Instance::addObjectFactory(const Ice::ObjectFactoryPtr& factory, const string& id)
+{
+    Lock sync(*this);
+
+    //
+    // Create a ValueFactory wrapper around the given ObjectFactory and register the wrapper
+    // with the value factory manager. This may raise AlreadyRegisteredException.
+    //
+#ifdef ICE_CPP11_MAPPING
+    _initData.valueFactoryManager->add([factory](const string& id)
+                                       {
+                                           return factory->create(id);
+                                       },
+                                       id);
+#else
+    class ValueFactoryWrapper: public Ice::ValueFactory
+    {
+    public:
+
+        ValueFactoryWrapper(const Ice::ObjectFactoryPtr& factory) :  _objectFactory(factory)
+        {
+        }
+
+        Ice::ValuePtr create(const std::string& id)
+        {
+            return _objectFactory->create(id);
+        }
+
+    private:
+
+        Ice::ObjectFactoryPtr _objectFactory;
+    };
+
+    _initData.valueFactoryManager->add(new ValueFactoryWrapper(factory), id);
+#endif
+
+    //
+    // Also record the object factory in our own map.
+    //
+    _objectFactoryMapHint = _objectFactoryMap.insert(_objectFactoryMapHint,
+                                                     pair<const string, Ice::ObjectFactoryPtr>(id, factory));
+}
+
+Ice::ObjectFactoryPtr
+IceInternal::Instance::findObjectFactory(const string& id) const
+{
+    Lock sync(*this);
+
+    ObjectFactoryMap& objectfactoryMap = const_cast<ObjectFactoryMap&>(_objectFactoryMap);
+
+    ObjectFactoryMap::iterator p = objectfactoryMap.end();
+    if(_objectFactoryMapHint != objectfactoryMap.end())
+    {
+        if(_objectFactoryMapHint->first == id)
+        {
+            p = _objectFactoryMapHint;
+        }
+    }
+
+    if(p == objectfactoryMap.end())
+    {
+        p = objectfactoryMap.find(id);
+    }
+
+    if(p != objectfactoryMap.end())
+    {
+        _objectFactoryMapHint = p;
+        return p->second;
+    }
+    else
+    {
+        return ICE_NULLPTR;
+    }
+}
+
 IceInternal::ProcessI::ProcessI(const CommunicatorPtr& communicator) :
     _communicator(communicator)
 {
@@ -1953,7 +1915,11 @@ IceInternal::ProcessI::shutdown(const Current&)
 }
 
 void
+#ifdef ICE_CPP11_MAPPING
+IceInternal::ProcessI::writeMessage(string message, Int fd, const Current&)
+#else
 IceInternal::ProcessI::writeMessage(const string& message, Int fd, const Current&)
+#endif
 {
     switch(fd)
     {
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index 6c721652668..86d465705bb 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -28,7 +28,7 @@
 #include <Ice/ThreadPoolF.h>
 #include <Ice/ConnectionFactoryF.h>
 #include <Ice/ACM.h>
-#include <Ice/ObjectFactoryManagerF.h>
+#include <Ice/ObjectFactory.h>
 #include <Ice/ObjectAdapterFactoryF.h>
 #include <Ice/EndpointFactoryManagerF.h>
 #include <Ice/IPEndpointIF.h>
@@ -58,7 +58,7 @@ class Timer;
 typedef IceUtil::Handle<Timer> TimerPtr;
 
 class MetricsAdminI;
-typedef IceUtil::Handle<MetricsAdminI> MetricsAdminIPtr;
+ICE_DEFINE_PTR(MetricsAdminIPtr, MetricsAdminI);
 
 class RequestHandlerFactory;
 typedef IceUtil::Handle<RequestHandlerFactory> RequestHandlerFactoryPtr;
@@ -95,7 +95,6 @@ public:
     RequestHandlerFactoryPtr requestHandlerFactory() const;
     ProxyFactoryPtr proxyFactory() const;
     OutgoingConnectionFactoryPtr outgoingConnectionFactory() const;
-    ObjectFactoryManagerPtr servantFactoryManager() const;
     ObjectAdapterFactoryPtr objectAdapterFactory() const;
     ProtocolSupport protocolSupport() const;
     bool preferIPv6() const;
@@ -113,11 +112,9 @@ public:
     bool collectObjects() const { return _collectObjects; }
     const ACMConfig& clientACM() const;
     const ACMConfig& serverACM() const;
-    Ice::Identity stringToIdentity(const std::string&) const;
-    std::string identityToString(const Ice::Identity&) const;
 
-    Ice::ObjectPrx createAdmin(const Ice::ObjectAdapterPtr&, const Ice::Identity&);
-    Ice::ObjectPrx getAdmin();
+    Ice::ObjectPrxPtr createAdmin(const Ice::ObjectAdapterPtr&, const Ice::Identity&);
+    Ice::ObjectPrxPtr getAdmin();
     void addAdminFacet(const Ice::ObjectPtr&, const std::string&);
     Ice::ObjectPtr removeAdminFacet(const std::string&);
     Ice::ObjectPtr findAdminFacet(const std::string&);
@@ -128,11 +125,15 @@ public:
         return _implicitContext;
     }
 
-    void setDefaultLocator(const Ice::LocatorPrx&);
-    void setDefaultRouter(const Ice::RouterPrx&);
+    void setDefaultLocator(const Ice::LocatorPrxPtr&);
+    void setDefaultRouter(const Ice::RouterPrxPtr&);
 
     void setLogger(const Ice::LoggerPtr&);
+#ifdef ICE_CPP11_MAPPING
+    void setThreadHook(std::function<void()>, std::function<void()>);
+#else
     void setThreadHook(const Ice::ThreadNotificationPtr&);
+#endif
 
     IceUtil::StringConverterPtr getStringConverter() const { return _stringConverter; }
     IceUtil::WstringConverterPtr getWstringConverter() const { return _wstringConverter; }
@@ -141,6 +142,11 @@ public:
     void setSndBufSizeWarn(Ice::Short type, int size);
     void setRcvBufSizeWarn(Ice::Short type, int size);
 
+    void addObjectFactory(const Ice::ObjectFactoryPtr&, const std::string&);
+    Ice::ObjectFactoryPtr findObjectFactory(const std::string&) const;
+
+    typedef std::map<std::string, Ice::ObjectFactoryPtr> ObjectFactoryMap;
+
 private:
 
     Instance(const Ice::CommunicatorPtr&, const Ice::InitializationData&);
@@ -179,7 +185,6 @@ private:
     RequestHandlerFactoryPtr _requestHandlerFactory;
     ProxyFactoryPtr _proxyFactory;
     OutgoingConnectionFactoryPtr _outgoingConnectionFactory;
-    ObjectFactoryManagerPtr _servantFactoryManager;
     ObjectAdapterFactoryPtr _objectAdapterFactory;
     ProtocolSupport _protocolSupport;
     bool _preferIPv6;
@@ -203,6 +208,8 @@ private:
     IceInternal::MetricsAdminIPtr _metricsAdmin;
     std::map<Ice::Short, BufSizeWarnInfo> _setBufSizeWarn;
     IceUtil::Mutex _setBufSizeWarnMutex;
+    ObjectFactoryMap _objectFactoryMap;
+    mutable ObjectFactoryMap::iterator _objectFactoryMapHint;
 };
 
 class ProcessI : public Ice::Process
@@ -212,7 +219,11 @@ public:
     ProcessI(const Ice::CommunicatorPtr&);
 
     virtual void shutdown(const Ice::Current&);
+#ifdef ICE_CPP11_MAPPING
+    virtual void writeMessage(std::string, Ice::Int, const Ice::Current&);
+#else
     virtual void writeMessage(const std::string&, Ice::Int, const Ice::Current&);
+#endif
 
 private:
 
diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp
index b590686df45..0f816647a11 100644
--- a/cpp/src/Ice/InstrumentationI.cpp
+++ b/cpp/src/Ice/InstrumentationI.cpp
@@ -22,7 +22,13 @@ using namespace IceInternal;
 using namespace Ice::Instrumentation;
 using namespace IceMX;
 
-namespace 
+#ifdef ICE_CPP11_MAPPING
+#  define ICE_OBJECT_PRX Ice::ObjectPrx
+#else
+#  define ICE_OBJECT_PRX IceProxy::Ice::Object
+#endif
+
+namespace
 {
 
 int ThreadMetrics::*
@@ -42,14 +48,14 @@ getThreadStateMetric(ThreadState s)
         assert(false);
         return 0;
     }
-}    
+}
 
-struct ThreadStateChanged 
+struct ThreadStateChanged
 {
     ThreadStateChanged(ThreadState oldState, ThreadState newState) : oldState(oldState), newState(newState)
     {
     }
-    
+
     void operator()(const ThreadMetricsPtr& v)
     {
         if(oldState != ThreadStateIdle)
@@ -66,6 +72,20 @@ struct ThreadStateChanged
     ThreadState newState;
 };
 
+IPConnectionInfo*
+getIPConnectionInfo(const ConnectionInfoPtr& info)
+{
+    for(ConnectionInfoPtr p = info; p; p = p->underlying)
+    {
+        IPConnectionInfo* ipInfo = dynamic_cast<IPConnectionInfo*>(p.get());
+        if(ipInfo)
+        {
+            return ipInfo;
+        }
+    }
+    return ICE_NULLPTR;
+}
+
 class ConnectionHelper : public MetricsHelperT<ConnectionMetrics>
 {
 public:
@@ -73,7 +93,7 @@ public:
     class Attributes : public AttributeResolverT<ConnectionHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &ConnectionHelper::getParent);
@@ -83,8 +103,8 @@ public:
         }
     };
     static Attributes attributes;
-    
-    ConnectionHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, ConnectionState state) : 
+
+    ConnectionHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, ConnectionState state) :
         _connectionInfo(con), _endpoint(endpt), _state(state)
     {
     }
@@ -100,7 +120,7 @@ public:
         if(_id.empty())
         {
             ostringstream os;
-            IPConnectionInfoPtr info = IPConnectionInfoPtr::dynamicCast(_connectionInfo);
+            IPConnectionInfo* info = getIPConnectionInfo(_connectionInfo);
             if(info)
             {
                 os << info->localAddress << ':' << info->localPort;
@@ -140,8 +160,8 @@ public:
             return "";
         }
     }
-    
-    string 
+
+    string
     getParent() const
     {
         if(!_connectionInfo->adapterName.empty())
@@ -153,7 +173,7 @@ public:
             return "Communicator";
         }
     }
-    
+
     const ConnectionInfoPtr&
     getConnectionInfo() const
     {
@@ -175,7 +195,7 @@ public:
         }
         return _endpointInfo;
     }
-    
+
 private:
 
     const ConnectionInfoPtr& _connectionInfo;
@@ -194,7 +214,7 @@ public:
     class Attributes : public AttributeResolverT<DispatchHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &DispatchHelper::getParent);
@@ -213,7 +233,7 @@ public:
         }
     };
     static Attributes attributes;
-    
+
     DispatchHelper(const Current& current, int size) : _current(current), _size(size)
     {
     }
@@ -263,7 +283,7 @@ public:
         return _id;
     }
 
-    string 
+    string
     getParent() const
     {
         return _current.adapter->getName();
@@ -334,7 +354,7 @@ public:
     class Attributes : public AttributeResolverT<InvocationHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &InvocationHelper::getParent);
@@ -342,8 +362,8 @@ public:
 
             add("operation", &InvocationHelper::getOperation);
             add("identity", &InvocationHelper::getIdentity);
-            add("facet", &InvocationHelper::getProxy, &IceProxy::Ice::Object::ice_getFacet);
-            add("encoding", &InvocationHelper::getProxy, &IceProxy::Ice::Object::ice_getEncodingVersion);
+            add("facet", &InvocationHelper::getProxy, &ICE_OBJECT_PRX::ice_getFacet);
+            add("encoding", &InvocationHelper::getProxy, &ICE_OBJECT_PRX::ice_getEncodingVersion);
             add("mode", &InvocationHelper::getMode);
             add("proxy", &InvocationHelper::getProxy);
 
@@ -351,8 +371,7 @@ public:
         }
     };
     static Attributes attributes;
-    
-    InvocationHelper(const ObjectPrx& proxy, const string& op, const Context& ctx) :
+    InvocationHelper(const ObjectPrxPtr& proxy, const string& op, const Context& ctx) :
         _proxy(proxy), _operation(op), _context(ctx)
     {
     }
@@ -386,23 +405,23 @@ public:
         if(_proxy->ice_isTwoway())
         {
             return "twoway";
-        } 
+        }
         else if(_proxy->ice_isOneway())
         {
             return "oneway";
-        } 
+        }
         else if(_proxy->ice_isBatchOneway())
         {
             return "batch-oneway";
-        } 
+        }
         else if(_proxy->ice_isDatagram())
         {
             return "datagram";
-        } 
+        }
         else if(_proxy->ice_isBatchDatagram())
         {
             return "batch-datagram";
-        } 
+        }
         else
         {
             throw invalid_argument("mode");
@@ -419,7 +438,7 @@ public:
             {
                 try
                 {
-                    os << _proxy->ice_endpoints(Ice::EndpointSeq()) << " [" << _operation << ']';
+                    os << _proxy->ice_endpoints(Ice::EndpointSeq())->ice_toString() << " [" << _operation << ']';
                 }
                 catch(const Exception&)
                 {
@@ -437,13 +456,13 @@ public:
         return _id;
     }
 
-    string 
+    string
     getParent() const
     {
         return "Communicator";
     }
 
-    const ObjectPrx&
+    const ObjectPrxPtr&
     getProxy() const
     {
         return _proxy;
@@ -471,7 +490,7 @@ public:
 
 private:
 
-    const ObjectPrx& _proxy;
+    const ObjectPrxPtr& _proxy;
     const string& _operation;
     const Context& _context;
     mutable string _id;
@@ -486,7 +505,7 @@ public:
     class Attributes : public AttributeResolverT<RemoteInvocationHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &RemoteInvocationHelper::getParent);
@@ -496,8 +515,8 @@ public:
         }
     };
     static Attributes attributes;
-    
-    RemoteInvocationHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, int requestId, int size) : 
+
+    RemoteInvocationHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, int requestId, int size) :
         _connectionInfo(con), _endpoint(endpt), _requestId(requestId), _size(size)
     {
     }
@@ -525,8 +544,8 @@ public:
         }
         return _id;
     }
-    
-    string 
+
+    string
     getParent() const
     {
         if(!_connectionInfo->adapterName.empty())
@@ -538,7 +557,7 @@ public:
             return "Communicator";
         }
     }
-    
+
     const ConnectionInfoPtr&
     getConnectionInfo() const
     {
@@ -560,7 +579,7 @@ public:
         }
         return _endpointInfo;
     }
-    
+
 private:
 
     const ConnectionInfoPtr& _connectionInfo;
@@ -588,7 +607,7 @@ public:
     class Attributes : public AttributeResolverT<CollocatedInvocationHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &CollocatedInvocationHelper::getParent);
@@ -597,8 +616,8 @@ public:
         }
     };
     static Attributes attributes;
-    
-    CollocatedInvocationHelper(const Ice::ObjectAdapterPtr& adapter, int requestId, int size) : 
+
+    CollocatedInvocationHelper(const Ice::ObjectAdapterPtr& adapter, int requestId, int size) :
         _requestId(requestId), _size(size), _id(adapter->getName())
     {
     }
@@ -618,8 +637,8 @@ public:
     {
         return _id;
     }
-    
-    string 
+
+    string
     getParent() const
     {
         return "Communicator";
@@ -647,7 +666,7 @@ public:
     class Attributes : public AttributeResolverT<ThreadHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &ThreadHelper::_parent);
@@ -655,7 +674,7 @@ public:
         }
     };
     static Attributes attributes;
-    
+
     ThreadHelper(const string& parent, const string& id, ThreadState state) : _parent(parent), _id(id), _state(state)
     {
     }
@@ -674,7 +693,7 @@ public:
     }
 
 private:
-    
+
     const string _parent;
     const string _id;
     const ThreadState _state;
@@ -689,7 +708,7 @@ public:
     class Attributes : public AttributeResolverT<EndpointHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &EndpointHelper::getParent);
@@ -698,7 +717,7 @@ public:
         }
     };
     static Attributes attributes;
-    
+
     EndpointHelper(const EndpointPtr& endpt, const string& id) : _endpoint(endpt), _id(id)
     {
     }
@@ -745,7 +764,7 @@ public:
     }
 
 private:
-    
+
     const EndpointPtr _endpoint;
     mutable string _id;
     mutable EndpointInfoPtr _endpointInfo;
@@ -755,7 +774,7 @@ EndpointHelper::Attributes EndpointHelper::attributes;
 
 }
 
-void 
+void
 ConnectionObserverI::sentBytes(Int num)
 {
     forEach(add(&ConnectionMetrics::sentBytes, num));
@@ -765,7 +784,7 @@ ConnectionObserverI::sentBytes(Int num)
     }
 }
 
-void 
+void
 ConnectionObserverI::receivedBytes(Int num)
 {
     forEach(add(&ConnectionMetrics::receivedBytes, num));
@@ -847,8 +866,8 @@ InvocationObserverI::userException()
 }
 
 RemoteObserverPtr
-InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection, 
-                                       const EndpointPtr& endpoint, 
+InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection,
+                                       const EndpointPtr& endpoint,
                                        int requestId,
                                        int size)
 {
@@ -859,14 +878,14 @@ InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection,
         {
             delegate = _delegate->getRemoteObserver(connection, endpoint, requestId, size);
         }
-        return getObserverWithDelegate<RemoteObserverI>("Remote", 
+        return getObserverWithDelegate<RemoteObserverI>("Remote",
                                                         RemoteInvocationHelper(connection, endpoint, requestId, size),
                                                         delegate);
     }
     catch(const exception&)
     {
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
 CollocatedObserverPtr
@@ -886,10 +905,10 @@ InvocationObserverI::getCollocatedObserver(const Ice::ObjectAdapterPtr& adapter,
     catch(const exception&)
     {
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
-CommunicatorObserverI::CommunicatorObserverI(const InitializationData& initData) : 
+CommunicatorObserverI::CommunicatorObserverI(const InitializationData& initData) :
     _metrics(new MetricsAdminI(initData.properties, initData.logger)),
     _delegate(initData.observer),
     _connections(_metrics, "Connection"),
@@ -934,7 +953,7 @@ CommunicatorObserverI::getConnectionEstablishmentObserver(const EndpointPtr& end
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
 ObserverPtr
@@ -957,13 +976,13 @@ CommunicatorObserverI::getEndpointLookupObserver(const EndpointPtr& endpt)
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
-ConnectionObserverPtr 
-CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con, 
+ConnectionObserverPtr
+CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con,
                                              const EndpointPtr& endpt,
-                                             ConnectionState state, 
+                                             ConnectionState state,
                                              const ConnectionObserverPtr& observer)
 {
     if(_connections.isEnabled())
@@ -984,11 +1003,11 @@ CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con,
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
-ThreadObserverPtr 
-CommunicatorObserverI::getThreadObserver(const string& parent, 
+ThreadObserverPtr
+CommunicatorObserverI::getThreadObserver(const string& parent,
                                          const string& id,
                                          ThreadState state,
                                          const ThreadObserverPtr& observer)
@@ -1011,11 +1030,11 @@ CommunicatorObserverI::getThreadObserver(const string& parent,
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
-InvocationObserverPtr 
-CommunicatorObserverI::getInvocationObserver(const ObjectPrx& proxy, const string& op, const Context& ctx)
+InvocationObserverPtr
+CommunicatorObserverI::getInvocationObserver(const ObjectPrxPtr& proxy, const string& op, const Context& ctx)
 {
     if(_invocations.isEnabled())
     {
@@ -1034,10 +1053,10 @@ CommunicatorObserverI::getInvocationObserver(const ObjectPrx& proxy, const strin
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
-DispatchObserverPtr 
+DispatchObserverPtr
 CommunicatorObserverI::getDispatchObserver(const Current& current, int size)
 {
     if(_dispatch.isEnabled())
@@ -1057,10 +1076,10 @@ CommunicatorObserverI::getDispatchObserver(const Current& current, int size)
             error << "unexpected exception trying to obtain observer:\n" << ex;
         }
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
-const IceInternal::MetricsAdminIPtr& 
+const IceInternal::MetricsAdminIPtr&
 CommunicatorObserverI::getFacet() const
 {
     assert(_metrics);
diff --git a/cpp/src/Ice/InstrumentationI.h b/cpp/src/Ice/InstrumentationI.h
index 21c6ed36c45..2e6938235b9 100644
--- a/cpp/src/Ice/InstrumentationI.h
+++ b/cpp/src/Ice/InstrumentationI.h
@@ -16,14 +16,13 @@
 namespace IceInternal
 {
 
-template<typename T, typename O> class ObserverWithDelegateT : public IceMX::ObserverT<T>, virtual public O
+template<typename T, typename O> class ObserverWithDelegateT : public IceMX::ObserverT<T>, public virtual O
 {
 public:
 
     typedef O ObserverType;
-    typedef typename IceInternal::Handle<O> ObserverPtrType;
-
-    virtual void 
+    typedef typename ICE_INTERNAL_HANDLE<O> ObserverPtrType;
+    virtual void
     attach()
     {
         IceMX::ObserverT<T>::attach();
@@ -33,7 +32,7 @@ public:
         }
     }
 
-    virtual void 
+    virtual void
     detach()
     {
         IceMX::ObserverT<T>::detach();
@@ -65,11 +64,11 @@ public:
         _delegate = delegate;
     }
 
-    template<typename ObserverImpl, typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType 
-    getObserverWithDelegate(const std::string& mapName, const IceMX::MetricsHelperT<ObserverMetricsType>& helper, 
+    template<typename ObserverImpl, typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType
+    getObserverWithDelegate(const std::string& mapName, const IceMX::MetricsHelperT<ObserverMetricsType>& helper,
                             const ObserverPtrType& del)
     {
-        IceInternal::Handle<ObserverImpl> obsv = IceMX::ObserverT<T>::template getObserver<ObserverImpl>(mapName, 
+        ICE_INTERNAL_HANDLE<ObserverImpl> obsv = IceMX::ObserverT<T>::template getObserver<ObserverImpl>(mapName,
                                                                                                          helper);
         if(obsv)
         {
@@ -88,15 +87,15 @@ template<typename T> class ObserverFactoryWithDelegateT : public IceMX::Observer
 {
 public:
 
-    ObserverFactoryWithDelegateT(const IceInternal::MetricsAdminIPtr& metrics, const std::string& name) : 
+    ObserverFactoryWithDelegateT(const IceInternal::MetricsAdminIPtr& metrics, const std::string& name) :
         IceMX::ObserverFactoryT<T>(metrics, name)
     {
     }
 
-    template<typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType 
+    template<typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType
     getObserverWithDelegate(const IceMX::MetricsHelperT<ObserverMetricsType>& helper, const ObserverPtrType& del)
     {
-        IceInternal::Handle<T> obsv = IceMX::ObserverFactoryT<T>::getObserver(helper);
+        ICE_INTERNAL_HANDLE<T> obsv = IceMX::ObserverFactoryT<T>::getObserver(helper);
         if(obsv)
         {
             obsv->setDelegate(del);
@@ -105,11 +104,11 @@ public:
         return del;
     }
 
-    template<typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType 
-    getObserverWithDelegate(const IceMX::MetricsHelperT<ObserverMetricsType>& helper, const ObserverPtrType& del, 
+    template<typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType
+    getObserverWithDelegate(const IceMX::MetricsHelperT<ObserverMetricsType>& helper, const ObserverPtrType& del,
                             const ObserverPtrType& old)
     {
-        IceInternal::Handle<T> obsv = IceMX::ObserverFactoryT<T>::getObserver(helper, old);
+        ICE_INTERNAL_HANDLE<T> obsv = IceMX::ObserverFactoryT<T>::getObserver(helper, old);
         if(obsv)
         {
             obsv->setDelegate(del);
@@ -129,7 +128,7 @@ void addEndpointAttributes(typename Helper::Attributes& attrs)
     attrs.add("endpointIsSecure", &Helper::getEndpointInfo, &Ice::EndpointInfo::secure);
     attrs.add("endpointTimeout", &Helper::getEndpointInfo, &Ice::EndpointInfo::timeout);
     attrs.add("endpointCompress", &Helper::getEndpointInfo, &Ice::EndpointInfo::compress);
-    
+
     attrs.add("endpointHost", &Helper::getEndpointInfo, &Ice::IPEndpointInfo::host);
     attrs.add("endpointPort", &Helper::getEndpointInfo, &Ice::IPEndpointInfo::port);
 }
@@ -140,19 +139,19 @@ void addConnectionAttributes(typename Helper::Attributes& attrs)
     attrs.add("incoming", &Helper::getConnectionInfo, &Ice::ConnectionInfo::incoming);
     attrs.add("adapterName", &Helper::getConnectionInfo, &Ice::ConnectionInfo::adapterName);
     attrs.add("connectionId", &Helper::getConnectionInfo, &Ice::ConnectionInfo::connectionId);
-    
+
     attrs.add("localHost", &Helper::getConnectionInfo, &Ice::IPConnectionInfo::localAddress);
     attrs.add("localPort", &Helper::getConnectionInfo, &Ice::IPConnectionInfo::localPort);
     attrs.add("remoteHost", &Helper::getConnectionInfo, &Ice::IPConnectionInfo::remoteAddress);
     attrs.add("remotePort", &Helper::getConnectionInfo, &Ice::IPConnectionInfo::remotePort);
-            
+
     attrs.add("mcastHost", &Helper::getConnectionInfo, &Ice::UDPConnectionInfo::mcastAddress);
     attrs.add("mcastPort", &Helper::getConnectionInfo, &Ice::UDPConnectionInfo::mcastPort);
-    
+
     addEndpointAttributes<Helper>(attrs);
 }
 
-class ConnectionObserverI : public ObserverWithDelegateT<IceMX::ConnectionMetrics, 
+class ConnectionObserverI : public ObserverWithDelegateT<IceMX::ConnectionMetrics,
                                                          Ice::Instrumentation::ConnectionObserver>
 {
 public:
@@ -184,7 +183,7 @@ public:
     virtual void reply(Ice::Int);
 };
 
-class CollocatedObserverI : public ObserverWithDelegateT<IceMX::CollocatedMetrics, 
+class CollocatedObserverI : public ObserverWithDelegateT<IceMX::CollocatedMetrics,
                                                          Ice::Instrumentation::CollocatedObserver>
 {
 public:
@@ -192,7 +191,7 @@ public:
     virtual void reply(Ice::Int);
 };
 
-class InvocationObserverI : public ObserverWithDelegateT<IceMX::InvocationMetrics, 
+class InvocationObserverI : public ObserverWithDelegateT<IceMX::InvocationMetrics,
                                                          Ice::Instrumentation::InvocationObserver>
 {
 public:
@@ -201,7 +200,7 @@ public:
 
     virtual void userException();
 
-    virtual Ice::Instrumentation::RemoteObserverPtr 
+    virtual Ice::Instrumentation::RemoteObserverPtr
     getRemoteObserver(const Ice::ConnectionInfoPtr&, const Ice::EndpointPtr&, Ice::Int, Ice::Int);
 
     virtual Ice::Instrumentation::CollocatedObserverPtr
@@ -217,23 +216,23 @@ public:
     CommunicatorObserverI(const Ice::InitializationData&);
 
     virtual void setObserverUpdater(const Ice::Instrumentation::ObserverUpdaterPtr&);
- 
+
     virtual Ice::Instrumentation::ObserverPtr getConnectionEstablishmentObserver(const Ice::EndpointPtr&,
                                                                                  const std::string&);
- 
+
     virtual Ice::Instrumentation::ObserverPtr getEndpointLookupObserver(const Ice::EndpointPtr&);
-    
-    virtual Ice::Instrumentation::ConnectionObserverPtr 
-    getConnectionObserver(const Ice::ConnectionInfoPtr&, 
+
+    virtual Ice::Instrumentation::ConnectionObserverPtr
+    getConnectionObserver(const Ice::ConnectionInfoPtr&,
                           const Ice::EndpointPtr&,
-                          Ice::Instrumentation::ConnectionState, 
+                          Ice::Instrumentation::ConnectionState,
                           const Ice::Instrumentation::ConnectionObserverPtr&);
 
     virtual Ice::Instrumentation::ThreadObserverPtr getThreadObserver(const std::string&, const std::string&,
                                                                       Ice::Instrumentation::ThreadState,
                                                                       const Ice::Instrumentation::ThreadObserverPtr&);
 
-    virtual Ice::Instrumentation::InvocationObserverPtr getInvocationObserver(const Ice::ObjectPrx&, 
+    virtual Ice::Instrumentation::InvocationObserverPtr getInvocationObserver(const Ice::ObjectPrxPtr&,
                                                                               const std::string&,
                                                                               const Ice::Context&);
 
@@ -255,7 +254,7 @@ private:
     ObserverFactoryWithDelegateT<ObserverI> _connects;
     ObserverFactoryWithDelegateT<ObserverI> _endpointLookups;
 };
-typedef IceUtil::Handle<CommunicatorObserverI> CommunicatorObserverIPtr;
+ICE_DEFINE_PTR(CommunicatorObserverIPtr, CommunicatorObserverI);
 
 };
 
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index c00e8eb198d..e768b442330 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -18,6 +18,7 @@
 #include <Ice/Reference.h>
 #include <Ice/Functional.h>
 #include <Ice/Properties.h>
+#include <Ice/Comparable.h>
 #include <iterator>
 
 using namespace std;
@@ -44,11 +45,32 @@ public:
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            LocatorInfo::RequestPtr request = this;
+            _locatorInfo->getLocator()->findObjectByIdAsync(
+                _ref->getIdentity(),
+                [request](const ObjectPrxPtr& object)
+                {
+                    request->response(object);
+                },
+                [request](exception_ptr e)
+                {
+                    try
+                    {
+                        rethrow_exception(e);
+                    }
+                    catch(const Exception& ex)
+                    {
+                        request->exception(ex);
+                    }
+                });
+#else
             _locatorInfo->getLocator()->begin_findObjectById(
                 _ref->getIdentity(),
                 newCallback_Locator_findObjectById(static_cast<LocatorInfo::Request*>(this),
                                                    &LocatorInfo::Request::response,
                                                    &LocatorInfo::Request::exception));
+#endif
         }
         catch(const Ice::Exception& ex)
         {
@@ -70,11 +92,31 @@ public:
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            LocatorInfo::RequestPtr request = this;
+            _locatorInfo->getLocator()->findAdapterByIdAsync(_ref->getAdapterId(),
+                [request](const shared_ptr<Ice::ObjectPrx>& object)
+                {
+                    request->response(object);
+                },
+                [request](exception_ptr e)
+                {
+                    try
+                    {
+                        rethrow_exception(e);
+                    }
+                    catch(const Exception& ex)
+                    {
+                        request->exception(ex);
+                    }
+                });
+#else
             _locatorInfo->getLocator()->begin_findAdapterById(
                 _ref->getAdapterId(),
                 newCallback_Locator_findAdapterById(static_cast<LocatorInfo::Request*>(this),
                                                     &LocatorInfo::Request::response,
                                                     &LocatorInfo::Request::exception));
+#endif
         }
         catch(const Ice::Exception& ex)
         {
@@ -96,8 +138,11 @@ IceInternal::LocatorManager::destroy()
 {
     IceUtil::Mutex::Lock sync(*this);
 
+#ifdef ICE_CPP11_MAPPING
+    for_each(_table.begin(), _table.end(), [](pair<shared_ptr<Ice::LocatorPrx>, LocatorInfoPtr> it){ it.second->destroy(); });
+#else
     for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun<const LocatorPrx, LocatorInfo>(&LocatorInfo::destroy));
-
+#endif
     _table.clear();
     _tableHint = _table.end();
 
@@ -105,14 +150,14 @@ IceInternal::LocatorManager::destroy()
 }
 
 LocatorInfoPtr
-IceInternal::LocatorManager::get(const LocatorPrx& loc)
+IceInternal::LocatorManager::get(const LocatorPrxPtr& loc)
 {
     if(!loc)
     {
         return 0;
     }
 
-    LocatorPrx locator = LocatorPrx::uncheckedCast(loc->ice_locator(0)); // The locator can't be located.
+    LocatorPrxPtr locator = ICE_UNCHECKED_CAST(LocatorPrx, loc->ice_locator(0)); // The locator can't be located.
 
     //
     // TODO: reap unused locator info objects?
@@ -120,7 +165,7 @@ IceInternal::LocatorManager::get(const LocatorPrx& loc)
 
     IceUtil::Mutex::Lock sync(*this);
 
-    map<LocatorPrx, LocatorInfoPtr>::iterator p = _table.end();
+    map<LocatorPrxPtr, LocatorInfoPtr>::iterator p = _table.end();
 
     if(_tableHint != _table.end())
     {
@@ -152,7 +197,7 @@ IceInternal::LocatorManager::get(const LocatorPrx& loc)
         }
 
         _tableHint = _table.insert(_tableHint,
-                                   pair<const LocatorPrx, LocatorInfoPtr>(locator,
+                                   pair<const LocatorPrxPtr, LocatorInfoPtr>(locator,
                                                                           new LocatorInfo(locator, t->second,
                                                                                           _background)));
     }
@@ -301,7 +346,7 @@ IceInternal::LocatorTable::checkTTL(const IceUtil::Time& time, int ttl) const
 }
 
 void
-IceInternal::LocatorInfo::RequestCallback::response(const LocatorInfoPtr& locatorInfo, const Ice::ObjectPrx& proxy)
+IceInternal::LocatorInfo::RequestCallback::response(const LocatorInfoPtr& locatorInfo, const Ice::ObjectPrxPtr& proxy)
 {
     vector<EndpointIPtr> endpoints;
     if(proxy)
@@ -373,7 +418,7 @@ IceInternal::LocatorInfo::Request::addCallback(const ReferencePtr& ref,
     RequestCallbackPtr callback = new RequestCallback(ref, ttl, cb);
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-        if(!_response && !_exception.get())
+        if(!_response && !ICE_EXCEPTION_ISSET(_exception))
         {
             _callbacks.push_back(callback);
             if(wellKnownRef) // This request is to resolve the endpoints of a cached well-known object reference
@@ -396,8 +441,19 @@ IceInternal::LocatorInfo::Request::addCallback(const ReferencePtr& ref,
     }
     else
     {
-        assert(_exception.get());
+        assert(ICE_EXCEPTION_ISSET(_exception));
+#ifdef ICE_CPP11_MAPPING
+        try
+        {
+            rethrow_exception(_exception);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            callback->exception(_locatorInfo, ex);
+        }
+#else
         callback->exception(_locatorInfo, *_exception.get());
+#endif
     }
 }
 
@@ -408,7 +464,7 @@ IceInternal::LocatorInfo::Request::getEndpoints(const ReferencePtr& ref,
                                                 bool& cached)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    if(!_response && !_exception.get())
+    if(!_response && !ICE_EXCEPTION_ISSET(_exception))
     {
         if(wellKnownRef) // This request is to resolve the endpoints of a cached well-known object reference
         {
@@ -422,15 +478,26 @@ IceInternal::LocatorInfo::Request::getEndpoints(const ReferencePtr& ref,
             sync.acquire();
         }
 
-        while(!_response && !_exception.get())
+        while(!_response && !ICE_EXCEPTION_ISSET(_exception))
         {
             _monitor.wait();
         }
     }
 
-    if(_exception.get())
+    if(ICE_EXCEPTION_ISSET(_exception))
     {
+#ifdef ICE_CPP11_MAPPING
+        try
+        {
+            rethrow_exception(_exception);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            _locatorInfo->getEndpointsException(ref, ex); // This throws.
+        }
+#else
         _locatorInfo->getEndpointsException(ref, *_exception.get()); // This throws.
+#endif
     }
 
     assert(_response);
@@ -467,7 +534,7 @@ IceInternal::LocatorInfo::Request::Request(const LocatorInfoPtr& locatorInfo, co
 }
 
 void
-IceInternal::LocatorInfo::Request::response(const Ice::ObjectPrx& proxy)
+IceInternal::LocatorInfo::Request::response(const Ice::ObjectPrxPtr& proxy)
 {
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
@@ -488,7 +555,8 @@ IceInternal::LocatorInfo::Request::exception(const Ice::Exception& ex)
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
         _locatorInfo->finishRequest(_ref, _wellKnownRefs, 0, dynamic_cast<const Ice::UserException*>(&ex));
-        _exception.reset(ex.ice_clone());
+
+        ICE_RESET_EXCEPTION(_exception, ex.ice_clone());
         _monitor.notifyAll();
     }
     for(vector<RequestCallbackPtr>::const_iterator p = _callbacks.begin(); p != _callbacks.end(); ++p)
@@ -497,7 +565,7 @@ IceInternal::LocatorInfo::Request::exception(const Ice::Exception& ex)
     }
 }
 
-IceInternal::LocatorInfo::LocatorInfo(const LocatorPrx& locator, const LocatorTablePtr& table, bool background) :
+IceInternal::LocatorInfo::LocatorInfo(const LocatorPrxPtr& locator, const LocatorTablePtr& table, bool background) :
     _locator(locator),
     _table(table),
     _background(background)
@@ -518,22 +586,34 @@ IceInternal::LocatorInfo::destroy()
 bool
 IceInternal::LocatorInfo::operator==(const LocatorInfo& rhs) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return Ice::targetEquals(_locator, rhs._locator);
+#else
     return _locator == rhs._locator;
+#endif
 }
 
 bool
 IceInternal::LocatorInfo::operator!=(const LocatorInfo& rhs) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return !Ice::targetEquals(_locator, rhs._locator);
+#else
     return _locator != rhs._locator;
+#endif
 }
 
 bool
 IceInternal::LocatorInfo::operator<(const LocatorInfo& rhs) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return Ice::targetLess(_locator, rhs._locator);
+#else
     return _locator < rhs._locator;
+#endif
 }
 
-LocatorRegistryPrx
+LocatorRegistryPrxPtr
 IceInternal::LocatorInfo::getLocatorRegistry()
 {
     {
@@ -547,7 +627,7 @@ IceInternal::LocatorInfo::getLocatorRegistry()
     //
     // Do not make locator calls from within sync.
     //
-    LocatorRegistryPrx locatorRegistry = _locator->getRegistry();
+    LocatorRegistryPrxPtr locatorRegistry = _locator->getRegistry();
     if(!locatorRegistry)
     {
         return 0;
@@ -745,12 +825,12 @@ IceInternal::LocatorInfo::getEndpointsException(const ReferencePtr& ref, const I
             Trace out(ref->getInstance()->initializationData().logger,
                       ref->getInstance()->traceLevels()->locationCat);
             out << "object not found" << "\n";
-            out << "object = " << ref->getInstance()->identityToString(ref->getIdentity());
+            out << "object = " << Ice::identityToString(ref->getIdentity());
         }
 
         NotRegisteredException ex(__FILE__, __LINE__);
         ex.kindOfObject = "object";
-        ex.id = ref->getInstance()->identityToString(ref->getIdentity());
+        ex.id = Ice::identityToString(ref->getIdentity());
         throw ex;
     }
     catch(const NotRegisteredException&)
@@ -765,7 +845,7 @@ IceInternal::LocatorInfo::getEndpointsException(const ReferencePtr& ref, const I
             out << "couldn't contact the locator to retrieve adapter endpoints\n";
             if(ref->getAdapterId().empty())
             {
-                out << "object = " << ref->getInstance()->identityToString(ref->getIdentity()) << "\n";
+                out << "object = " << Ice::identityToString(ref->getIdentity()) << "\n";
             }
             else
             {
@@ -800,7 +880,7 @@ IceInternal::LocatorInfo::getEndpointsTrace(const ReferencePtr& ref,
         if(ref->getAdapterId().empty())
         {
             out << "object\n";
-            out << "object = " << ref->getInstance()->identityToString(ref->getIdentity());
+            out << "object = " << Ice::identityToString(ref->getIdentity());
         }
         else
         {
@@ -823,7 +903,7 @@ IceInternal::LocatorInfo::trace(const string& msg, const ReferencePtr& ref, cons
     }
     else
     {
-        out << "object = "  << ref->getInstance()->identityToString(ref->getIdentity()) << '\n';
+        out << "object = "  << Ice::identityToString(ref->getIdentity()) << '\n';
     }
 
     const char* sep = endpoints.size() > 1 ? ":" : "";
@@ -861,7 +941,7 @@ IceInternal::LocatorInfo::getObjectRequest(const ReferencePtr& ref)
     if(ref->getInstance()->traceLevels()->location >= 1)
     {
         Trace out(ref->getInstance()->initializationData().logger, ref->getInstance()->traceLevels()->locationCat);
-        out << "searching for object by id\nobject = " << ref->getInstance()->identityToString(ref->getIdentity());
+        out << "searching for object by id\nobject = " << Ice::identityToString(ref->getIdentity());
     }
 
     map<Ice::Identity, RequestPtr>::const_iterator p = _objectRequests.find(ref->getIdentity());
@@ -877,7 +957,7 @@ IceInternal::LocatorInfo::getObjectRequest(const ReferencePtr& ref)
 void
 IceInternal::LocatorInfo::finishRequest(const ReferencePtr& ref,
                                         const vector<ReferencePtr>& wellKnownRefs,
-                                        const Ice::ObjectPrx& proxy,
+                                        const Ice::ObjectPrxPtr& proxy,
                                         bool notRegistered)
 {
     if(!proxy || proxy->__reference()->isIndirect())
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h
index 4bc2957f2a3..b3f445b3f22 100644
--- a/cpp/src/Ice/LocatorInfo.h
+++ b/cpp/src/Ice/LocatorInfo.h
@@ -39,14 +39,14 @@ public:
     // Returns locator info for a given locator. Automatically creates
     // the locator info if it doesn't exist yet.
     //
-    LocatorInfoPtr get(const Ice::LocatorPrx&);
+    LocatorInfoPtr get(const Ice::LocatorPrxPtr&);
 
 private:
 
     const bool _background;
 
-    std::map<Ice::LocatorPrx, LocatorInfoPtr> _table;
-    std::map<Ice::LocatorPrx, LocatorInfoPtr>::iterator _tableHint;
+    std::map<Ice::LocatorPrxPtr, LocatorInfoPtr> _table;
+    std::map<Ice::LocatorPrxPtr, LocatorInfoPtr>::iterator _tableHint;
 
     std::map<std::pair<Ice::Identity, Ice::EncodingVersion>, LocatorTablePtr> _locatorTables;
 };
@@ -79,7 +79,7 @@ class LocatorInfo : public IceUtil::Shared, public IceUtil::Mutex
 {
 public:
 
-    class GetEndpointsCallback : virtual public IceUtil::Shared
+    class GetEndpointsCallback : public virtual IceUtil::Shared
     {
     public:
 
@@ -88,13 +88,13 @@ public:
     };
     typedef IceUtil::Handle<GetEndpointsCallback> GetEndpointsCallbackPtr;
 
-    class RequestCallback : virtual public IceUtil::Shared
+    class RequestCallback : public virtual IceUtil::Shared
     {
     public:
 
         RequestCallback(const ReferencePtr&, int, const GetEndpointsCallbackPtr&);
 
-        void response(const LocatorInfoPtr&, const Ice::ObjectPrx&);
+        void response(const LocatorInfoPtr&, const Ice::ObjectPrxPtr&);
         void exception(const LocatorInfoPtr&, const Ice::Exception&);
 
     private:
@@ -105,14 +105,14 @@ public:
     };
     typedef IceUtil::Handle<RequestCallback> RequestCallbackPtr;
 
-    class Request : virtual public IceUtil::Shared
+    class Request : public virtual IceUtil::Shared
     {
     public:
 
         void addCallback(const ReferencePtr&, const ReferencePtr&, int, const GetEndpointsCallbackPtr&);
         std::vector<EndpointIPtr> getEndpoints(const ReferencePtr&, const ReferencePtr&, int, bool&);
 
-        void response(const Ice::ObjectPrx&);
+        void response(const Ice::ObjectPrxPtr&);
         void exception(const Ice::Exception&);
 
     protected:
@@ -131,12 +131,16 @@ public:
         std::vector<ReferencePtr> _wellKnownRefs;
         bool _sent;
         bool _response;
-        Ice::ObjectPrx _proxy;
+        Ice::ObjectPrxPtr _proxy;
+#ifdef ICE_CPP11_MAPPING
+        std::exception_ptr _exception;
+#else
         IceUtil::UniquePtr<Ice::Exception> _exception;
+#endif
     };
     typedef IceUtil::Handle<Request> RequestPtr;
 
-    LocatorInfo(const Ice::LocatorPrx&, const LocatorTablePtr&, bool);
+    LocatorInfo(const Ice::LocatorPrxPtr&, const LocatorTablePtr&, bool);
 
     void destroy();
 
@@ -144,14 +148,14 @@ public:
     bool operator!=(const LocatorInfo&) const;
     bool operator<(const LocatorInfo&) const;
 
-    const Ice::LocatorPrx& getLocator() const
+    const Ice::LocatorPrxPtr& getLocator() const
     {
         //
         // No mutex lock necessary, _locator is immutable.
         //
         return _locator;
     }
-    Ice::LocatorRegistryPrx getLocatorRegistry();
+    Ice::LocatorRegistryPrxPtr getLocatorRegistry();
 
     std::vector<EndpointIPtr> getEndpoints(const ReferencePtr& ref, int ttl, bool& cached)
     {
@@ -176,12 +180,12 @@ private:
     RequestPtr getAdapterRequest(const ReferencePtr&);
     RequestPtr getObjectRequest(const ReferencePtr&);
 
-    void finishRequest(const ReferencePtr&, const std::vector<ReferencePtr>&, const Ice::ObjectPrx&, bool);
+    void finishRequest(const ReferencePtr&, const std::vector<ReferencePtr>&, const Ice::ObjectPrxPtr&, bool);
     friend class Request;
     friend class RequestCallback;
 
-    const Ice::LocatorPrx _locator;
-    Ice::LocatorRegistryPrx _locatorRegistry;
+    const Ice::LocatorPrxPtr _locator;
+    Ice::LocatorRegistryPrxPtr _locatorRegistry;
     const LocatorTablePtr _table;
     const bool _background;
 
diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp
index 14aa25400f1..4f193c91903 100644
--- a/cpp/src/Ice/LoggerAdminI.cpp
+++ b/cpp/src/Ice/LoggerAdminI.cpp
@@ -27,24 +27,33 @@ namespace
 
 const char* traceCategory = "Admin.Logger";
 
-class LoggerAdminI : public Ice::LoggerAdmin
+class LoggerAdminI : public Ice::LoggerAdmin, public Ice::EnableSharedFromThis<LoggerAdminI>
 {
 public:
 
     LoggerAdminI(const PropertiesPtr&);
-    
-    virtual void attachRemoteLogger(const RemoteLoggerPrx&, const LogMessageTypeSeq&, 
+
+#ifdef ICE_CPP11_MAPPING
+    virtual void attachRemoteLogger(shared_ptr<RemoteLoggerPrx>, LogMessageTypeSeq,
+                                    StringSeq, Int, const Current&);
+
+    virtual bool detachRemoteLogger(shared_ptr<RemoteLoggerPrx>, const Current&);
+
+    virtual LogMessageSeq getLog(LogMessageTypeSeq, StringSeq, Int, string&, const Current&);
+#else
+    virtual void attachRemoteLogger(const RemoteLoggerPrx&, const LogMessageTypeSeq&,
                                     const StringSeq&, Int, const Current&);
-    
+
     virtual bool detachRemoteLogger(const RemoteLoggerPrx&, const Current&);
-    
+
     virtual LogMessageSeq getLog(const LogMessageTypeSeq&, const StringSeq&, Int, string&, const Current&);
+#endif
 
     void destroy();
 
-    vector<RemoteLoggerPrx> log(const LogMessage&);
+    vector<RemoteLoggerPrxPtr> log(const LogMessage&);
 
-    void deadRemoteLogger(const RemoteLoggerPrx&, const LoggerPtr&, const LocalException&, const string&);
+    void deadRemoteLogger(const RemoteLoggerPrxPtr&, const LoggerPtr&, const LocalException&, const string&);
 
     const int getTraceLevel() const
     {
@@ -53,9 +62,11 @@ public:
 
 private:
 
-    bool removeRemoteLogger(const RemoteLoggerPrx&);
-    
+    bool removeRemoteLogger(const RemoteLoggerPrxPtr&);
+
+#ifndef ICE_CPP11_MAPPING // C++98 mapping begin_init callback
     void initCompleted(const AsyncResultPtr&);
+#endif
 
     IceUtil::Mutex _mutex;
     list<LogMessage> _queue;
@@ -70,7 +81,7 @@ private:
 
     struct ObjectIdentityCompare
     {
-        bool operator()(const RemoteLoggerPrx& lhs, const RemoteLoggerPrx& rhs) const
+        bool operator()(const RemoteLoggerPrxPtr& lhs, const RemoteLoggerPrxPtr& rhs) const
         {
             //
             // Caller should make sure that proxies are never null
@@ -93,7 +104,7 @@ private:
         const set<string> traceCategories;
     };
 
-    typedef map<RemoteLoggerPrx, Filters, ObjectIdentityCompare> RemoteLoggerMap;
+    typedef map<RemoteLoggerPrxPtr, Filters, ObjectIdentityCompare> RemoteLoggerMap;
 
     struct GetRemoteLoggerMapKey
     {
@@ -108,29 +119,29 @@ private:
     CommunicatorPtr _sendLogCommunicator;
     bool _destroyed;
 };
-typedef IceUtil::Handle<LoggerAdminI> LoggerAdminIPtr;
+ICE_DEFINE_PTR(LoggerAdminIPtr, LoggerAdminI);
 
 
 class Job : public IceUtil::Shared
 {
 public:
 
-    Job(const vector<RemoteLoggerPrx>& r, const LogMessage& l) :
+    Job(const vector<RemoteLoggerPrxPtr>& r, const LogMessage& l) :
         remoteLoggers(r),
         logMessage(l)
     {
     }
 
-    const vector<RemoteLoggerPrx> remoteLoggers;
+    const vector<RemoteLoggerPrxPtr> remoteLoggers;
     const LogMessage logMessage;
 };
 typedef IceUtil::Handle<Job> JobPtr;
 
 
-class LoggerAdminLoggerI : public IceInternal::LoggerAdminLogger
+class LoggerAdminLoggerI : public Ice::EnableSharedFromThis<LoggerAdminLoggerI>, public IceInternal::LoggerAdminLogger
 {
 public:
-    
+
     LoggerAdminLoggerI(const PropertiesPtr&, const LoggerPtr&);
 
     virtual void print(const std::string&);
@@ -141,22 +152,23 @@ public:
     virtual LoggerPtr cloneWithPrefix(const std::string&);
 
     virtual ObjectPtr getFacet() const;
-   
+
     virtual void destroy();
 
     const LoggerPtr& getLocalLogger() const
     {
         return _localLogger;
     }
- 
+
     void run();
 
 private:
 
     void log(const LogMessage&);
-
+#ifndef ICE_CPP11_MAPPING // C++98 mapping begin_log callback
     void logCompleted(const AsyncResultPtr&);
-    
+#endif
+
     LoggerPtr _localLogger;
     const LoggerAdminIPtr _loggerAdmin;
 
@@ -164,9 +176,9 @@ private:
 
     bool _destroyed;
     IceUtil::ThreadPtr _sendLogThread;
-    std::deque<JobPtr> _jobQueue;   
+    std::deque<JobPtr> _jobQueue;
 };
-typedef IceUtil::Handle<LoggerAdminLoggerI> LoggerAdminLoggerIPtr;
+ICE_DEFINE_PTR(LoggerAdminLoggerIPtr, LoggerAdminLoggerI);
 
 
 class SendLogThread : public IceUtil::Thread
@@ -195,7 +207,7 @@ filterLogMessages(LogMessageSeq& logMessages, const set<LogMessageType>& message
                   const set<string>& traceCategories, Int messageMax)
 {
     assert(!logMessages.empty() && messageMax != 0);
-   
+
     //
     // Filter only if one of the 3 filters is set; messageMax < 0 means "give me all"
     // that match the other filters, if any.
@@ -209,7 +221,7 @@ filterLogMessages(LogMessageSeq& logMessages, const set<LogMessageType>& message
             bool keepIt = false;
             if(messageTypes.empty() || messageTypes.count(p->type) != 0)
             {
-                if(p->type != TraceMessage || traceCategories.empty() ||
+                if(p->type != ICE_ENUM(LogMessageType, TraceMessage) || traceCategories.empty() ||
                    traceCategories.count(p->traceCategory) != 0)
                 {
                     keepIt = true;
@@ -246,15 +258,15 @@ filterLogMessages(LogMessageSeq& logMessages, const set<LogMessageType>& message
 //
 // Change this proxy's communicator, while keeping its invocation timeout
 //
-RemoteLoggerPrx
-changeCommunicator(const RemoteLoggerPrx& prx, const CommunicatorPtr& communicator)
+RemoteLoggerPrxPtr
+changeCommunicator(const RemoteLoggerPrxPtr& prx, const CommunicatorPtr& communicator)
 {
     if(prx == 0)
     {
         return 0;
     }
 
-    RemoteLoggerPrx result = RemoteLoggerPrx::uncheckedCast(communicator->stringToProxy(prx->ice_toString()));
+    RemoteLoggerPrxPtr result = ICE_UNCHECKED_CAST(RemoteLoggerPrx, communicator->stringToProxy(prx->ice_toString()));
 
     return result->ice_invocationTimeout(prx->ice_getInvocationTimeout());
 }
@@ -301,6 +313,7 @@ createSendLogCommunicator(const CommunicatorPtr& communicator, const LoggerPtr&
         }
         initData.properties->parseCommandLineOptions("", extraProps);
     }
+
     return initialize(initData);
 }
 
@@ -312,7 +325,7 @@ LoggerAdminI::LoggerAdminI(const PropertiesPtr& props) :
     _logCount(0),
     _maxLogCount(props->getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepLogs", 100)),
     _traceCount(0),
-    _maxTraceCount(props->getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepTraces", 100)),   
+    _maxTraceCount(props->getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepTraces", 100)),
     _traceLevel(props->getPropertyAsInt("Ice.Trace.Admin.Logger")),
     _destroyed(false)
 {
@@ -321,23 +334,31 @@ LoggerAdminI::LoggerAdminI(const PropertiesPtr& props) :
 }
 
 void
+#ifdef ICE_CPP11_MAPPING
+LoggerAdminI::attachRemoteLogger(shared_ptr<RemoteLoggerPrx> prx,
+                                 LogMessageTypeSeq messageTypes,
+                                 StringSeq categories,
+                                 Int messageMax,
+                                 const Current& current)
+#else
 LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx,
                                  const LogMessageTypeSeq& messageTypes,
                                  const StringSeq& categories,
                                  Int messageMax,
                                  const Current& current)
+#endif
 {
     if(!prx)
     {
         return; // can't send this null RemoteLogger anything!
     }
-    
+
     //
     // In C++, LoggerAdminI does not keep a "logger" data member to avoid a hard-to-break circular
     // reference, so we retrieve the logger from Current
     //
-    
-    LoggerAdminLoggerIPtr logger = LoggerAdminLoggerIPtr::dynamicCast(current.adapter->getCommunicator()->getLogger());
+
+    LoggerAdminLoggerIPtr logger = ICE_DYNAMIC_CAST(LoggerAdminLoggerI, current.adapter->getCommunicator()->getLogger());
     if(!logger)
     {
         // Our logger is not installed - must be a bug
@@ -345,7 +366,7 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx,
         return;
     }
 
-    RemoteLoggerPrx remoteLogger = prx->ice_twoway();
+    RemoteLoggerPrxPtr remoteLogger = prx->ice_twoway();
 
     Filters filters(messageTypes, categories);
     LogMessageSeq initLogMessages;
@@ -391,8 +412,38 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx,
         filterLogMessages(initLogMessages, filters.messageTypes, filters.traceCategories, messageMax);
     }
 
+#ifdef ICE_CPP11_MAPPING
+    try
+    {
+        auto self = shared_from_this();
+        remoteLogger->initAsync(logger->getPrefix(), initLogMessages,
+            [self, logger, remoteLogger]()
+            {
+                if(self->_traceLevel > 1)
+                {
+                    Trace trace(logger, traceCategory);
+                    trace << "init on `" << remoteLogger << "' completed successfully";
+                }
+            },
+            [self, logger, remoteLogger](exception_ptr e)
+            {
+                try
+                {
+                    rethrow_exception(e);
+                }
+                catch(const Ice::LocalException& e)
+                {
+                    self->deadRemoteLogger(remoteLogger, logger, e, "init");
+                }
+            });
+    }
+    catch(const LocalException& ex)
+    {
+        deadRemoteLogger(remoteLogger, logger, ex, "init");
+        throw;
+    }
+#else
     CallbackPtr initCompletedCb = newCallback(this, &LoggerAdminI::initCompleted);
-
     try
     {
         remoteLogger->begin_init(logger->getPrefix(), initLogMessages, initCompletedCb, logger);
@@ -402,10 +453,15 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx,
         deadRemoteLogger(remoteLogger, logger, ex, "init");
         throw;
     }
+#endif
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+LoggerAdminI::detachRemoteLogger(shared_ptr<RemoteLoggerPrx> remoteLogger, const Current& current)
+#else
 LoggerAdminI::detachRemoteLogger(const RemoteLoggerPrx& remoteLogger, const Current& current)
+#endif
 {
     if(remoteLogger == 0)
     {
@@ -429,13 +485,18 @@ LoggerAdminI::detachRemoteLogger(const RemoteLoggerPrx& remoteLogger, const Curr
             trace << "cannot detach `" << remoteLogger << "': not found";
         }
     }
-    
+
     return found;
 }
 
-LogMessageSeq 
+LogMessageSeq
+#ifdef ICE_CPP11_MAPPING
+LoggerAdminI::getLog(LogMessageTypeSeq messageTypes, StringSeq categories,
+                     Int messageMax, string& prefix, const Current& current)
+#else
 LoggerAdminI::getLog(const LogMessageTypeSeq& messageTypes, const StringSeq& categories,
                      Int messageMax, string& prefix, const Current& current)
+#endif
 {
     LogMessageSeq logMessages;
     {
@@ -449,13 +510,13 @@ LoggerAdminI::getLog(const LogMessageTypeSeq& messageTypes, const StringSeq& cat
 
     LoggerPtr logger = current.adapter->getCommunicator()->getLogger();
     prefix = logger->getPrefix();
-    
+
     if(!logMessages.empty())
     {
         Filters filters(messageTypes, categories);
         filterLogMessages(logMessages, filters.messageTypes, filters.traceCategories, messageMax);
     }
-    
+
     return logMessages;
 }
 
@@ -467,14 +528,14 @@ LoggerAdminI::destroy()
         IceUtil::Mutex::Lock lock(_mutex);
         if(!_destroyed)
         {
-            _destroyed = true; 
+            _destroyed = true;
             sendLogCommunicator = _sendLogCommunicator;
             _sendLogCommunicator = 0;
         }
     }
-    
+
     //
-    // Destroy outside lock to avoid deadlock when there are outstanding two-way log calls sent to 
+    // Destroy outside lock to avoid deadlock when there are outstanding two-way log calls sent to
     // remote logggers
     //
     if(sendLogCommunicator)
@@ -483,22 +544,22 @@ LoggerAdminI::destroy()
     }
 }
 
-vector<RemoteLoggerPrx>
+vector<RemoteLoggerPrxPtr>
 LoggerAdminI::log(const LogMessage& logMessage)
 {
-    vector<RemoteLoggerPrx> remoteLoggers;
+    vector<RemoteLoggerPrxPtr> remoteLoggers;
 
     IceUtil::Mutex::Lock lock(_mutex);
 
     //
     // Put message in _queue
     //
-    if((logMessage.type != TraceMessage && _maxLogCount > 0) ||
-       (logMessage.type == TraceMessage && _maxTraceCount > 0))
+    if((logMessage.type != ICE_ENUM(LogMessageType, TraceMessage) && _maxLogCount > 0) ||
+       (logMessage.type == ICE_ENUM(LogMessageType, TraceMessage) && _maxTraceCount > 0))
     {
         list<LogMessage>::iterator p = _queue.insert(_queue.end(), logMessage);
 
-        if(logMessage.type != TraceMessage)
+        if(logMessage.type != ICE_ENUM(LogMessageType, TraceMessage))
         {
             assert(_maxLogCount > 0);
             if(_logCount == _maxLogCount)
@@ -508,7 +569,7 @@ LoggerAdminI::log(const LogMessage& logMessage)
                 //
                 assert(_oldestLog != _queue.end());
                 _oldestLog = _queue.erase(_oldestLog);
-                while(_oldestLog != _queue.end() && _oldestLog->type == TraceMessage)
+                while(_oldestLog != _queue.end() && _oldestLog->type == ICE_ENUM(LogMessageType, TraceMessage))
                 {
                     _oldestLog++;
                 }
@@ -534,7 +595,7 @@ LoggerAdminI::log(const LogMessage& logMessage)
                 //
                 assert(_oldestTrace != _queue.end());
                 _oldestTrace = _queue.erase(_oldestTrace);
-                while(_oldestTrace != _queue.end() && _oldestTrace->type != TraceMessage)
+                while(_oldestTrace != _queue.end() && _oldestTrace->type != ICE_ENUM(LogMessageType, TraceMessage))
                 {
                     _oldestTrace++;
                 }
@@ -560,7 +621,7 @@ LoggerAdminI::log(const LogMessage& logMessage)
 
             if(filters.messageTypes.empty() || filters.messageTypes.count(logMessage.type) != 0)
             {
-                if(logMessage.type != TraceMessage || filters.traceCategories.empty() ||
+                if(logMessage.type != ICE_ENUM(LogMessageType, TraceMessage) || filters.traceCategories.empty() ||
                    filters.traceCategories.count(logMessage.traceCategory) != 0)
                 {
                     remoteLoggers.push_back(p->first);
@@ -572,7 +633,7 @@ LoggerAdminI::log(const LogMessage& logMessage)
 }
 
 void
-LoggerAdminI::deadRemoteLogger(const RemoteLoggerPrx& remoteLogger,
+LoggerAdminI::deadRemoteLogger(const RemoteLoggerPrxPtr& remoteLogger,
                                const LoggerPtr& logger,
                                const LocalException& ex,
                                const string& operation)
@@ -591,39 +652,44 @@ LoggerAdminI::deadRemoteLogger(const RemoteLoggerPrx& remoteLogger,
 }
 
 bool
-LoggerAdminI::removeRemoteLogger(const RemoteLoggerPrx& remoteLogger)
+LoggerAdminI::removeRemoteLogger(const RemoteLoggerPrxPtr& remoteLogger)
 {
     IceUtil::Mutex::Lock lock(_mutex);
     return _remoteLoggerMap.erase(remoteLogger) > 0;
 }
 
+#ifndef ICE_CPP11_MAPPING
+//
+// begin_init callback method for C++98 mapping
+//
 void
 LoggerAdminI::initCompleted(const AsyncResultPtr& r)
 {
-    RemoteLoggerPrx remoteLogger = RemoteLoggerPrx::uncheckedCast(r->getProxy());
-    
-try 
+    RemoteLoggerPrxPtr remoteLogger = ICE_UNCHECKED_CAST(RemoteLoggerPrx, r->getProxy());
+
+    try
     {
         remoteLogger->end_init(r);
 
         if(_traceLevel > 1)
         {
-            LoggerPtr logger = LoggerPtr::dynamicCast(r->getCookie());
+            LoggerPtr logger = ICE_DYNAMIC_CAST(Logger, r->getCookie());
             Trace trace(logger, traceCategory);
             trace << r->getOperation() << " on `" << remoteLogger << "' completed successfully";
         }
     }
     catch(const LocalException& ex)
     {
-        deadRemoteLogger(remoteLogger, LoggerPtr::dynamicCast(r->getCookie()), ex, r->getOperation());
+        deadRemoteLogger(remoteLogger, ICE_DYNAMIC_CAST(Logger, r->getCookie()), ex, r->getOperation());
     }
 }
+#endif
 
 //
 // LoggerAdminLoggerI
 //
 
-LoggerAdminLoggerI::LoggerAdminLoggerI(const PropertiesPtr& props, 
+LoggerAdminLoggerI::LoggerAdminLoggerI(const PropertiesPtr& props,
                                        const LoggerPtr& localLogger) :
     _loggerAdmin(new LoggerAdminI(props)),
     _destroyed(false)
@@ -648,7 +714,7 @@ LoggerAdminLoggerI::LoggerAdminLoggerI(const PropertiesPtr& props,
 void
 LoggerAdminLoggerI::print(const string& message)
 {
-   LogMessage logMessage = { PrintMessage, IceUtil::Time::now().toMicroSeconds(), "", message };
+   LogMessage logMessage = { ICE_ENUM(LogMessageType, PrintMessage), IceUtil::Time::now().toMicroSeconds(), "", message };
 
     _localLogger->print(message);
     log(logMessage);
@@ -657,7 +723,7 @@ LoggerAdminLoggerI::print(const string& message)
 void
 LoggerAdminLoggerI::trace(const string& category, const string& message)
 {
-    LogMessage logMessage = { TraceMessage, IceUtil::Time::now().toMicroSeconds(), category, message };
+    LogMessage logMessage = { ICE_ENUM(LogMessageType, TraceMessage), IceUtil::Time::now().toMicroSeconds(), category, message };
 
     _localLogger->trace(category, message);
     log(logMessage);
@@ -666,7 +732,7 @@ LoggerAdminLoggerI::trace(const string& category, const string& message)
 void
 LoggerAdminLoggerI::warning(const string& message)
 {
-    LogMessage logMessage = { WarningMessage, IceUtil::Time::now().toMicroSeconds(), "", message };
+    LogMessage logMessage = { ICE_ENUM(LogMessageType, WarningMessage), IceUtil::Time::now().toMicroSeconds(), "", message };
 
     _localLogger->warning(message);
     log(logMessage);
@@ -675,7 +741,7 @@ LoggerAdminLoggerI::warning(const string& message)
 void
 LoggerAdminLoggerI::error(const string& message)
 {
-    LogMessage logMessage = { ErrorMessage, IceUtil::Time::now().toMicroSeconds(), "", message };
+    LogMessage logMessage = { ICE_ENUM(LogMessageType, ErrorMessage), IceUtil::Time::now().toMicroSeconds(), "", message };
 
     _localLogger->error(message);
     log(logMessage);
@@ -702,7 +768,7 @@ LoggerAdminLoggerI::getFacet() const
 void
 LoggerAdminLoggerI::log(const LogMessage& logMessage)
 {
-    const vector<RemoteLoggerPrx> remoteLoggers = _loggerAdmin->log(logMessage);
+    const vector<RemoteLoggerPrxPtr> remoteLoggers = _loggerAdmin->log(logMessage);
 
     if(!remoteLoggers.empty())
     {
@@ -710,7 +776,7 @@ LoggerAdminLoggerI::log(const LogMessage& logMessage)
 
         if(!_sendLogThread)
         {
-            _sendLogThread = new SendLogThread(this);
+            _sendLogThread = new SendLogThread(ICE_SHARED_FROM_THIS);
             _sendLogThread->start();
         }
 
@@ -755,7 +821,9 @@ LoggerAdminLoggerI::run()
         trace << "send log thread started";
     }
 
+#ifndef ICE_CPP11_MAPPING
     CallbackPtr logCompletedCb = newCallback(this, &LoggerAdminLoggerI::logCompleted);
+#endif
 
     for(;;)
     {
@@ -774,7 +842,7 @@ LoggerAdminLoggerI::run()
         _jobQueue.pop_front();
         lock.release();
 
-        for(vector<RemoteLoggerPrx>::const_iterator p = job->remoteLoggers.begin(); p != job->remoteLoggers.end(); ++p)
+        for(vector<RemoteLoggerPrxPtr>::const_iterator p = job->remoteLoggers.begin(); p != job->remoteLoggers.end(); ++p)
         {
             if(_loggerAdmin->getTraceLevel() > 1)
             {
@@ -784,10 +852,39 @@ LoggerAdminLoggerI::run()
 
             try
             {
+#ifdef ICE_CPP11_MAPPING
+                RemoteLoggerPrxPtr remoteLogger = *p;
+                auto self = shared_from_this();
+                remoteLogger->logAsync(job->logMessage,
+                    [self, remoteLogger]()
+                    {
+                        if(self->_loggerAdmin->getTraceLevel() > 1)
+                        {
+                            Trace trace(self->_localLogger, traceCategory);
+                            trace << "log on `" << remoteLogger << "' completed successfully";
+                        }
+                    },
+                    [self, remoteLogger](exception_ptr e)
+                    {
+                        try
+                        {
+                            rethrow_exception(e);
+                        }
+                        catch(const CommunicatorDestroyedException&)
+                        {
+                            // expected if there are outstanding calls during communicator destruction
+                        }
+                        catch(const LocalException& ex)
+                        {
+                            self->_loggerAdmin->deadRemoteLogger(remoteLogger, self->_localLogger, ex, "log");
+                        }
+                    });
+#else
                 //
                 // *p is a proxy associated with the _sendLogCommunicator
                 //
                 (*p)->begin_log(job->logMessage, logCompletedCb);
+#endif
             }
             catch(const LocalException& ex)
             {
@@ -803,12 +900,16 @@ LoggerAdminLoggerI::run()
     }
 }
 
+#ifndef ICE_CPP11_MAPPING
+//
+// begin_log callback for C++98 mapping
+//
 void
 LoggerAdminLoggerI::logCompleted(const AsyncResultPtr& r)
 {
-    RemoteLoggerPrx remoteLogger = RemoteLoggerPrx::uncheckedCast(r->getProxy());
-    
-    try 
+    RemoteLoggerPrxPtr remoteLogger = ICE_UNCHECKED_CAST(RemoteLoggerPrx, r->getProxy());
+
+    try
     {
         remoteLogger->end_log(r);
 
@@ -827,6 +928,7 @@ LoggerAdminLoggerI::logCompleted(const AsyncResultPtr& r)
         _loggerAdmin->deadRemoteLogger(remoteLogger, _localLogger, ex, r->getOperation());
     }
 }
+#endif
 
 //
 // SendLogThread
@@ -852,11 +954,11 @@ SendLogThread::run()
 namespace IceInternal
 {
 
-LoggerAdminLoggerPtr 
-createLoggerAdminLogger(const PropertiesPtr& props, 
+LoggerAdminLoggerPtr
+createLoggerAdminLogger(const PropertiesPtr& props,
                         const LoggerPtr& localLogger)
 {
-    return new LoggerAdminLoggerI(props, localLogger);
+    return ICE_MAKE_SHARED(LoggerAdminLoggerI, props, localLogger);
 }
 
 }
diff --git a/cpp/src/Ice/LoggerAdminI.h b/cpp/src/Ice/LoggerAdminI.h
index 25154144c60..eabc35b0473 100644
--- a/cpp/src/Ice/LoggerAdminI.h
+++ b/cpp/src/Ice/LoggerAdminI.h
@@ -34,11 +34,11 @@ public:
     // Destroy this logger, in particular join any thread
     // that this logger may have started
     //
-    virtual void destroy() = 0; 
+    virtual void destroy() = 0;
 };
-typedef Handle<LoggerAdminLogger> LoggerAdminLoggerPtr;
+ICE_DEFINE_PTR(LoggerAdminLoggerPtr, LoggerAdminLogger);
 
-LoggerAdminLoggerPtr 
+LoggerAdminLoggerPtr
 createLoggerAdminLogger(const Ice::PropertiesPtr&, const Ice::LoggerPtr&);
 
 }
diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp
index 0904b8d3dd9..ced361d0588 100644
--- a/cpp/src/Ice/LoggerI.cpp
+++ b/cpp/src/Ice/LoggerI.cpp
@@ -13,10 +13,6 @@
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
 
-#ifdef _WIN32
-#  include <IceUtil/ScopedArray.h>
-#endif
-
 #include <Ice/LocalException.h>
 
 using namespace std;
@@ -61,7 +57,7 @@ Ice::LoggerI::LoggerI(const string& prefix, const string& file,
     _convert(convert),
     _converter(converter),
 #if defined(_WIN32) && !defined(ICE_OS_WINRT)
-    _consoleConverter(new IceUtil::WindowsStringConverter(GetConsoleOutputCP())),
+    _consoleConverter(IceUtil::createWindowsStringConverter(GetConsoleOutputCP())),
 #endif
     _sizeMax(sizeMax)
 {
@@ -134,7 +130,7 @@ Ice::LoggerI::getPrefix()
 LoggerPtr
 Ice::LoggerI::cloneWithPrefix(const std::string& prefix)
 {
-    return new LoggerI(prefix, _file, _convert, _converter);
+    return ICE_MAKE_SHARED(LoggerI, prefix, _file, _convert, _converter);
 }
 
 void
diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h
index 1c516bad393..c48e768d1b4 100644
--- a/cpp/src/Ice/LoggerI.h
+++ b/cpp/src/Ice/LoggerI.h
@@ -55,8 +55,7 @@ private:
 #endif
 
 };
-
-typedef IceUtil::Handle<LoggerI> LoggerIPtr;
+ICE_DEFINE_PTR(LoggerIPtr, LoggerI);
 
 }
 
diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp
index 6653fe9a243..13dd1eae363 100644
--- a/cpp/src/Ice/LoggerUtil.cpp
+++ b/cpp/src/Ice/LoggerUtil.cpp
@@ -19,7 +19,7 @@ using namespace std;
 namespace IceUtilInternal
 {
 
-extern bool ICE_UTIL_API printStackTraces;
+extern bool printStackTraces;
 
 }
 
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
deleted file mode 100644
index 038e6c6ac74..00000000000
--- a/cpp/src/Ice/Makefile
+++ /dev/null
@@ -1,199 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME	= $(call mklibfilename,Ice,$(VERSION))
-SONAME		= $(call mksoname,Ice,$(SOVERSION))
-LIBNAME		= $(call mklibname,Ice)
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-
-SLICE_OBJS	= BuiltinSequences.o \
-		  Communicator.o \
-		  CommunicatorF.o \
-		  Connection.o \
-		  ConnectionF.o \
-		  Current.o \
-		  Endpoint.o \
-		  EndpointF.o \
-		  EndpointTypes.o \
-		  FacetMap.o \
-		  Identity.o \
-		  ImplicitContext.o \
-		  ImplicitContextF.o \
-		  Instrumentation.o \
-		  InstrumentationF.o \
-		  LocalException.o \
-		  Locator.o \
-		  LocatorF.o \
-		  Logger.o \
-		  LoggerF.o \
-		  Metrics.o \
-		  ObjectAdapter.o \
-		  ObjectAdapterF.o \
-		  ObjectFactory.o \
-		  ObjectFactoryF.o \
-		  Plugin.o \
-		  PluginF.o \
-		  Process.o \
-		  ProcessF.o \
-		  Properties.o \
-		  PropertiesAdmin.o \
-		  PropertiesF.o \
-		  RemoteLogger.o \
-		  Router.o \
-		  RouterF.o \
-		  ServantLocator.o \
-		  ServantLocatorF.o \
-		  SliceChecksumDict.o \
-		  Version.o
-
-OBJS		= Acceptor.o \
-		  ACM.o \
-		  Application.o \
-	 	  AsyncResult.o \
-		  Base64.o \
-		  BasicStream.o \
-		  BatchRequestQueue.o \
-		  Buffer.o \
-		  CollocatedRequestHandler.o \
-		  CommunicatorI.o \
-		  ConnectionFactory.o \
-		  ConnectionI.o \
-		  ConnectionRequestHandler.o \
-		  Connector.o \
-		  ConnectRequestHandler.o \
-		  DefaultsAndOverrides.o \
-		  DeprecatedStringConverter.o \
-		  DispatchInterceptor.o \
-		  DynamicLibrary.o \
-		  EndpointFactory.o \
-		  EndpointFactoryManager.o \
-		  EndpointI.o \
-		  EventHandler.o \
-		  Exception.o \
-		  FactoryTable.o \
-		  FactoryTableInit.o \
-		  GCObject.o \
-		  HttpParser.o \
-		  ImplicitContextI.o \
-		  Incoming.o \
-		  IncomingAsync.o \
-		  Initialize.o \
-		  Instance.o \
-		  InstrumentationI.o \
-		  IPEndpointI.o \
-		  LocalObject.o \
-		  LocatorInfo.o \
-		  LoggerAdminI.o \
-		  LoggerI.o \
-		  LoggerUtil.o \
-		  MetricsAdminI.o \
-		  MetricsObserverI.o \
-		  Network.o \
-		  NetworkProxy.o \
-		  Object.o \
-		  ObjectAdapterFactory.o \
-		  ObjectAdapterI.o \
-		  ObjectFactoryManager.o \
-		  ObserverHelper.o \
-		  OpaqueEndpointI.o \
-		  Outgoing.o \
-		  OutgoingAsync.o \
-		  PluginManagerI.o \
-		  PropertiesAdminI.o \
-	 	  PropertiesI.o \
-		  PropertyNames.o \
-		  Protocol.o \
-		  ProtocolInstance.o \
-		  ProtocolPluginFacade.o \
-		  Proxy.o \
-		  ProxyFactory.o \
-		  Reference.o \
-		  ReferenceFactory.o \
-		  RegisterPluginsInit.o \
-		  RequestHandler.o \
-		  RequestHandlerFactory.o \
-		  ResponseHandler.o \
-		  RetryQueue.o \
-		  RouterInfo.o \
-		  Selector.o \
-		  ServantManager.o \
-		  SliceChecksums.o \
-		  SlicedData.o \
-		  Stream.o \
-		  StreamI.o \
-		  StreamSocket.o \
-		  StringConverterPlugin.o \
-		  TcpAcceptor.o \
-		  TcpConnector.o \
-		  TcpEndpointI.o \
-		  TcpTransceiver.o \
-		  ThreadPool.o \
-		  TraceLevels.o \
-		  TraceUtil.o \
-		  Transceiver.o \
-		  UdpConnector.o \
-		  UdpEndpointI.o \
-		  UdpTransceiver.o \
-		  WSAcceptor.o \
-		  WSConnector.o \
-		  WSEndpoint.o \
-		  WSTransceiver.o \
-		  $(SLICE_OBJS)
-
-ifeq ($(findstring MINGW,$(shell uname)),)
-OBJS		:= $(OBJS) \
-		  Service.o \
-		  SysLoggerI.o
-endif
-
-HDIR		= $(headerdir)/Ice
-SDIR		= $(slicedir)/Ice
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I.. $(CPPFLAGS) -DICE_API_EXPORTS $(BZIP2_FLAGS)
-ifneq ($(COMPSUFFIX),)
-CPPFLAGS	:= $(CPPFLAGS) -DCOMPSUFFIX=\"$(COMPSUFFIX)\"
-endif
-SLICE2CPPFLAGS	:= --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS)
-
-LINKWITH        := -lIceUtil $(BZIP2_LIBS) $(ICE_OS_LIBS) $(ICONV_LIBS)
-
-ifeq ($(UNAME),MINGW)
-$(OBJS): $(BZIP2_NUPKG)
-endif
-
-ifeq ($(STATICLIBS),yes)
-$(libdir)/$(LIBNAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mklib,$@,$(OBJS))
-else
-$(libdir)/$(LIBFILENAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	@mkdir -p $(libdir)$(cpp11libdirsuffix)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-endif
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
-ifeq ($(UNAME),MINGW)
-	$(call installlib,$(DESTDIR)$(install_libdir),$(BZIP2_HOME)/build/native/bin/$(PLATFORM),bzip2_mingw.dll,,)
-endif
\ No newline at end of file
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak
deleted file mode 100644
index 3ac8522b9f1..00000000000
--- a/cpp/src/Ice/Makefile.mak
+++ /dev/null
@@ -1,244 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME		= $(top_srcdir)\lib\ice$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\ice$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-SLICE_OBJS	= .\BuiltinSequences.obj \
-		  .\Communicator.obj \
-		  .\CommunicatorF.obj \
-		  .\Connection.obj \
-		  .\ConnectionF.obj \
-		  .\Current.obj \
-		  .\Endpoint.obj \
-		  .\EndpointF.obj \
-		  .\EndpointTypes.obj \
-		  .\FacetMap.obj \
-		  .\Identity.obj \
-		  .\ImplicitContext.obj \
-		  .\ImplicitContextF.obj \
-		  .\Instrumentation.obj \
-		  .\InstrumentationF.obj \
-		  .\LocalException.obj \
-		  .\Locator.obj \
-		  .\LocatorF.obj \
-		  .\Logger.obj \
-		  .\LoggerF.obj \
-		  .\Metrics.obj \
-		  .\ObjectAdapter.obj \
-		  .\ObjectAdapterF.obj \
-		  .\ObjectFactory.obj \
-		  .\ObjectFactoryF.obj \
-		  .\Plugin.obj \
-		  .\PluginF.obj \
-		  .\Process.obj \
-		  .\ProcessF.obj \
-		  .\Properties.obj \
-		  .\PropertiesAdmin.obj \
-		  .\PropertiesF.obj \
-		  .\RemoteLogger.obj \
-		  .\Router.obj \
-		  .\RouterF.obj \
-		  .\ServantLocator.obj \
-		  .\ServantLocatorF.obj \
-		  .\SliceChecksumDict.obj \
-		  .\Version.obj
-
-WINDOWS_OBJS   =  .\DLLMain.obj
-
-OBJS	       =  .\Acceptor.obj \
-		  .\ACM.obj \
-		  .\Application.obj \
-		  .\AsyncResult.obj \
-		  .\Base64.obj \
-		  .\BasicStream.obj \
-		  .\BatchRequestQueue.obj \
-		  .\Buffer.obj \
-		  .\CollocatedRequestHandler.obj \
-		  .\CommunicatorI.obj \
-		  .\ConnectionFactory.obj \
-		  .\ConnectionI.obj \
-		  .\ConnectionRequestHandler.obj \
-		  .\Connector.obj \
-		  .\ConnectRequestHandler.obj \
-		  .\DefaultsAndOverrides.obj \
-		  .\DeprecatedStringConverter.obj \
-		  .\DispatchInterceptor.obj \
-		  .\DynamicLibrary.obj \
-		  .\EndpointFactory.obj \
-		  .\EndpointFactoryManager.obj \
-		  .\EndpointI.obj \
-		  .\EventHandler.obj \
-		  .\Exception.obj \
-		  .\FactoryTable.obj \
-		  .\FactoryTableInit.obj \
-		  .\GCObject.obj \
-		  .\HttpParser.obj \
-		  .\ImplicitContextI.obj \
-		  .\Incoming.obj \
-		  .\IncomingAsync.obj \
-		  .\Initialize.obj \
-		  .\Instance.obj \
-		  .\InstrumentationI.obj \
-		  .\IPEndpointI.obj \
-		  .\LocalObject.obj \
-		  .\LocatorInfo.obj \
-		  .\LoggerAdminI.obj \
-		  .\LoggerI.obj \
-		  .\LoggerUtil.obj \
-		  .\MetricsAdminI.obj \
-		  .\MetricsObserverI.obj \
-		  .\Network.obj \
-		  .\NetworkProxy.obj \
-		  .\Object.obj \
-		  .\ObjectAdapterFactory.obj \
-		  .\ObjectAdapterI.obj \
-		  .\ObjectFactoryManager.obj \
-		  .\ObserverHelper.obj \
-		  .\OpaqueEndpointI.obj \
-		  .\Outgoing.obj \
-		  .\OutgoingAsync.obj \
-		  .\PluginManagerI.obj \
-		  .\PropertiesAdminI.obj \
-		  .\PropertiesI.obj \
-		  .\PropertyNames.obj \
-		  .\Protocol.obj \
-		  .\ProtocolInstance.obj \
-		  .\ProtocolPluginFacade.obj \
-		  .\Proxy.obj \
-		  .\ProxyFactory.obj \
-		  .\Reference.obj \
-		  .\ReferenceFactory.obj \
-		  .\RegisterPluginsInit.obj \
-		  .\RequestHandler.obj \
-		  .\RequestHandlerFactory.obj \
-		  .\ResponseHandler.obj \
-		  .\RetryQueue.obj \
-		  .\RouterInfo.obj \
-		  .\Selector.obj \
-		  .\ServantManager.obj \
-		  .\Service.obj \
-		  .\SliceChecksums.obj \
-		  .\SlicedData.obj \
-		  .\Stream.obj \
-		  .\StreamI.obj \
-		  .\StreamSocket.obj \
-		  .\StringConverterPlugin.obj \
-		  .\TcpAcceptor.obj \
-		  .\TcpConnector.obj \
-		  .\TcpEndpointI.obj \
-		  .\TcpTransceiver.obj \
-		  .\ThreadPool.obj \
-		  .\TraceLevels.obj \
-		  .\TraceUtil.obj \
-		  .\Transceiver.obj \
-		  .\UdpConnector.obj \
-		  .\UdpEndpointI.obj \
-		  .\UdpTransceiver.obj \
-		  .\WSAcceptor.obj \
-		  .\WSConnector.obj \
-		  .\WSEndpoint.obj \
-		  .\WSTransceiver.obj \
-		  $(WINDOWS_OBJS) \
-		  $(SLICE_OBJS)
-
-HDIR		= $(headerdir)\Ice
-SDIR		= $(slicedir)\Ice
-
-RC_SRCS		= EventLoggerMsg.rc
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-$(OBJS)		: $(BZIP2_NUPKG)
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DWIN32_LEAN_AND_MEAN -bigobj $(BZIP2_CPPFLAGS)
-!if "$(UNIQUE_DLL_NAMES)" == "yes"
-CPPFLAGS	= $(CPPFLAGS) -DCOMPSUFFIX=\"$(COMPSUFFIX)\"
-!endif
-SLICE2CPPFLAGS	= --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS)
-LINKWITH        =  $(BASELIBS) $(BZIP2_LIBS) $(ICE_OS_LIBS)
-
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-LD_DLLFLAGS	= $(LD_DLLFLAGS) /entry:"ice_DLL_Main"
-RES_FILE	= Ice.res
-
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) Ice.res
-	$(LINK) $(BASE):0x22000000 $(LD_DLLFLAGS) $(BZIP2_LDFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-		$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-Ice.res: EventLoggerMsg.rc
-
-EventLoggerMsg.h EventLoggerMsg.rc: EventLoggerMsg.mc
-        mc EventLoggerMsg.mc
-
-clean::
-	-del /q BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h
-	-del /q Communicator.cpp $(HDIR)\Communicator.h
-	-del /q CommunicatorF.cpp $(HDIR)\CommunicatorF.h
-	-del /q Connection.cpp $(HDIR)\Connection.h
-	-del /q ConnectionF.cpp $(HDIR)\ConnectionF.h
-	-del /q Current.cpp $(HDIR)\Current.h
-	-del /q Endpoint.cpp $(HDIR)\Endpoint.h
-	-del /q EndpointF.cpp $(HDIR)\EndpointF.h
-	-del /q EndpointTypes.cpp $(HDIR)\EndpointTypes.h
-	-del /q FacetMap.cpp $(HDIR)\FacetMap.h
-	-del /q Identity.cpp $(HDIR)\Identity.h
-	-del /q ImplicitContext.cpp $(HDIR)\ImplicitContext.h
-	-del /q ImplicitContextF.cpp $(HDIR)\ImplicitContextF.h
-	-del /q Instrumentation.cpp $(HDIR)\Instrumentation.h
-	-del /q InstrumentationF.cpp $(HDIR)\InstrumentationF.h
-	-del /q LocalException.cpp $(HDIR)\LocalException.h
-	-del /q Locator.cpp $(HDIR)\Locator.h
-	-del /q LocatorF.cpp $(HDIR)\LocatorF.h
-	-del /q Logger.cpp $(HDIR)\Logger.h
-	-del /q LoggerF.cpp $(HDIR)\LoggerF.h
-	-del /q Metrics.cpp $(HDIR)\Metrics.h
-	-del /q ObjectAdapter.cpp $(HDIR)\ObjectAdapter.h
-	-del /q ObjectAdapterF.cpp $(HDIR)\ObjectAdapterF.h
-	-del /q ObjectFactory.cpp $(HDIR)\ObjectFactory.h
-	-del /q ObjectFactoryF.cpp $(HDIR)\ObjectFactoryF.h
-	-del /q Plugin.cpp $(HDIR)\Plugin.h
-	-del /q PluginF.cpp $(HDIR)\PluginF.h
-	-del /q Process.cpp $(HDIR)\Process.h
-	-del /q ProcessF.cpp $(HDIR)\ProcessF.h
-	-del /q Properties.cpp $(HDIR)\Properties.h
-	-del /q PropertiesAdmin.cpp $(HDIR)\PropertiesAdmin.h
-	-del /q PropertiesF.cpp $(HDIR)\PropertiesF.h
-	-del /q RemoteLogger.cpp $(HDIR)\RemoteLogger.h
-	-del /q Router.cpp $(HDIR)\Router.h
-	-del /q RouterF.cpp $(HDIR)\RouterF.h
-	-del /q ServantLocator.cpp $(HDIR)\ServantLocator.h
-	-del /q ServantLocatorF.cpp $(HDIR)\ServantLocatorF.h
-	-del /q SliceChecksumDict.cpp $(HDIR)\SliceChecksumDict.h
-	-del /q Version.cpp $(HDIR)\Version.h
-	-del /q Ice.res
-	-del /q EventLoggerMsg.h EventLoggerMsg.rc MSG00001.bin
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/Ice/Makefile.mk b/cpp/src/Ice/Makefile.mk
new file mode 100644
index 00000000000..44890c32c18
--- /dev/null
+++ b/cpp/src/Ice/Makefile.mk
@@ -0,0 +1,31 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries	= Ice
+
+Ice_targetdir		:= $(libdir)
+Ice_cppflags  		= -DICE_API_EXPORTS $(IceUtil_cppflags)
+
+ifeq ($(DEFAULT_MUTEX_PROTOCOL), PrioInherit)
+    Ice_cppflags        += -DICE_PRIO_INHERIT
+endif
+
+Ice_sliceflags		:= --include-dir Ice --dll-export ICE_API
+Ice_libs		:= bz2
+Ice_extra_sources       := $(wildcard src/IceUtil/*.cpp)
+Ice_excludes		= src/Ice/DLLMain.cpp
+
+ifeq ($(os),Darwin)
+Ice_excludes            += src/IceUtil/ConvertUTF.cpp src/IceUtil/Unicode.cpp
+endif
+
+Ice[iphoneos]_extra_sources 		:= $(wildcard $(addprefix $(currentdir)/ios/,*.cpp *.mm))
+Ice[iphonesimulator]_extra_sources	= $(Ice[iphoneos]_extra_sources)
+
+projects += $(project)
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp
index f576f14d5f9..d8f03c8b0f6 100644
--- a/cpp/src/Ice/MetricsAdminI.cpp
+++ b/cpp/src/Ice/MetricsAdminI.cpp
@@ -80,7 +80,7 @@ parseRule(const PropertiesPtr& properties, const string& name)
     {
         try
         {
-            regexps.push_back(new MetricsMapI::RegExp(p->first.substr(name.length() + 1), p->second));
+            regexps.push_back(ICE_MAKE_SHARED(MetricsMapI::RegExp, p->first.substr(name.length() + 1), p->second));
         }
         catch(const std::exception&)
         {
@@ -99,7 +99,7 @@ MetricsMapI::RegExp::RegExp(const string& attribute, const string& regexp) : _at
     // No regexp support with MinGW, when MinGW C++11 mode is not experimental
     // we can use std::regex.
     //
-#elif !defined(ICE_CPP11_REGEXP)
+#elif !defined(ICE_CPP11_COMPILER_REGEXP)
     if(regcomp(&_preg, regexp.c_str(), REG_EXTENDED | REG_NOSUB) != 0)
     {
         throw SyscallException(__FILE__, __LINE__); 
@@ -120,7 +120,7 @@ MetricsMapI::RegExp::~RegExp()
     // No regexp support with MinGW, when MinGW C++11 mode is not experimental
     // we can use std::regex.
     //
-#elif !defined(ICE_CPP11_REGEXP)
+#elif !defined(ICE_CPP11_COMPILER_REGEXP)
     regfree(&_preg);
 #endif
 }
@@ -134,7 +134,7 @@ MetricsMapI::RegExp::match(const string& value)
     // we can use std::regex.
     //
     return false;
-#elif !defined(ICE_CPP11_REGEXP)
+#elif !defined(ICE_CPP11_COMPILER_REGEXP)
     return regexec(&_preg, value.c_str(), 0, 0, 0) == 0;
 #else
 #   if _MSC_VER < 1600
@@ -145,6 +145,11 @@ MetricsMapI::RegExp::match(const string& value)
 #endif
 }
 
+MetricsMapI::~MetricsMapI()
+{
+    // Out of line to avoid weak vtable
+}
+
 MetricsMapI::MetricsMapI(const std::string& mapPrefix, const PropertiesPtr& properties) :
     _properties(properties->getPropertiesForPrefix(mapPrefix)),
     _retain(properties->getPropertyAsIntWithDefault(mapPrefix + "RetainDetached", 10)),
@@ -213,6 +218,11 @@ MetricsMapI::getProperties() const
     return _properties;
 }
 
+MetricsMapFactory::~MetricsMapFactory()
+{
+    // Out of line to avoid weak vtable
+}
+
 MetricsMapFactory::MetricsMapFactory(Updater* updater) : _updater(updater)
 {
 }
@@ -378,7 +388,7 @@ MetricsViewI::getMap(const string& mapName) const
     {
         return p->second;
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
 MetricsAdminI::MetricsAdminI(const PropertiesPtr& properties, const LoggerPtr& logger) : 
@@ -439,7 +449,7 @@ MetricsAdminI::updateViews()
             map<string, MetricsViewIPtr>::const_iterator q = _views.find(viewName);
             if(q == _views.end())
             {
-                q = views.insert(map<string, MetricsViewIPtr>::value_type(viewName, new MetricsViewI(viewName))).first;
+                q = views.insert(map<string, MetricsViewIPtr>::value_type(viewName, ICE_MAKE_SHARED(MetricsViewI, viewName))).first;
             }
             else
             {
@@ -529,7 +539,11 @@ MetricsAdminI::getMetricsViewNames(Ice::StringSeq& disabledViews, const Current&
 }
 
 void
+#ifdef ICE_CPP11_MAPPING
+MetricsAdminI::enableMetricsView(string viewName, const Current&)
+#else
 MetricsAdminI::enableMetricsView(const string& viewName, const Current&)
+#endif
 {
     {
         Lock sync(*this);
@@ -540,7 +554,11 @@ MetricsAdminI::enableMetricsView(const string& viewName, const Current&)
 }
 
 void
+#ifdef ICE_CPP11_MAPPING
+MetricsAdminI::disableMetricsView(string viewName, const Current&)
+#else
 MetricsAdminI::disableMetricsView(const string& viewName, const Current&)
+#endif
 {
     {
         Lock sync(*this);
@@ -551,7 +569,11 @@ MetricsAdminI::disableMetricsView(const string& viewName, const Current&)
 }
 
 MetricsView
+#ifdef ICE_CPP11_MAPPING
+MetricsAdminI::getMetricsView(string viewName, ::Ice::Long& timestamp, const Current&)
+#else
 MetricsAdminI::getMetricsView(const string& viewName, ::Ice::Long& timestamp, const Current&)
+#endif
 {
     Lock sync(*this);
     MetricsViewIPtr view = getMetricsView(viewName);
@@ -564,7 +586,11 @@ MetricsAdminI::getMetricsView(const string& viewName, ::Ice::Long& timestamp, co
 }
 
 MetricsFailuresSeq
+#ifdef ICE_CPP11_MAPPING
+MetricsAdminI::getMapMetricsFailures(string viewName, string map, const Current&)
+#else
 MetricsAdminI::getMapMetricsFailures(const string& viewName, const string& map, const Current&)
+#endif
 {
     Lock sync(*this);
     MetricsViewIPtr view = getMetricsView(viewName);
@@ -576,7 +602,11 @@ MetricsAdminI::getMapMetricsFailures(const string& viewName, const string& map,
 }
 
 MetricsFailures
+#ifdef ICE_CPP11_MAPPING
+MetricsAdminI::getMetricsFailures(string viewName, string map, string id, const Current&)
+#else
 MetricsAdminI::getMetricsFailures(const string& viewName, const string& map, const string& id, const Current&)
+#endif
 {
     Lock sync(*this);
     MetricsViewIPtr view = getMetricsView(viewName);
@@ -619,7 +649,7 @@ MetricsAdminI::getMetricsView(const std::string& name)
         {
             throw UnknownMetricsView();
         }
-        return 0;
+        return ICE_NULLPTR;
     }
     return p->second;
 }
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 7fa9614379c..09688766350 100644..100755
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -28,6 +28,7 @@
 #include <Ice/LoggerUtil.h> // For setTcpBufSize
 #include <Ice/Buffer.h>
 #include <IceUtil/Random.h>
+#include <functional>
 
 #if defined(ICE_OS_WINRT)
 #   include <IceUtil/InputUtil.h>
@@ -87,6 +88,20 @@ using namespace Windows::Networking::Sockets;
 using namespace Windows::Networking::Connectivity;
 #endif
 
+#ifdef _WIN32
+int
+IceInternal::getSystemErrno()
+{
+    return GetLastError();
+}
+#else
+int
+IceInternal::getSystemErrno()
+{
+    return errno;
+}
+#endif
+
 namespace
 {
 
@@ -170,7 +185,7 @@ setTcpLoopbackFastPath(SOCKET fd)
         WSAIoctl(fd, SIO_LOOPBACK_FAST_PATH, &OptionValue, sizeof(OptionValue), NULL, 0, &NumberOfBytesReturned, 0, 0);
     if(status == SOCKET_ERROR)
     {
-	    // On platforms that do not support fast path (< Windows 8), WSAEONOTSUPP is expected.
+            // On platforms that do not support fast path (< Windows 8), WSAEONOTSUPP is expected.
         DWORD LastError = ::GetLastError();
         if(LastError != WSAEOPNOTSUPP)
         {
@@ -762,7 +777,24 @@ getAddressStorageSize(const Address& addr)
 
 }
 
+ReadyCallback::~ReadyCallback()
+{
+    // Out of line to avoid weak vtable
+}
+
+NativeInfo::~NativeInfo()
+{
+    // Out of line to avoid weak vtable
+}
+
+void
+NativeInfo::setReadyCallback(const ReadyCallbackPtr& callback)
+{
+    _readyCallback = callback;
+}
+
 #ifdef ICE_USE_IOCP
+
 IceInternal::AsyncInfo::AsyncInfo(SocketOperation s)
 {
     ZeroMemory(this, sizeof(AsyncInfo));
@@ -786,15 +818,116 @@ IceInternal::NativeInfo::completed(SocketOperation operation)
         throw ex;
     }
 }
+
 #elif defined(ICE_OS_WINRT)
 
 void
+IceInternal::NativeInfo::queueAction(SocketOperation op, IAsyncAction^ action, bool connect)
+{
+    AsyncInfo* asyncInfo = getAsyncInfo(op);
+    if(checkIfErrorOrCompleted(op, action, connect))
+    {
+        asyncInfo->count = 0;
+    }
+    else
+    {
+        action->Completed = ref new AsyncActionCompletedHandler(
+            [=] (IAsyncAction^ info, Windows::Foundation::AsyncStatus status)
+            {
+                if(status != Windows::Foundation::AsyncStatus::Completed)
+                {
+                    asyncInfo->count = SOCKET_ERROR;
+                    asyncInfo->error = info->ErrorCode.Value;
+                }
+                else
+                {
+                    asyncInfo->count = 0;
+                }
+                completed(op);
+            });
+    }
+}
+
+void
+IceInternal::NativeInfo::queueOperation(SocketOperation op, IAsyncOperation<unsigned int>^ operation)
+{
+    AsyncInfo* info = getAsyncInfo(op);
+    if(checkIfErrorOrCompleted(op, operation))
+    {
+        info->count = static_cast<int>(operation->GetResults());
+    }
+    else
+    {
+        if(!info->completedHandler)
+        {
+            info->completedHandler = ref new AsyncOperationCompletedHandler<unsigned int>(
+                [=] (IAsyncOperation<unsigned int>^ operation, Windows::Foundation::AsyncStatus status)
+                {
+                    if(status != Windows::Foundation::AsyncStatus::Completed)
+                    {
+                        info->count = SOCKET_ERROR;
+                        info->error = operation->ErrorCode.Value;
+                    }
+                    else
+                    {
+                        info->count = static_cast<int>(operation->GetResults());
+                    }
+                    completed(op);
+                });
+        }
+        operation->Completed = info->completedHandler;
+    }
+}
+
+void
+IceInternal::NativeInfo::setCompletedHandler(SocketOperationCompletedHandler^ handler)
+{
+    _completedHandler = handler;
+}
+
+void
 IceInternal::NativeInfo::completed(SocketOperation operation)
 {
     assert(_completedHandler);
     _completedHandler(operation);
 }
 
+bool
+IceInternal::NativeInfo::checkIfErrorOrCompleted(SocketOperation op, IAsyncInfo^ info, bool connect)
+{
+    //
+    // NOTE: It's important to only check for info->Status once as it
+    // might change during the checks below (the Status can be changed
+    // by the Windows thread pool concurrently).
+    //
+    // We consider that a canceled async status is the same as an
+    // error. A canceled async status can occur if there's a timeout
+    // and the socket is closed.
+    //
+    Windows::Foundation::AsyncStatus status = info->Status;
+    if(status == Windows::Foundation::AsyncStatus::Completed)
+    {
+        _completedHandler(op);
+        return true;
+    }
+    else if (status == Windows::Foundation::AsyncStatus::Started)
+    {
+        return false;
+    }
+    else
+    {
+        if(connect) // Connect
+        {
+            checkConnectErrorCode(__FILE__, __LINE__, info->ErrorCode.Value);
+        }
+        else
+        {
+            checkErrorCode(__FILE__, __LINE__, info->ErrorCode.Value);
+        }
+        return true; // Prevent compiler warning.
+    }
+}
+
 #endif
 
 bool
@@ -1983,6 +2116,9 @@ IceInternal::setReuseAddress(SOCKET fd, bool reuse)
 
 
 #ifdef ICE_OS_WINRT
+namespace
+{
+
 void
 checkResultAndWait(IAsyncAction^ action)
 {
@@ -2010,6 +2146,8 @@ checkResultAndWait(IAsyncAction^ action)
         checkErrorCode(__FILE__, __LINE__, action->ErrorCode.Value);
     }
 }
+
+}
 #endif
 
 Address
@@ -2548,7 +2686,7 @@ IceInternal::createPipe(SOCKET fds[2])
 #else // ICE_OS_WINRT
 
 void
-IceInternal::checkConnectErrorCode(const char* file, int line, HRESULT herr, HostName^ host)
+IceInternal::checkConnectErrorCode(const char* file, int line, HRESULT herr)
 {
     if(herr == E_ACCESSDENIED)
     {
@@ -2578,11 +2716,6 @@ IceInternal::checkConnectErrorCode(const char* file, int line, HRESULT herr, Hos
     {
         DNSException ex(file, line);
         ex.error = static_cast<int>(error);
-        //
-        // Don't need to pass a wide string converter as the wide string come from
-        // Windows API.
-        //
-        ex.host = IceUtil::wstringToString(host->RawName->Data(), IceUtil::getProcessStringConverter());
         throw ex;
     }
     else
@@ -2751,4 +2884,3 @@ IceInternal::doFinishConnectAsync(SOCKET fd, AsyncInfo& info)
     }
 }
 #endif
-
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index ea7ebd61f19..f313e30a560 100644..100755
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -24,8 +24,8 @@
 #include <Ice/ProtocolInstanceF.h>
 #include <Ice/EndpointTypes.h>
 
-#ifdef ICE_OS_WINRT
-#   include <Ice/EventHandlerF.h>
+#if defined(ICE_OS_WINRT)
+// Nothing to include
 #elif defined(_WIN32)
 #   include <winsock2.h>
 #   include <ws2tcpip.h>
@@ -179,6 +179,7 @@ struct ICE_API AsyncInfo : WSAOVERLAPPED
 #elif defined(ICE_OS_WINRT)
 struct ICE_API AsyncInfo
 {
+    Windows::Foundation::AsyncOperationCompletedHandler<unsigned int>^ completedHandler;
     int count;
     int error;
 };
@@ -186,10 +187,23 @@ struct ICE_API AsyncInfo
 delegate void SocketOperationCompletedHandler(int);
 #endif
 
-class ICE_API NativeInfo : virtual public IceUtil::Shared
+class ICE_API ReadyCallback : public virtual ::IceUtil::Shared
+{
+public:
+
+    virtual ~ReadyCallback();
+
+
+    virtual void ready(SocketOperation, bool) = 0;
+};
+typedef IceUtil::Handle<ReadyCallback> ReadyCallbackPtr;
+
+class ICE_API NativeInfo : public virtual IceUtil::Shared
 {
 public:
 
+    virtual ~NativeInfo();
+
     NativeInfo(SOCKET socketFd = INVALID_SOCKET) : _fd(socketFd)
     {
     }
@@ -199,26 +213,39 @@ public:
         return _fd;
     }
 
+    void setReadyCallback(const ReadyCallbackPtr& callback);
+
+    void ready(SocketOperation operation, bool value)
+    {
+        assert(_readyCallback);
+        _readyCallback->ready(operation, value);
+    }
+
     //
     // This is implemented by transceiver and acceptor implementations.
     //
 #if defined(ICE_USE_IOCP)
     virtual AsyncInfo* getAsyncInfo(SocketOperation) = 0;
     void initialize(HANDLE, ULONG_PTR);
-    void completed(SocketOperation operation);
+    void completed(SocketOperation);
 #elif defined(ICE_OS_WINRT)
-    virtual void setCompletedHandler(SocketOperationCompletedHandler^) = 0;
-    void completed(SocketOperation operation);
+    virtual AsyncInfo* getAsyncInfo(SocketOperation) = 0;
+    void queueAction(SocketOperation, Windows::Foundation::IAsyncAction^, bool = false);
+    void queueOperation(SocketOperation, Windows::Foundation::IAsyncOperation<unsigned int>^);
+    void setCompletedHandler(SocketOperationCompletedHandler^);
+    void completed(SocketOperation);
 #endif
 
 protected:
 
     SOCKET _fd;
+    ReadyCallbackPtr _readyCallback;
 
 #if defined(ICE_USE_IOCP)
     HANDLE _handle;
     ULONG_PTR _key;
 #elif defined(ICE_OS_WINRT)
+    bool checkIfErrorOrCompleted(SocketOperation, Windows::Foundation::IAsyncInfo^, bool = false);
     SocketOperationCompletedHandler^ _completedHandler;
 #endif
 };
@@ -270,6 +297,7 @@ ICE_API void setMcastTtl(SOCKET, int, const Address&);
 ICE_API void setReuseAddress(SOCKET, bool);
 
 ICE_API Address doBind(SOCKET, const Address&);
+ICE_API void doListen(SOCKET, int);
 
 #ifndef ICE_OS_WINRT
 ICE_API bool interrupted();
@@ -284,7 +312,6 @@ ICE_API bool connectionRefused();
 ICE_API bool connectInProgress();
 ICE_API bool connectionLost();
 
-ICE_API void doListen(SOCKET, int);
 ICE_API bool doConnect(SOCKET, const Address&, const Address&);
 ICE_API void doFinishConnect(SOCKET);
 ICE_API SOCKET doAccept(SOCKET);
@@ -295,7 +322,7 @@ ICE_API int getSocketErrno();
 
 ICE_API Address getNumericAddress(const std::string&);
 #else
-ICE_API void checkConnectErrorCode(const char*, int, HRESULT, Windows::Networking::HostName^);
+ICE_API void checkConnectErrorCode(const char*, int, HRESULT);
 ICE_API void checkErrorCode(const char*, int, HRESULT);
 #endif
 
diff --git a/cpp/src/Ice/NetworkProxy.cpp b/cpp/src/Ice/NetworkProxy.cpp
index b03f3b3007e..bdcf580b8d1 100644
--- a/cpp/src/Ice/NetworkProxy.cpp
+++ b/cpp/src/Ice/NetworkProxy.cpp
@@ -17,6 +17,11 @@ using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(NetworkProxy* p) { return p; }
 
+NetworkProxy::~NetworkProxy()
+{
+    // Out of line to avoid weak vtable
+}
+
 #ifndef ICE_OS_WINRT
 
 namespace
diff --git a/cpp/src/Ice/NetworkProxy.h b/cpp/src/Ice/NetworkProxy.h
index 1945680cf2a..6e1d7f483ef 100644
--- a/cpp/src/Ice/NetworkProxy.h
+++ b/cpp/src/Ice/NetworkProxy.h
@@ -11,14 +11,17 @@
 #define ICE_NETWORK_PROXY_H
 
 #include <Ice/Network.h>
+#include <Ice/Buffer.h>
 
 namespace IceInternal
 {
 
-class ICE_API NetworkProxy : virtual public IceUtil::Shared
+class ICE_API NetworkProxy : public virtual IceUtil::Shared
 {
 public:
 
+    virtual ~NetworkProxy();
+
     //
     // Write the connection request on the connection established
     // with the network proxy server. This is called right after
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index fa39befdd9d..b4f7dcb5ec4 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -12,20 +12,26 @@
 #include <Ice/IncomingAsync.h>
 #include <Ice/IncomingRequest.h>
 #include <Ice/LocalException.h>
-#include <Ice/Stream.h>
 #include <Ice/SlicedData.h>
 
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+namespace Ice
+{
+const Current noExplicitCurrent = Current();
+}
+
+#ifndef ICE_CPP11_MAPPING
 Object* Ice::upCast(Object* p) { return p; }
 
-void 
+void
 Ice::__patch(ObjectPtr& obj, const ObjectPtr& v)
 {
     obj = v;
 }
+#endif
 
 bool
 Ice::Object::operator==(const Object& r) const
@@ -50,8 +56,22 @@ const string __Ice__Object_ids[] =
 
 }
 
+Ice::DispatchInterceptorAsyncCallback::~DispatchInterceptorAsyncCallback()
+{
+    // Out of line to avoid weak vtable
+}
+
+Ice::Request::~Request()
+{
+    // Out of line to avoid weak vtable
+}
+
 bool
+#ifdef ICE_CPP11_MAPPING
+Ice::Object::ice_isA(string s, const Current&) const
+#else
 Ice::Object::ice_isA(const string& s, const Current&) const
+#endif
 {
     return s == __Ice__Object_ids[0];
 }
@@ -68,7 +88,11 @@ Ice::Object::ice_ids(const Current&) const
     return vector<string>(&__Ice__Object_ids[0], &__Ice__Object_ids[1]);
 }
 
+#ifdef ICE_CPP11_MAPPING
+string
+#else
 const string&
+#endif
 Ice::Object::ice_id(const Current&) const
 {
     return __Ice__Object_ids[0];
@@ -80,32 +104,28 @@ Ice::Object::ice_staticId()
     return __Ice__Object_ids[0];
 }
 
+#ifndef ICE_CPP11_MAPPING
 Ice::ObjectPtr
 Ice::Object::ice_clone() const
 {
     throw CloneNotImplementedException(__FILE__, __LINE__);
     return 0; // avoid warning with some compilers
 }
-
-void
-Ice::Object::ice_preMarshal()
-{
-}
-
-void
-Ice::Object::ice_postUnmarshal()
-{
-}
+#endif
 
 DispatchStatus
 Ice::Object::___ice_isA(Incoming& __inS, const Current& __current)
 {
-    BasicStream* __is = __inS.startReadParams();
+    InputStream* __is = __inS.startReadParams();
     string __id;
     __is->read(__id, false);
     __inS.endReadParams();
+#ifdef ICE_CPP11_MAPPING
+    bool __ret = ice_isA(move(__id), __current);
+#else
     bool __ret = ice_isA(__id, __current);
-    BasicStream* __os = __inS.__startWriteParams(DefaultFormat);
+#endif
+    OutputStream* __os = __inS.__startWriteParams(DefaultFormat);
     __os->write(__ret);
     __inS.__endWriteParams(true);
     return DispatchOK;
@@ -125,7 +145,7 @@ Ice::Object::___ice_ids(Incoming& __inS, const Current& __current)
 {
     __inS.readEmptyParams();
     vector<string> __ret = ice_ids(__current);
-    BasicStream* __os = __inS.__startWriteParams(DefaultFormat);
+    OutputStream* __os = __inS.__startWriteParams(DefaultFormat);
     __os->write(&__ret[0], &__ret[0] + __ret.size(), false);
     __inS.__endWriteParams(true);
     return DispatchOK;
@@ -136,18 +156,12 @@ Ice::Object::___ice_id(Incoming& __inS, const Current& __current)
 {
     __inS.readEmptyParams();
     string __ret = ice_id(__current);
-    BasicStream* __os = __inS.__startWriteParams(DefaultFormat);
+    OutputStream* __os = __inS.__startWriteParams(DefaultFormat);
     __os->write(__ret, false);
     __inS.__endWriteParams(true);
     return DispatchOK;
 }
 
-Ice::Int
-Ice::Object::ice_operationAttributes(const string&) const
-{
-    return 0;
-}
-
 
 string Ice::Object::__all[] =
 {
@@ -188,7 +202,6 @@ Ice::Object::ice_dispatch(Request& request, const DispatchInterceptorAsyncCallba
 
 
     IceInternal::Incoming& in = dynamic_cast<IceInternal::IncomingRequest&>(request)._in;
-    
     PushCb pusbCb(in, cb);
     in.startOver(); // may raise ResponseSentException
     return __dispatch(in, in.getCurrent());
@@ -203,7 +216,7 @@ Ice::Object::__dispatch(Incoming& in, const Current& current)
     if(r.first == r.second)
     {
         throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
-    }                                        
+    }
 
     switch(r.first - __all)
     {
@@ -229,49 +242,39 @@ Ice::Object::__dispatch(Incoming& in, const Current& current)
     throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
 }
 
+#ifndef ICE_CPP11_MAPPING
 void
-Ice::Object::__write(IceInternal::BasicStream* os) const
+Ice::Object::ice_preMarshal()
 {
-    os->startWriteObject(0);
-    __writeImpl(os);
-    os->endWriteObject();
 }
- 
-void 
-Ice::Object::__read(IceInternal::BasicStream* is)
+
+void
+Ice::Object::ice_postUnmarshal()
 {
-   is->startReadObject();
-   __readImpl(is);
-   is->endReadObject(false);
 }
-    
-void 
-Ice::Object::__write(const OutputStreamPtr& os) const
+
+void
+Ice::Object::__write(Ice::OutputStream* os) const
 {
-    os->startObject(0);
+    os->startValue(0);
     __writeImpl(os);
-    os->endObject();
+    os->endValue();
 }
- 
-void 
-Ice::Object::__read(const InputStreamPtr& is)
+
+void
+Ice::Object::__read(Ice::InputStream* is)
 {
-    is->startObject();
+   is->startValue();
    __readImpl(is);
-   is->endObject(false);
-}
- 
-void 
-Ice::Object::__writeImpl(const OutputStreamPtr&) const
-{
-    throw MarshalException(__FILE__, __LINE__, "class was not generated with stream support");
+   is->endValue(false);
 }
- 
-void 
-Ice::Object::__readImpl(const InputStreamPtr&)
+
+Ice::Int
+Ice::Object::ice_operationAttributes(const string&) const
 {
-    throw MarshalException(__FILE__, __LINE__, "class was not generated with stream support");
+    return 0;
 }
+#endif
 
 namespace
 {
@@ -281,19 +284,26 @@ operationModeToString(OperationMode mode)
 {
     switch(mode)
     {
-    case Normal:
+    case ICE_ENUM(OperationMode, Normal):
         return "::Ice::Normal";
 
-    case Nonmutating:
+    case ICE_ENUM(OperationMode, Nonmutating):
         return "::Ice::Nonmutating";
 
-    case Idempotent:
+    case ICE_ENUM(OperationMode, Idempotent):
         return "::Ice::Idempotent";
     }
-
+    //
+    // This could not happen with C++11 strong type enums
+    //
+#ifdef ICE_CPP11_MAPPING
+    assert(false);
+    return "";
+#else
     ostringstream os;
     os << "unknown value (" << mode << ")";
     return os.str();
+#endif
 }
 
 }
@@ -303,12 +313,12 @@ Ice::Object::__checkMode(OperationMode expected, OperationMode received)
 {
     if(expected != received)
     {
-        if(expected == Idempotent && received == Nonmutating)
+        if(expected == ICE_ENUM(OperationMode, Idempotent) && received == ICE_ENUM(OperationMode, Nonmutating))
         {
-            // 
+            //
             // Fine: typically an old client still using the deprecated nonmutating keyword
             //
-            
+
             //
             // Note that expected == Nonmutating and received == Idempotent is not ok:
             // the server may still use the deprecated nonmutating keyword to detect updates
@@ -388,6 +398,64 @@ Ice::BlobjectAsync::__dispatch(Incoming& in, const Current& current)
     const Byte* inEncaps;
     Int sz;
     in.readParamEncaps(inEncaps, sz);
+#ifdef ICE_CPP11_MAPPING
+    auto async = IncomingAsync::create(in);
+    try
+    {
+        ice_invokeAsync(vector<Byte>(inEncaps, inEncaps + sz),
+            [async](bool ok, const vector<Byte>& outEncaps)
+            {
+                if(async->__validateResponse(ok))
+                {
+                    try
+                    {
+                        if(outEncaps.empty())
+                        {
+                            async->__writeParamEncaps(0, 0, ok);
+                        }
+                        else
+                        {
+                            async->__writeParamEncaps(&outEncaps[0], static_cast< ::Ice::Int>(outEncaps.size()), ok);
+                        }
+                    }
+                    catch(const LocalException& ex)
+                    {
+                        async->__exception(ex);
+                        return;
+                    }
+                    async->__response();
+                }
+            },
+            [async](exception_ptr e)
+            {
+                if(e)
+                {
+                    try
+                    {
+                        rethrow_exception(e);
+                    }
+                    catch(const exception& ex)
+                    {
+                        async->ice_exception(ex);
+                    }
+                }
+                else
+                {
+                    async->ice_exception();
+                }
+            },
+            current);
+    }
+    catch(const ::std::exception& ex)
+    {
+        async->ice_exception(ex);
+    }
+    catch(...)
+    {
+        async->ice_exception();
+    }
+#else
+
     AMD_Object_ice_invokePtr cb = new ::IceAsync::Ice::AMD_Object_ice_invoke(in);
     try
     {
@@ -401,6 +469,7 @@ Ice::BlobjectAsync::__dispatch(Incoming& in, const Current& current)
     {
         cb->ice_exception();
     }
+#endif
     return DispatchAsync;
 }
 
@@ -411,6 +480,56 @@ Ice::BlobjectArrayAsync::__dispatch(Incoming& in, const Current& current)
     Int sz;
     in.readParamEncaps(inEncaps.first, sz);
     inEncaps.second = inEncaps.first + sz;
+#ifdef ICE_CPP11_MAPPING
+    auto async = IncomingAsync::create(in);
+    try
+    {
+        ice_invokeAsync(inEncaps,
+            [async](bool ok, const pair<const Byte*, const Byte*>& outEncaps)
+            {
+                if(async->__validateResponse(ok))
+                {
+                    try
+                    {
+                        async->__writeParamEncaps(outEncaps.first, static_cast<Int>(outEncaps.second - outEncaps.first), ok);
+                    }
+                    catch(const LocalException& ex)
+                    {
+                        async->__exception(ex);
+                        return;
+                    }
+                    async->__response();
+                }
+            },
+            [async](exception_ptr e)
+            {
+                if(e)
+                {
+                    try
+                    {
+                        rethrow_exception(e);
+                    }
+                    catch(const exception& ex)
+                    {
+                        async->ice_exception(ex);
+                    }
+                }
+                else
+                {
+                    async->ice_exception();
+                }
+            },
+            current);
+    }
+    catch(const ::std::exception& ex)
+    {
+        async->ice_exception(ex);
+    }
+    catch(...)
+    {
+        async->ice_exception();
+    }
+#else
     AMD_Object_ice_invokePtr cb = new ::IceAsync::Ice::AMD_Object_ice_invoke(in);
     try
     {
@@ -424,17 +543,6 @@ Ice::BlobjectArrayAsync::__dispatch(Incoming& in, const Current& current)
     {
         cb->ice_exception();
     }
+#endif
     return DispatchAsync;
 }
-
-void
-Ice::ice_writeObject(const OutputStreamPtr& out, const ObjectPtr& p)
-{
-    out->write(p);
-}
-
-void
-Ice::ice_readObject(const InputStreamPtr& in, ObjectPtr& p)
-{
-    in->read(p);
-}
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index ccdc82137c5..787fe10617e 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -18,7 +18,9 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(ObjectAdapterFactory* p) { return p; }
+#endif
 
 void
 IceInternal::ObjectAdapterFactory::shutdown()
@@ -49,7 +51,11 @@ IceInternal::ObjectAdapterFactory::shutdown()
     // Deactivate outside the thread synchronization, to avoid
     // deadlocks.
     //
+#ifdef ICE_CPP11_MAPPING
+    for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->deactivate(); });
+#else
     for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::deactivate));
+#endif
 }
 
 void
@@ -74,7 +80,11 @@ IceInternal::ObjectAdapterFactory::waitForShutdown()
     //
     // Now we wait for deactivation of each object adapter.
     //
+#ifdef ICE_CPP11_MAPPING
+    for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->waitForDeactivate(); });
+#else
     for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::waitForDeactivate));
+#endif
 }
 
 bool
@@ -103,8 +113,11 @@ IceInternal::ObjectAdapterFactory::destroy()
     //
     // Now we destroy each object adapter.
     //
+#ifdef ICE_CPP11_MAPPING
+    for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->destroy(); });
+#else
     for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::destroy));
-
+#endif
     {
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
         _adapters.clear();
@@ -120,12 +133,19 @@ IceInternal::ObjectAdapterFactory::updateObservers(void (ObjectAdapterI::*fn)())
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
         adapters = _adapters;
     }
-
+#ifdef ICE_CPP11_MAPPING
+    for_each(adapters.begin(), adapters.end(), 
+        [fn](const ObjectAdapterIPtr& adapter)
+        {
+            (adapter.get() ->* fn)();
+        });
+#else
     for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(fn));
+#endif
 }
 
 ObjectAdapterPtr
-IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const RouterPrx& router)
+IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const RouterPrxPtr& router)
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
@@ -138,8 +158,8 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const
     if(name.empty())
     {
         string uuid = IceUtil::generateUUID();
-        adapter = new ObjectAdapterI(_instance, _communicator, this, uuid, true);
-        adapter->initialize(0);
+        adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, uuid, true);
+        adapter->initialize(ICE_NULLPTR);
     }
     else
     {
@@ -147,7 +167,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const
         {
             throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter", name);
         }
-        adapter = new ObjectAdapterI(_instance, _communicator, this, name, false);
+        adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, name, false);
         adapter->initialize(router);
         _adapterNamesInUse.insert(name);
     }
@@ -157,7 +177,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const
 }
 
 ObjectAdapterPtr
-IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
+IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrxPtr& proxy)
 {
     list<ObjectAdapterIPtr> adapters;
     {
@@ -165,7 +185,7 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
 
         if(!_instance)
         {
-            return 0;
+            return ICE_NULLPTR;
         }
 
         adapters = _adapters;
@@ -186,7 +206,7 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
         }
     }
 
-    return 0;
+    return ICE_NULLPTR;
 }
 
 void
diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h
index 7fc9f19c0b2..7b0c053c0a5 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.h
+++ b/cpp/src/Ice/ObjectAdapterFactory.h
@@ -19,7 +19,8 @@
 namespace IceInternal
 {
 
-class ObjectAdapterFactory : public ::IceUtil::Shared, public ::IceUtil::Monitor< ::IceUtil::RecMutex>
+class ObjectAdapterFactory : public Ice::EnableSharedFromThis<ObjectAdapterFactory>,
+                             public ::IceUtil::Monitor< ::IceUtil::RecMutex>
 {
 public:
 
@@ -30,15 +31,16 @@ public:
 
     void updateObservers(void (Ice::ObjectAdapterI::*)());
 
-    ::Ice::ObjectAdapterPtr createObjectAdapter(const std::string&, const Ice::RouterPrx&);
-    ::Ice::ObjectAdapterPtr findObjectAdapter(const ::Ice::ObjectPrx&);
+    ::Ice::ObjectAdapterPtr createObjectAdapter(const std::string&, const Ice::RouterPrxPtr&);
+    ::Ice::ObjectAdapterPtr findObjectAdapter(const ::Ice::ObjectPrxPtr&);
     void removeObjectAdapter(const ::Ice::ObjectAdapterPtr&);
     void flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr&) const;
 
-private:
-
     ObjectAdapterFactory(const InstancePtr&, const ::Ice::CommunicatorPtr&);
     virtual ~ObjectAdapterFactory();
+
+private:
+
     friend class Instance;
 
     InstancePtr _instance;
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index ecc57eb8900..93b33150ef3 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -95,8 +95,16 @@ Ice::ObjectAdapterI::activate()
         //
         if(_state != StateUninitialized)
         {
+#ifdef ICE_CPP11_MAPPING
+            for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
+                [](const IncomingConnectionFactoryPtr& factory)
+                {
+                    factory->activate();
+                });
+#else
             for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
                      Ice::voidMemFun(&IncomingConnectionFactory::activate));
+#endif
             return;
         }
 
@@ -148,9 +156,16 @@ Ice::ObjectAdapterI::activate()
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
         assert(_state == StateActivating);
 
+#ifdef ICE_CPP11_MAPPING
+            for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
+                [](const IncomingConnectionFactoryPtr& factory)
+                {
+                    factory->activate();
+                });
+#else
         for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
                  Ice::voidMemFun(&IncomingConnectionFactory::activate));
-
+#endif
         _state = StateActive;
         notifyAll();
     }
@@ -164,8 +179,16 @@ Ice::ObjectAdapterI::hold()
     checkForDeactivation();
     _state = StateHeld;
 
+#ifdef ICE_CPP11_MAPPING
+    for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->hold();
+        });
+#else
     for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
              Ice::voidMemFun(&IncomingConnectionFactory::hold));
+#endif
 }
 
 void
@@ -180,8 +203,16 @@ Ice::ObjectAdapterI::waitForHold()
         incomingConnectionFactories = _incomingConnectionFactories;
     }
 
+#ifdef ICE_CPP11_MAPPING
+    for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->waitUntilHolding();
+        });
+#else
     for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(),
              Ice::constVoidMemFun(&IncomingConnectionFactory::waitUntilHolding));
+#endif
 }
 
 void
@@ -240,15 +271,23 @@ Ice::ObjectAdapterI::deactivate()
     // Connection::destroy() might block when sending a CloseConnection
     // message.
     //
+#ifdef ICE_CPP11_MAPPING
+    for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->destroy();
+        });
+#else
     for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
              Ice::voidMemFun(&IncomingConnectionFactory::destroy));
+#endif
 
     //
     // Must be called outside the thread synchronization, because
     // changing the object adapter might block if there are still
     // requests being dispatched.
     //
-    _instance->outgoingConnectionFactory()->removeAdapter(this);
+    _instance->outgoingConnectionFactory()->removeAdapter(ICE_SHARED_FROM_THIS);
 
     {
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -285,8 +324,16 @@ Ice::ObjectAdapterI::waitForDeactivate()
     // Now we wait until all incoming connection factories are
     // finished.
     //
+#ifdef ICE_CPP11_MAPPING
+    for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->waitUntilFinished();
+        });
+#else
     for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(),
              Ice::voidMemFun(&IncomingConnectionFactory::waitUntilFinished));
+#endif
 }
 
 bool
@@ -343,7 +390,7 @@ Ice::ObjectAdapterI::destroy()
 
     if(_objectAdapterFactory)
     {
-        _objectAdapterFactory->removeObjectAdapter(this);
+        _objectAdapterFactory->removeObjectAdapter(ICE_SHARED_FROM_THIS);
     }
 
     {
@@ -372,13 +419,13 @@ Ice::ObjectAdapterI::destroy()
     }
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::add(const ObjectPtr& object, const Identity& ident)
 {
     return addFacet(object, ident, "");
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::addFacet(const ObjectPtr& object, const Identity& ident, const string& facet)
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -392,13 +439,13 @@ Ice::ObjectAdapterI::addFacet(const ObjectPtr& object, const Identity& ident, co
     return newProxy(ident, facet);
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::addWithUUID(const ObjectPtr& object)
 {
     return addFacetWithUUID(object, "");
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::addFacetWithUUID(const ObjectPtr& object, const string& facet)
 {
     Identity ident;
@@ -484,7 +531,7 @@ Ice::ObjectAdapterI::findAllFacets(const Identity& ident) const
 }
 
 ObjectPtr
-Ice::ObjectAdapterI::findByProxy(const ObjectPrx& proxy) const
+Ice::ObjectAdapterI::findByProxy(const ObjectPrxPtr& proxy) const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
@@ -534,7 +581,7 @@ Ice::ObjectAdapterI::findServantLocator(const string& prefix) const
     return _servantManager->findServantLocator(prefix);
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::createProxy(const Identity& ident) const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -545,7 +592,7 @@ Ice::ObjectAdapterI::createProxy(const Identity& ident) const
     return newProxy(ident, "");
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::createDirectProxy(const Identity& ident) const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -556,7 +603,7 @@ Ice::ObjectAdapterI::createDirectProxy(const Identity& ident) const
     return newDirectProxy(ident, "");
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::createIndirectProxy(const Identity& ident) const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -568,7 +615,7 @@ Ice::ObjectAdapterI::createIndirectProxy(const Identity& ident) const
 }
 
 void
-Ice::ObjectAdapterI::setLocator(const LocatorPrx& locator)
+Ice::ObjectAdapterI::setLocator(const LocatorPrxPtr& locator)
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
@@ -577,7 +624,7 @@ Ice::ObjectAdapterI::setLocator(const LocatorPrx& locator)
     _locatorInfo = _instance->locatorManager()->get(locator);
 }
 
-LocatorPrx
+LocatorPrxPtr
 Ice::ObjectAdapterI::getLocator() const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -635,7 +682,15 @@ Ice::ObjectAdapterI::getEndpoints() const
 
     EndpointSeq endpoints;
     transform(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
-              back_inserter(endpoints), Ice::constMemFun(&IncomingConnectionFactory::endpoint));
+            back_inserter(endpoints), 
+#ifdef ICE_CPP11_MAPPING
+            [](const IncomingConnectionFactoryPtr& factory)
+            {
+                return factory->endpoint();
+            });
+#else
+            Ice::constMemFun(&IncomingConnectionFactory::endpoint));
+#endif
     return endpoints;
 }
 
@@ -650,7 +705,7 @@ Ice::ObjectAdapterI::getPublishedEndpoints() const
 }
 
 bool
-Ice::ObjectAdapterI::isLocal(const ObjectPrx& proxy) const
+Ice::ObjectAdapterI::isLocal(const ObjectPrxPtr& proxy) const
 {
     //
     // NOTE: it's important that isLocal() doesn't perform any blocking operations as
@@ -752,7 +807,15 @@ Ice::ObjectAdapterI::updateConnectionObservers()
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
         f = _incomingConnectionFactories;
     }
+#ifdef ICE_CPP11_MAPPING
+    for_each(f.begin(), f.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->updateConnectionObservers();
+        });
+#else
     for_each(f.begin(), f.end(), Ice::voidMemFun(&IncomingConnectionFactory::updateConnectionObservers));
+#endif
 }
 
 void
@@ -842,7 +905,7 @@ Ice::ObjectAdapterI::getACM() const
 //
 Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const CommunicatorPtr& communicator,
                                     const ObjectAdapterFactoryPtr& objectAdapterFactory, const string& name,
-                                    /*const RouterPrx& router,*/ bool noConfig) :
+                                    /*const RouterPrxPtr& router,*/ bool noConfig) :
     _state(StateUninitialized),
     _instance(instance),
     _communicator(communicator),
@@ -856,7 +919,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica
 }
 
 void
-Ice::ObjectAdapterI::initialize(const RouterPrx& router)
+Ice::ObjectAdapterI::initialize(const RouterPrxPtr& router)
 {
     if(_noConfig)
     {
@@ -944,8 +1007,8 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
 
         if(!router)
         {
-            const_cast<RouterPrx&>(router) = RouterPrx::uncheckedCast(
-                _instance->proxyFactory()->propertyToProxy(_name + ".Router"));
+            const_cast<RouterPrxPtr&>(router) = ICE_UNCHECKED_CAST(RouterPrx,
+                                _instance->proxyFactory()->propertyToProxy(_name + ".Router"));
         }
         if(router)
         {
@@ -958,7 +1021,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
                 if(_routerInfo->getAdapter())
                 {
                     throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter with router",
-                                                     _instance->identityToString(router->ice_getIdentity()));
+                                                     Ice::identityToString(router->ice_getIdentity()));
                 }
 
                 //
@@ -976,7 +1039,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
                 // new outgoing connections to the router's client proxy will
                 // use this object adapter for callbacks.
                 //
-                _routerInfo->setAdapter(this);
+                _routerInfo->setAdapter(ICE_SHARED_FROM_THIS);
 
                 //
                 // Also modify all existing outgoing connections to the
@@ -996,7 +1059,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
             vector<EndpointIPtr> endpoints = parseEndpoints(properties->getProperty(_name + ".Endpoints"), true);
             for(vector<EndpointIPtr>::iterator p = endpoints.begin(); p != endpoints.end(); ++p)
             {
-                IncomingConnectionFactoryPtr factory = new IncomingConnectionFactory(_instance, *p, this);
+                IncomingConnectionFactoryPtr factory = ICE_MAKE_SHARED(IncomingConnectionFactory, _instance, *p, ICE_SHARED_FROM_THIS);
                  factory->initialize();
                 _incomingConnectionFactories.push_back(factory);
             }
@@ -1019,7 +1082,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
 
         if(!properties->getProperty(_name + ".Locator").empty())
         {
-            setLocator(LocatorPrx::uncheckedCast(_instance->proxyFactory()->propertyToProxy(_name + ".Locator")));
+            setLocator(ICE_UNCHECKED_CAST(LocatorPrx, _instance->proxyFactory()->propertyToProxy(_name + ".Locator")));
         }
         else
         {
@@ -1054,7 +1117,7 @@ Ice::ObjectAdapterI::~ObjectAdapterI()
     }
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::newProxy(const Identity& ident, const string& facet) const
 {
     if(_id.empty())
@@ -1071,7 +1134,7 @@ Ice::ObjectAdapterI::newProxy(const Identity& ident, const string& facet) const
     }
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::newDirectProxy(const Identity& ident, const string& facet) const
 {
     vector<EndpointIPtr> endpoints = _publishedEndpoints;
@@ -1090,7 +1153,7 @@ Ice::ObjectAdapterI::newDirectProxy(const Identity& ident, const string& facet)
     return _instance->proxyFactory()->referenceToProxy(ref);
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::newIndirectProxy(const Identity& ident, const string& facet, const string& id) const
 {
     //
@@ -1238,14 +1301,14 @@ ObjectAdapterI::parsePublishedEndpoints()
 }
 
 void
-ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locatorInfo, const Ice::ObjectPrx& proxy)
+ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locatorInfo, const Ice::ObjectPrxPtr& proxy)
 {
     if(_id.empty() || !locatorInfo)
     {
         return; // Nothing to update.
     }
 
-    LocatorRegistryPrx locatorRegistry = locatorInfo->getLocatorRegistry();
+    LocatorRegistryPrxPtr locatorRegistry = locatorInfo->getLocatorRegistry();
     if(!locatorRegistry)
     {
         return;
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
index b7def9610ee..503facf1102 100644
--- a/cpp/src/Ice/ObjectAdapterI.h
+++ b/cpp/src/Ice/ObjectAdapterI.h
@@ -36,9 +36,11 @@ namespace Ice
 {
 
 class ObjectAdapterI;
-typedef IceUtil::Handle<ObjectAdapterI> ObjectAdapterIPtr;
+ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI);
 
-class ObjectAdapterI : public ObjectAdapter, public IceUtil::Monitor<IceUtil::RecMutex>
+class ObjectAdapterI : public EnableSharedFromThis<ObjectAdapterI>,
+                       public ObjectAdapter,
+                       public IceUtil::Monitor<IceUtil::RecMutex>
 {
 public:
 
@@ -54,10 +56,10 @@ public:
     virtual bool isDeactivated() const;
     virtual void destroy();
 
-    virtual ObjectPrx add(const ObjectPtr&, const Identity&);
-    virtual ObjectPrx addFacet(const ObjectPtr&, const Identity&, const std::string&);
-    virtual ObjectPrx addWithUUID(const ObjectPtr&);
-    virtual ObjectPrx addFacetWithUUID(const ObjectPtr&, const std::string&);
+    virtual ObjectPrxPtr add(const ObjectPtr&, const Identity&);
+    virtual ObjectPrxPtr addFacet(const ObjectPtr&, const Identity&, const std::string&);
+    virtual ObjectPrxPtr addWithUUID(const ObjectPtr&);
+    virtual ObjectPrxPtr addFacetWithUUID(const ObjectPtr&, const std::string&);
     virtual void addDefaultServant(const ObjectPtr&, const std::string&);
     virtual ObjectPtr remove(const Identity&);
     virtual ObjectPtr removeFacet(const Identity&, const std::string&);
@@ -66,7 +68,7 @@ public:
     virtual ObjectPtr find(const Identity&) const;
     virtual ObjectPtr findFacet(const Identity&, const std::string&) const;
     virtual FacetMap findAllFacets(const Identity&) const;
-    virtual ObjectPtr findByProxy(const ObjectPrx&) const;
+    virtual ObjectPtr findByProxy(const ObjectPrxPtr&) const;
     virtual ObjectPtr findDefaultServant(const std::string&) const;
 
 
@@ -74,18 +76,18 @@ public:
     virtual ServantLocatorPtr removeServantLocator(const std::string&);
     virtual ServantLocatorPtr findServantLocator(const std::string&) const;
 
-    virtual ObjectPrx createProxy(const Identity&) const;
-    virtual ObjectPrx createDirectProxy(const Identity&) const;
-    virtual ObjectPrx createIndirectProxy(const Identity&) const;
+    virtual ObjectPrxPtr createProxy(const Identity&) const;
+    virtual ObjectPrxPtr createDirectProxy(const Identity&) const;
+    virtual ObjectPrxPtr createIndirectProxy(const Identity&) const;
 
-    virtual void setLocator(const LocatorPrx&);
-    virtual Ice::LocatorPrx getLocator() const;
+    virtual void setLocator(const LocatorPrxPtr&);
+    virtual Ice::LocatorPrxPtr getLocator() const;
     virtual void refreshPublishedEndpoints();
 
     virtual EndpointSeq getEndpoints() const;
     virtual EndpointSeq getPublishedEndpoints() const;
 
-    bool isLocal(const ObjectPrx&) const;
+    bool isLocal(const ObjectPrxPtr&) const;
 
     void flushAsyncBatchRequests(const IceInternal::CommunicatorFlushBatchAsyncPtr&);
 
@@ -100,21 +102,22 @@ public:
     IceInternal::ACMConfig getACM() const;
     size_t messageSizeMax() const { return _messageSizeMax; }
 
-private:
-
     ObjectAdapterI(const IceInternal::InstancePtr&, const CommunicatorPtr&,
                    const IceInternal::ObjectAdapterFactoryPtr&, const std::string&, bool);
     virtual ~ObjectAdapterI();
-    void initialize(const RouterPrx&);
+
+private:
+
+    void initialize(const RouterPrxPtr&);
     friend class IceInternal::ObjectAdapterFactory;
 
-    ObjectPrx newProxy(const Identity&, const std::string&) const;
-    ObjectPrx newDirectProxy(const Identity&, const std::string&) const;
-    ObjectPrx newIndirectProxy(const Identity&, const std::string&, const std::string&) const;
+    ObjectPrxPtr newProxy(const Identity&, const std::string&) const;
+    ObjectPrxPtr newDirectProxy(const Identity&, const std::string&) const;
+    ObjectPrxPtr newIndirectProxy(const Identity&, const std::string&, const std::string&) const;
     void checkForDeactivation() const;
     std::vector<IceInternal::EndpointIPtr> parseEndpoints(const std::string&, bool) const;
     std::vector<IceInternal::EndpointIPtr> parsePublishedEndpoints();
-    void updateLocatorRegistry(const IceInternal::LocatorInfoPtr&, const Ice::ObjectPrx&);
+    void updateLocatorRegistry(const IceInternal::LocatorInfoPtr&, const Ice::ObjectPrxPtr&);
     bool filterProperties(Ice::StringSeq&);
 
     enum State
diff --git a/cpp/src/Ice/ObjectFactoryManager.cpp b/cpp/src/Ice/ObjectFactoryManager.cpp
deleted file mode 100644
index 4f071750327..00000000000
--- a/cpp/src/Ice/ObjectFactoryManager.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Ice/ObjectFactoryManager.h>
-#include <Ice/ObjectFactory.h>
-#include <Ice/Functional.h>
-#include <Ice/LocalException.h>
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-IceUtil::Shared* IceInternal::upCast(ObjectFactoryManager* p) { return p; }
-
-void
-IceInternal::ObjectFactoryManager::add(const ObjectFactoryPtr& factory, const string& id)
-{
-    IceUtil::Mutex::Lock sync(*this);
-
-    if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id)
-       || _factoryMap.find(id) != _factoryMap.end())
-    {
-        AlreadyRegisteredException ex(__FILE__, __LINE__);
-        ex.kindOfObject = "object factory";
-        ex.id = id;
-        throw ex;
-    }
-
-    _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ObjectFactoryPtr>(id, factory));
-}
-
-void
-IceInternal::ObjectFactoryManager::remove(const string& id)
-{
-    ObjectFactoryPtr factory = 0;
-    {
-        IceUtil::Mutex::Lock sync(*this);
-
-        FactoryMap::iterator p = _factoryMap.end();
-        if(_factoryMapHint != _factoryMap.end())
-        {
-            if(_factoryMapHint->first == id)
-            {
-                p = _factoryMapHint;
-            }
-        }
-
-        if(p == _factoryMap.end())
-        {
-            p = _factoryMap.find(id);
-            if(p == _factoryMap.end())
-            {
-                NotRegisteredException ex(__FILE__, __LINE__);
-                ex.kindOfObject = "object factory";
-                ex.id = id;
-                throw ex;
-            }
-        }
-        assert(p != _factoryMap.end());
-
-        factory = p->second;
-
-        if(p == _factoryMapHint)
-        {
-            _factoryMap.erase(p++);
-            _factoryMapHint = p;
-        }
-        else
-        {
-            _factoryMap.erase(p);
-        }
-    }
-
-    //
-    // Destroy outside the lock
-    //
-    assert(factory != 0);
-    factory->destroy();
-}
-
-ObjectFactoryPtr
-IceInternal::ObjectFactoryManager::find(const string& id) const
-{
-    IceUtil::Mutex::Lock sync(*this);
-
-    FactoryMap& factoryMap = const_cast<FactoryMap&>(_factoryMap);
-
-    FactoryMap::iterator p = factoryMap.end();
-    if(_factoryMapHint != factoryMap.end())
-    {
-        if(_factoryMapHint->first == id)
-        {
-            p = _factoryMapHint;
-        }
-    }
-
-    if(p == factoryMap.end())
-    {
-        p = factoryMap.find(id);
-    }
-
-    if(p != factoryMap.end())
-    {
-        _factoryMapHint = p;
-        return p->second;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-IceInternal::ObjectFactoryManager::ObjectFactoryManager() :
-    _factoryMapHint(_factoryMap.end())
-{
-}
-
-void
-IceInternal::ObjectFactoryManager::destroy()
-{
-    FactoryMap oldMap;
-    {
-        IceUtil::Mutex::Lock sync(*this);
-        oldMap.swap(_factoryMap);
-        _factoryMapHint = _factoryMap.end();
-    }
-
-    //
-    // Destroy all outside lock
-    //
-    for_each(oldMap.begin(), oldMap.end(),
-             Ice::secondVoidMemFun<const string, ObjectFactory>(&ObjectFactory::destroy));
-}
diff --git a/cpp/src/Ice/ObjectFactoryManager.h b/cpp/src/Ice/ObjectFactoryManager.h
deleted file mode 100644
index a433239de9c..00000000000
--- a/cpp/src/Ice/ObjectFactoryManager.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef ICE_OBJECT_FACTORY_MANAGER_H
-#define ICE_OBJECT_FACTORY_MANAGER_H
-
-#include <IceUtil/Shared.h>
-#include <IceUtil/Mutex.h>
-#include <Ice/ObjectFactoryManagerF.h>
-#include <Ice/ObjectFactoryF.h>
-
-namespace IceInternal
-{
-
-class ObjectFactoryManager : public ::IceUtil::Shared, public ::IceUtil::Mutex
-{
-public:
-
-    void add(const ::Ice::ObjectFactoryPtr&, const std::string&);
-    void remove(const std::string&);
-    ::Ice::ObjectFactoryPtr find(const std::string&) const;
-
-    typedef std::map<std::string, ::Ice::ObjectFactoryPtr> FactoryMap;
-
-private:
-
-    ObjectFactoryManager();
-    void destroy();
-    friend class Instance;
-
-    FactoryMap _factoryMap;
-    mutable FactoryMap::iterator _factoryMapHint;
-};
-
-}
-
-#endif
diff --git a/cpp/src/Ice/ObserverHelper.cpp b/cpp/src/Ice/ObserverHelper.cpp
index 3c5b16c1d9e..6b88a0d68de 100644
--- a/cpp/src/Ice/ObserverHelper.cpp
+++ b/cpp/src/Ice/ObserverHelper.cpp
@@ -16,29 +16,14 @@ using namespace std;
 using namespace Ice;
 using namespace Ice::Instrumentation;
 
-namespace
-{
-
-Ice::Context emptyCtx;
-
-}
-
-IceInternal::InvocationObserver::InvocationObserver(IceProxy::Ice::Object* proxy, const string& op, const Context* ctx)
+IceInternal::InvocationObserver::InvocationObserver(const Ice::ObjectPrxPtr& proxy, const string& op, const Context& ctx)
 {
     const CommunicatorObserverPtr& obsv = proxy->__reference()->getInstance()->initializationData().observer;
     if(!obsv)
     {
         return;
     }
-
-    if(ctx)
-    {
-        attach(obsv->getInvocationObserver(proxy, op, *ctx));
-    }
-    else
-    {
-        attach(obsv->getInvocationObserver(proxy, op, emptyCtx));
-    }
+    attach(obsv->getInvocationObserver(proxy, op, ctx));
 }
 
 IceInternal::InvocationObserver::InvocationObserver(IceInternal::Instance* instance, const string& op)
@@ -49,26 +34,18 @@ IceInternal::InvocationObserver::InvocationObserver(IceInternal::Instance* insta
         return;
     }
 
-    attach(obsv->getInvocationObserver(0, op, emptyCtx));
+    attach(obsv->getInvocationObserver(0, op, noExplicitContext));
 }
 
 void
-IceInternal::InvocationObserver::attach(IceProxy::Ice::Object* proxy, const string& op, const Context* ctx)
+IceInternal::InvocationObserver::attach(const Ice::ObjectPrxPtr& proxy, const string& op, const Context& ctx)
 {
     const CommunicatorObserverPtr& obsv = proxy->__reference()->getInstance()->initializationData().observer;
     if(!obsv)
     {
         return;
     }
-
-    if(ctx)
-    {
-        attach(obsv->getInvocationObserver(proxy, op, *ctx));
-    }
-    else
-    {
-        attach(obsv->getInvocationObserver(proxy, op, emptyCtx));
-    }
+    attach(obsv->getInvocationObserver(proxy, op, ctx));
 }
 
 void
@@ -80,5 +57,5 @@ IceInternal::InvocationObserver::attach(IceInternal::Instance* instance, const s
         return;
     }
 
-    attach(obsv->getInvocationObserver(0, op, emptyCtx));
+    attach(obsv->getInvocationObserver(0, op, Ice::noExplicitContext));
 }
diff --git a/cpp/src/Ice/OpaqueEndpointI.cpp b/cpp/src/Ice/OpaqueEndpointI.cpp
index c7c0b68f935..d6c8bdbf984 100644
--- a/cpp/src/Ice/OpaqueEndpointI.cpp
+++ b/cpp/src/Ice/OpaqueEndpointI.cpp
@@ -8,7 +8,8 @@
 // **********************************************************************
 
 #include <Ice/OpaqueEndpointI.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/Exception.h>
 #include <Ice/DefaultsAndOverrides.h>
 #include <Ice/Base64.h>
@@ -46,10 +47,10 @@ IceInternal::OpaqueEndpointI::OpaqueEndpointI(vector<string>& args) :
     }
 }
 
-IceInternal::OpaqueEndpointI::OpaqueEndpointI(Short type, BasicStream* s) : _type(type)
+IceInternal::OpaqueEndpointI::OpaqueEndpointI(Short type, InputStream* s) : _type(type)
 {
-    _rawEncoding = s->getReadEncoding();
-    Int sz = s->getReadEncapsSize();
+    _rawEncoding = s->getEncoding();
+    Int sz = s->getEncapsulationSize();
     s->readBlob(const_cast<vector<Byte>&>(_rawBytes), sz);
 }
 
@@ -91,23 +92,23 @@ private:
 //
 OpaqueEndpointInfoI::OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion& rawEncoding,
                                          const Ice::ByteSeq& rawBytes) :
-    Ice::OpaqueEndpointInfo(-1, false, rawEncoding, rawBytes),
+    Ice::OpaqueEndpointInfo(ICE_NULLPTR, -1, false, rawEncoding, rawBytes),
     _type(type)
 {
 }
 
 void
-IceInternal::OpaqueEndpointI::streamWrite(BasicStream* s) const
+IceInternal::OpaqueEndpointI::streamWrite(OutputStream* s) const
 {
-    s->startWriteEncaps(_rawEncoding, DefaultFormat);
+    s->startEncapsulation(_rawEncoding, DefaultFormat);
     s->writeBlob(_rawBytes);
-    s->endWriteEncaps();
+    s->endEncapsulation();
 }
 
 Ice::EndpointInfoPtr
 IceInternal::OpaqueEndpointI::getInfo() const
 {
-    return new OpaqueEndpointInfoI(_type, _rawEncoding, _rawBytes);
+    return ICE_MAKE_SHARED(OpaqueEndpointInfoI, _type, _rawEncoding, _rawBytes);
 }
 
 Short
@@ -131,7 +132,7 @@ IceInternal::OpaqueEndpointI::timeout() const
 EndpointIPtr
 IceInternal::OpaqueEndpointI::timeout(Int) const
 {
-    return const_cast<OpaqueEndpointI*>(this);
+    return shared_from_this();
 }
 
 const string&
@@ -143,7 +144,7 @@ IceInternal::OpaqueEndpointI::connectionId() const
 EndpointIPtr
 IceInternal::OpaqueEndpointI::connectionId(const string&) const
 {
-    return const_cast<OpaqueEndpointI*>(this);
+    return shared_from_this();
 }
 
 bool
@@ -155,7 +156,7 @@ IceInternal::OpaqueEndpointI::compress() const
 EndpointIPtr
 IceInternal::OpaqueEndpointI::compress(bool) const
 {
-    return const_cast<OpaqueEndpointI*>(this);
+    return shared_from_this();
 }
 
 bool
@@ -173,7 +174,7 @@ IceInternal::OpaqueEndpointI::secure() const
 TransceiverPtr
 IceInternal::OpaqueEndpointI::transceiver() const
 {
-    return 0;
+    return ICE_NULLPTR;
 }
 
 void
@@ -185,14 +186,14 @@ IceInternal::OpaqueEndpointI::connectors_async(Ice::EndpointSelectionType, const
 AcceptorPtr
 IceInternal::OpaqueEndpointI::acceptor(const string&) const
 {
-    return 0;
+    return ICE_NULLPTR;
 }
 
 vector<EndpointIPtr>
 IceInternal::OpaqueEndpointI::expand() const
 {
     vector<EndpointIPtr> endps;
-    endps.push_back(const_cast<OpaqueEndpointI*>(this));
+    endps.push_back(shared_from_this());
     return endps;
 }
 
@@ -231,7 +232,11 @@ IceInternal::OpaqueEndpointI::options() const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::OpaqueEndpointI::operator==(const Endpoint& r) const
+#else
 IceInternal::OpaqueEndpointI::operator==(const LocalObject& r) const
+#endif
 {
     const OpaqueEndpointI* p = dynamic_cast<const OpaqueEndpointI*>(&r);
     if(!p)
@@ -263,7 +268,11 @@ IceInternal::OpaqueEndpointI::operator==(const LocalObject& r) const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::OpaqueEndpointI::operator<(const Endpoint& r) const
+#else
 IceInternal::OpaqueEndpointI::operator<(const LocalObject& r) const
+#endif
 {
     const OpaqueEndpointI* p = dynamic_cast<const OpaqueEndpointI*>(&r);
     if(!p)
@@ -311,6 +320,12 @@ IceInternal::OpaqueEndpointI::operator<(const LocalObject& r) const
     return false;
 }
 
+void
+IceInternal::OpaqueEndpointI::streamWriteImpl(Ice::OutputStream*) const
+{
+    assert(false);
+}
+
 bool
 IceInternal::OpaqueEndpointI::checkOption(const string& option, const string& argument, const string& endpoint)
 {
diff --git a/cpp/src/Ice/OpaqueEndpointI.h b/cpp/src/Ice/OpaqueEndpointI.h
index fcf0dd057fa..a0ebae3a49f 100644
--- a/cpp/src/Ice/OpaqueEndpointI.h
+++ b/cpp/src/Ice/OpaqueEndpointI.h
@@ -16,14 +16,14 @@
 namespace IceInternal
 {
 
-class OpaqueEndpointI : public EndpointI
+class OpaqueEndpointI : public EndpointI, public Ice::EnableSharedFromThis<OpaqueEndpointI>
 {
 public:
 
     OpaqueEndpointI(std::vector<std::string>&);
-    OpaqueEndpointI(Ice::Short, BasicStream*);
+    OpaqueEndpointI(Ice::Short, Ice::InputStream*);
 
-    virtual void streamWrite(BasicStream*) const;
+    virtual void streamWrite(Ice::OutputStream*) const;
     virtual Ice::EndpointInfoPtr getInfo() const;
     virtual Ice::Short type() const;
     virtual const std::string& protocol() const;
@@ -45,14 +45,19 @@ public:
     virtual Ice::Int hash() const;
     virtual std::string options() const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const Ice::Endpoint&) const;
+    virtual bool operator<(const Ice::Endpoint&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
-
+#endif
 
     using EndpointI::connectionId;
 
 protected:
 
+    virtual void streamWriteImpl(Ice::OutputStream*) const;
     virtual bool checkOption(const std::string&, const std::string&, const std::string&);
 
 private:
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 170c496b9c5..3c1ad6bfd14 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -22,11 +22,16 @@ using namespace Ice;
 using namespace Ice::Instrumentation;
 using namespace IceInternal;
 
+OutgoingBase::~OutgoingBase()
+{
+    // Out of line to avoid weak vtable
+}
+
 OutgoingBase::OutgoingBase(Instance* instance) : _os(instance, Ice::currentProtocolEncoding), _sent(false)
 {
 }
 
-ProxyOutgoingBase::ProxyOutgoingBase(IceProxy::Ice::Object* proxy, OperationMode mode) :
+ProxyOutgoingBase::ProxyOutgoingBase(const Ice::ObjectPrxPtr& proxy, OperationMode mode) :
     OutgoingBase(proxy->__reference()->getInstance().get()),
     _proxy(proxy),
     _mode(mode),
@@ -82,16 +87,16 @@ ProxyOutgoingBase::completed(const Ice::Exception& ex)
         return;
     }
 
-    _childObserver.failed(ex.ice_name());
+    _childObserver.failed(ex.ice_id());
     _childObserver.detach();
 
     _state = StateFailed;
-    _exception.reset(ex.ice_clone());
+    ICE_RESET_EXCEPTION(_exception, ex.ice_clone());
     _monitor.notify();
 }
 
 void
-ProxyOutgoingBase::completed(BasicStream& is)
+ProxyOutgoingBase::completed(InputStream&)
 {
     assert(false); // Must be overriden
 }
@@ -122,7 +127,7 @@ ProxyOutgoingBase::invokeImpl()
             }
 
             _state = StateInProgress;
-            _exception.reset(0);
+            ICE_RESET_EXCEPTION(_exception, ICE_NULLPTR);
             _sent = false;
 
             _handler = _proxy->__getRequestHandler();
@@ -206,9 +211,9 @@ ProxyOutgoingBase::invokeImpl()
                 }
             }
 
-            if(_exception.get())
+            if(ICE_EXCEPTION_ISSET(_exception))
             {
-                _exception->ice_throw();
+                ICE_RETHROW_EXCEPTION(_exception);
             }
             else if(_state == StateRetry)
             {
@@ -270,7 +275,7 @@ ProxyOutgoingBase::invokeImpl()
             }
             catch(const Ice::Exception& ex)
             {
-                _observer.failed(ex.ice_name());
+                _observer.failed(ex.ice_id());
                 throw;
             }
         }
@@ -280,7 +285,7 @@ ProxyOutgoingBase::invokeImpl()
     return false;
 }
 
-Outgoing::Outgoing(IceProxy::Ice::Object* proxy, const string& operation, OperationMode mode, const Context* context) :
+Outgoing::Outgoing(const Ice::ObjectPrxPtr& proxy, const string& operation, OperationMode mode, const Context& context) :
     ProxyOutgoingBase(proxy, mode),
     _encoding(getCompatibleEncoding(proxy->__reference()->getEncoding())),
     _is(proxy->__reference()->getInstance().get(), Ice::currentProtocolEncoding),
@@ -288,7 +293,6 @@ Outgoing::Outgoing(IceProxy::Ice::Object* proxy, const string& operation, Operat
 {
     checkSupportedProtocol(getCompatibleProtocol(proxy->__reference()->getProtocol()));
     _observer.attach(proxy, operation, context);
-
     switch(_proxy->__reference()->getMode())
     {
         case Reference::ModeTwoway:
@@ -328,12 +332,12 @@ Outgoing::Outgoing(IceProxy::Ice::Object* proxy, const string& operation, Operat
 
         _os.write(static_cast<Ice::Byte>(mode));
 
-        if(context != 0)
+        if(&context != &Ice::noExplicitContext)
         {
             //
             // Explicit context
             //
-            _os.write(*context);
+            _os.write(context);
         }
         else
         {
@@ -407,7 +411,7 @@ Outgoing::abort(const LocalException& ex)
 }
 
 void
-Outgoing::completed(BasicStream& is)
+Outgoing::completed(InputStream& is)
 {
     Monitor<Mutex>::Lock sync(_monitor);
 
@@ -502,8 +506,8 @@ Outgoing::completed(BasicStream& is)
             ex->id = ident;
             ex->facet = facet;
             ex->operation = operation;
-            _exception.reset(ex);
-
+            ICE_RESET_EXCEPTION(_exception, ex->ice_clone());
+            delete ex;
             _state = StateLocalException; // The state must be set last, in case there is an exception.
             break;
         }
@@ -550,15 +554,25 @@ Outgoing::completed(BasicStream& is)
             }
 
             ex->unknown = unknown;
-            _exception.reset(ex);
-
+            ICE_RESET_EXCEPTION(_exception, ex->ice_clone());
             _state = StateLocalException; // The state must be set last, in case there is an exception.
             break;
         }
 
         default:
         {
+#ifdef ICE_CPP11_MAPPING
+            try
+            {
+                throw UnknownReplyStatusException(__FILE__, __LINE__);
+            }
+            catch(...)
+            {
+                _exception = current_exception();
+            }
+#else
             _exception.reset(new UnknownReplyStatusException(__FILE__, __LINE__));
+#endif
             _state = StateLocalException;
             break;
         }
@@ -572,21 +586,21 @@ Outgoing::throwUserException()
 {
     try
     {
-        _is.startReadEncaps();
+        _is.startEncapsulation();
         _is.throwException();
     }
     catch(const Ice::UserException&)
     {
-        _is.endReadEncaps();
+        _is.endEncapsulation();
         throw;
     }
 }
 
-ProxyFlushBatch::ProxyFlushBatch(IceProxy::Ice::Object* proxy, const string& operation) :
-    ProxyOutgoingBase(proxy, Ice::Normal)
+ProxyFlushBatch::ProxyFlushBatch(const Ice::ObjectPrxPtr& proxy, const string& operation) :
+    ProxyOutgoingBase(proxy, ICE_ENUM(OperationMode, Normal))
 {
     checkSupportedProtocol(getCompatibleProtocol(proxy->__reference()->getProtocol()));
-    _observer.attach(proxy, operation, 0);
+    _observer.attach(proxy, operation, ::Ice::noExplicitContext);
 
     _batchRequestNum = proxy->__getBatchRequestQueue()->swap(&_os);
 }
@@ -636,19 +650,19 @@ ConnectionFlushBatch::invoke()
         else if(!_connection->sendRequest(this, false, false, batchRequestNum))
         {
             Monitor<Mutex>::Lock sync(_monitor);
-            while(!_exception.get() && !_sent)
+            while(!ICE_EXCEPTION_ISSET(_exception) && !_sent)
             {
                 _monitor.wait();
             }
-            if(_exception.get())
+            if(ICE_EXCEPTION_ISSET(_exception))
             {
-                _exception->ice_throw();
+                ICE_RETHROW_EXCEPTION(_exception);
             }
         }
     }
     catch(const RetryException& ex)
     {
-        ex.get()->ice_throw();
+        ICE_RETHROW_EXCEPTION(ex.get());
     }
 }
 
@@ -672,14 +686,14 @@ void
 ConnectionFlushBatch::completed(const Ice::Exception& ex)
 {
     Monitor<Mutex>::Lock sync(_monitor);
-    _childObserver.failed(ex.ice_name());
+    _childObserver.failed(ex.ice_id());
     _childObserver.detach();
-    _exception.reset(ex.ice_clone());
+    ICE_RESET_EXCEPTION(_exception, ex.ice_clone());
     _monitor.notify();
 }
 
 void
-ConnectionFlushBatch::completed(BasicStream& is)
+ConnectionFlushBatch::completed(InputStream&)
 {
     assert(false);
 }
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index e7cc8c65540..c5854246715 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -17,91 +17,573 @@
 #include <Ice/ImplicitContextI.h>
 #include <Ice/ThreadPool.h>
 #include <Ice/RetryQueue.h>
+#include <Ice/ConnectionFactory.h>
+#include <Ice/ObjectAdapterFactory.h>
+#include <Ice/LoggerUtil.h>
 
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(OutgoingAsyncBase* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(ProxyOutgoingAsyncBase* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(OutgoingAsync* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(CommunicatorFlushBatchAsync* p) { return p; }
+#endif
+
+const unsigned char OutgoingAsyncBase::OK = 0x1;
+const unsigned char OutgoingAsyncBase::Sent = 0x2;
+#ifndef ICE_CPP11_MAPPING
+const unsigned char OutgoingAsyncBase::Done = 0x4;
+const unsigned char OutgoingAsyncBase::EndCalled = 0x8;
+#endif
+
+OutgoingAsyncCompletionCallback::~OutgoingAsyncCompletionCallback()
+{
+    // Out of line to avoid weak vtable
+}
 
 bool
 OutgoingAsyncBase::sent()
 {
-    return sent(true);
+    return sentImpl(true);
 }
 
 bool
-OutgoingAsyncBase::completed(const Exception& ex)
+OutgoingAsyncBase::exception(const Exception& ex)
 {
-    return finished(ex);
+    return exceptionImpl(ex);
 }
 
 bool
-OutgoingAsyncBase::completed()
+OutgoingAsyncBase::response()
 {
     assert(false); // Must be overriden by request that can handle responses
     return false;
 }
 
-BasicStream*
-OutgoingAsyncBase::getIs()
+void
+OutgoingAsyncBase::invokeSentAsync()
+{
+    class AsynchronousSent : public DispatchWorkItem
+    {
+    public:
+
+        AsynchronousSent(const ConnectionPtr& connection, const OutgoingAsyncBasePtr& outAsync) :
+            DispatchWorkItem(connection), _outAsync(outAsync)
+        {
+        }
+
+        virtual void
+        run()
+        {
+            _outAsync->invokeSent();
+        }
+
+    private:
+
+        const OutgoingAsyncBasePtr _outAsync;
+    };
+
+    //
+    // This is called when it's not safe to call the sent callback
+    // synchronously from this thread. Instead the exception callback
+    // is called asynchronously from the client thread pool.
+    //
+    try
+    {
+        _instance->clientThreadPool()->dispatch(new AsynchronousSent(_cachedConnection, shared_from_this()));
+    }
+    catch(const Ice::CommunicatorDestroyedException&)
+    {
+    }
+}
+
+void
+OutgoingAsyncBase::invokeExceptionAsync()
+{
+    class AsynchronousException : public DispatchWorkItem
+    {
+    public:
+
+        AsynchronousException(const ConnectionPtr& c, const OutgoingAsyncBasePtr& outAsync) :
+            DispatchWorkItem(c), _outAsync(outAsync)
+        {
+        }
+
+        virtual void
+        run()
+        {
+            _outAsync->invokeException();
+        }
+
+    private:
+
+        const OutgoingAsyncBasePtr _outAsync;
+    };
+
+    //
+    // CommunicatorDestroyedCompleted is the only exception that can propagate directly
+    // from this method.
+    //
+    _instance->clientThreadPool()->dispatch(new AsynchronousException(_cachedConnection, shared_from_this()));
+}
+
+void
+OutgoingAsyncBase::invokeResponseAsync()
+{
+    class AsynchronousResponse : public DispatchWorkItem
+    {
+    public:
+
+        AsynchronousResponse(const ConnectionPtr& connection, const OutgoingAsyncBasePtr& outAsync) :
+            DispatchWorkItem(connection), _outAsync(outAsync)
+        {
+        }
+
+        virtual void
+        run()
+        {
+            _outAsync->invokeResponse();
+        }
+
+    private:
+
+        const OutgoingAsyncBasePtr _outAsync;
+    };
+
+    //
+    // CommunicatorDestroyedCompleted is the only exception that can propagate directly
+    // from this method.
+    //
+    _instance->clientThreadPool()->dispatch(new AsynchronousResponse(_cachedConnection, shared_from_this()));
+}
+
+void
+OutgoingAsyncBase::invokeSent()
+{
+    try
+    {
+        handleInvokeSent(_sentSynchronously, this);
+    }
+    catch(const std::exception& ex)
+    {
+        warning(ex);
+    }
+    catch(...)
+    {
+        warning();
+    }
+
+    if(_observer && _doneInSent)
+    {
+        _observer.detach();
+    }
+}
+
+void
+OutgoingAsyncBase::invokeException()
 {
-    return 0; // Must be overriden by request that can handle responses
+    try
+    {
+        try
+        {
+            ICE_RETHROW_EXCEPTION(_ex);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            handleInvokeException(ex, this);
+        }
+    }
+    catch(const std::exception& ex)
+    {
+        warning(ex);
+    }
+    catch(...)
+    {
+        warning();
+    }
+
+    _observer.detach();
 }
 
-OutgoingAsyncBase::OutgoingAsyncBase(const CommunicatorPtr& communicator,
-                                     const InstancePtr& instance,
-                                     const string& operation,
-                                     const CallbackBasePtr& delegate,
-                                     const LocalObjectPtr& cookie) :
-    AsyncResult(communicator, instance, operation, delegate, cookie),
-    _os(instance.get(), Ice::currentProtocolEncoding)
+void
+OutgoingAsyncBase::invokeResponse()
+{
+    if(ICE_EXCEPTION_ISSET(_ex))
+    {
+        invokeException();
+        return;
+    }
+
+    try
+    {
+#ifdef ICE_CPP11_MAPPING
+        try
+        {
+            handleInvokeResponse(_state & OK, this);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            if(handleException(ex))
+            {
+                handleInvokeException(ex, this);
+            }
+        }
+        catch(const exception_ptr& ex)
+        {
+            rethrow_exception(ex);
+        }
+#else
+        handleInvokeResponse(_state & OK, this);
+#endif
+    }
+    catch(const std::exception& ex)
+    {
+        warning(ex);
+    }
+    catch(...)
+    {
+        warning();
+    }
+
+    _observer.detach();
+}
+
+void
+OutgoingAsyncBase::cancelable(const CancellationHandlerPtr& handler)
+{
+    Lock sync(_m);
+    if(ICE_EXCEPTION_ISSET(_cancellationException))
+    {
+        try
+        {
+            ICE_RETHROW_EXCEPTION(_cancellationException);
+        }
+        catch(const Ice::LocalException&)
+        {
+            ICE_RESET_EXCEPTION(_cancellationException, ICE_NULLPTR);
+            throw;
+        }
+    }
+    _cancellationHandler = handler;
+}
+
+void
+OutgoingAsyncBase::cancel()
+{
+    cancel(Ice::InvocationCanceledException(__FILE__, __LINE__));
+}
+
+OutgoingAsyncBase::OutgoingAsyncBase(const InstancePtr& instance) :
+    _instance(instance),
+    _sentSynchronously(false),
+    _doneInSent(false),
+    _state(0),
+    _os(instance.get(), Ice::currentProtocolEncoding),
+    _is(instance.get(), Ice::currentProtocolEncoding)
 {
 }
 
 bool
-OutgoingAsyncBase::sent(bool done)
+OutgoingAsyncBase::sentImpl(bool done)
 {
+    Lock sync(_m);
+    bool alreadySent = (_state & Sent) > 0;
+    _state |= Sent;
     if(done)
     {
+        _doneInSent = true;
         _childObserver.detach();
+        _cancellationHandler = 0;
+    }
+
+#ifndef ICE_CPP11_MAPPING
+    if(done)
+    {
+        _state |= Done | OK;
     }
-    return AsyncResult::sent(done);
+    _m.notifyAll();
+#endif
+
+    bool invoke = handleSent(done, alreadySent);
+    if(!invoke && _doneInSent)
+    {
+        _observer.detach();
+    }
+    return invoke;
 }
 
 bool
-OutgoingAsyncBase::finished(const Exception& ex)
+OutgoingAsyncBase::exceptionImpl(const Exception& ex)
 {
+    Lock sync(_m);
+    ICE_RESET_EXCEPTION(_ex, ex.ice_clone());
     if(_childObserver)
     {
-        _childObserver.failed(ex.ice_name());
+        _childObserver.failed(ex.ice_id());
         _childObserver.detach();
     }
-    return AsyncResult::finished(ex);
+    _cancellationHandler = 0;
+    _observer.failed(ex.ice_id());
+
+#ifndef ICE_CPP11_MAPPING
+    _state |= Done;
+    _m.notifyAll();
+#endif
+
+    bool invoke = handleException(ex);
+    if(!invoke)
+    {
+        _observer.detach();
+    }
+    return invoke;
 }
 
-Ice::ObjectPrx
-ProxyOutgoingAsyncBase::getProxy() const
+bool
+OutgoingAsyncBase::responseImpl(bool ok)
 {
-    return _proxy;
+    Lock sync(_m);
+    if(ok)
+    {
+        _state |= OK;
+    }
+
+    _cancellationHandler = 0;
+
+#ifndef ICE_CPP11_MAPPING
+    _state |= Done;
+    _m.notifyAll();
+#endif
+
+    bool invoke;
+    try
+    {
+        invoke = handleResponse(ok);
+    }
+    catch(const Ice::Exception& ex)
+    {
+        ICE_RESET_EXCEPTION(_ex, ex.ice_clone());
+        invoke = handleException(ex);
+    }
+    if(!invoke)
+    {
+        _observer.detach();
+    }
+    return invoke;
+}
+
+void
+OutgoingAsyncBase::cancel(const Ice::LocalException& ex)
+{
+    CancellationHandlerPtr handler;
+    {
+        Lock sync(_m);
+        ICE_RESET_EXCEPTION(_cancellationException, ex.ice_clone());
+        if(!_cancellationHandler)
+        {
+            return;
+        }
+        handler = _cancellationHandler;
+    }
+    handler->asyncRequestCanceled(shared_from_this(), ex);
+}
+
+#ifndef ICE_CPP11_MAPPING
+
+Int
+OutgoingAsyncBase::getHash() const
+{
+    return static_cast<Int>(reinterpret_cast<Long>(this) >> 4);
+}
+
+CommunicatorPtr
+OutgoingAsyncBase::getCommunicator() const
+{
+    return 0;
+}
+
+ConnectionPtr
+OutgoingAsyncBase::getConnection() const
+{
+    return 0;
+}
+
+ObjectPrxPtr
+OutgoingAsyncBase::getProxy() const
+{
+    return 0;
+}
+
+Ice::LocalObjectPtr
+OutgoingAsyncBase::getCookie() const
+{
+    return _cookie;
+}
+
+const std::string&
+OutgoingAsyncBase::getOperation() const
+{
+    assert(false); // Must be overriden
+    static string empty;
+    return empty;
+}
+
+bool
+OutgoingAsyncBase::isCompleted() const
+{
+    Lock sync(_m);
+    return (_state & Done) > 0;
+}
+
+void
+OutgoingAsyncBase::waitForCompleted()
+{
+    Lock sync(_m);
+    while(!(_state & Done))
+    {
+        _m.wait();
+    }
+}
+
+bool
+OutgoingAsyncBase::isSent() const
+{
+    Lock sync(_m);
+    return (_state & Sent) > 0;
+}
+
+void
+OutgoingAsyncBase::waitForSent()
+{
+    Lock sync(_m);
+    while(!(_state & Sent) && !_ex.get())
+    {
+        _m.wait();
+    }
+}
+
+bool
+OutgoingAsyncBase::sentSynchronously() const
+{
+    return _sentSynchronously;
+}
+
+void
+OutgoingAsyncBase::throwLocalException() const
+{
+    Lock sync(_m);
+    if(_ex.get())
+    {
+        _ex->ice_throw();
+    }
+}
+
+bool
+OutgoingAsyncBase::__wait()
+{
+    Lock sync(_m);
+    if(_state & EndCalled)
+    {
+        throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "end_ method called more than once");
+    }
+    _state |= EndCalled;
+    while(!(_state & Done))
+    {
+        _m.wait();
+    }
+
+    if(_ex.get())
+    {
+        _ex->ice_throw();
+    }
+    return _state & OK;
+}
+
+Ice::InputStream*
+OutgoingAsyncBase::__startReadParams()
+{
+    _is.startEncapsulation();
+    return &_is;
+}
+
+void
+OutgoingAsyncBase::__endReadParams()
+{
+    _is.endEncapsulation();
+}
+
+void
+OutgoingAsyncBase::__readEmptyParams()
+{
+    _is.skipEmptyEncapsulation();
+}
+
+void
+OutgoingAsyncBase::__readParamEncaps(const ::Ice::Byte*& encaps, ::Ice::Int& sz)
+{
+    _is.readEncapsulation(encaps, sz);
+}
+
+void
+OutgoingAsyncBase::__throwUserException()
+{
+    try
+    {
+        _is.startEncapsulation();
+        _is.throwException();
+    }
+    catch(const Ice::UserException&)
+    {
+        _is.endEncapsulation();
+        throw;
+    }
+}
+
+#endif
+
+void
+OutgoingAsyncBase::warning(const std::exception& exc) const
+{
+    if(_instance->initializationData().properties->getPropertyAsIntWithDefault("Ice.Warn.AMICallback", 1) > 0)
+    {
+        Ice::Warning out(_instance->initializationData().logger);
+        const Ice::Exception* ex = dynamic_cast<const Ice::Exception*>(&exc);
+        if(ex)
+        {
+            out << "Ice::Exception raised by AMI callback:\n" << *ex;
+        }
+        else
+        {
+            out << "std::exception raised by AMI callback:\n" << exc.what();
+        }
+    }
+}
+
+void
+OutgoingAsyncBase::warning() const
+{
+    if(_instance->initializationData().properties->getPropertyAsIntWithDefault("Ice.Warn.AMICallback", 1) > 0)
+    {
+        Ice::Warning out(_instance->initializationData().logger);
+        out << "unknown exception raised by AMI callback";
+    }
 }
 
 bool
-ProxyOutgoingAsyncBase::completed(const Exception& exc)
+ProxyOutgoingAsyncBase::exception(const Exception& exc)
 {
     if(_childObserver)
     {
-        _childObserver.failed(exc.ice_name());
+        _childObserver.failed(exc.ice_id());
         _childObserver.detach();
     }
 
     _cachedConnection = 0;
     if(_proxy->__reference()->getInvocationTimeout() == -2)
     {
-        _instance->timer()->cancel(this);
+        _instance->timer()->cancel(shared_from_this());
     }
 
     //
@@ -115,16 +597,30 @@ ProxyOutgoingAsyncBase::completed(const Exception& exc)
         // the retry interval is 0. This method can be called with the
         // connection locked so we can't just retry here.
         //
-        _instance->retryQueue()->add(this, handleException(exc));
+        _instance->retryQueue()->add(shared_from_this(), _proxy->__handleException(exc, _handler, _mode, _sent, _cnt));
         return false;
     }
     catch(const Exception& ex)
     {
-        return finished(ex); // No retries, we're done
+        return exceptionImpl(ex); // No retries, we're done
     }
 }
 
 void
+ProxyOutgoingAsyncBase::cancelable(const CancellationHandlerPtr& handler)
+{
+    if(_proxy->__reference()->getInvocationTimeout() == -2 && _cachedConnection)
+    {
+        const int timeout = _cachedConnection->timeout();
+        if(timeout > 0)
+        {
+            _instance->timer()->schedule(shared_from_this(), IceUtil::Time::milliSeconds(timeout));
+        }
+    }
+    OutgoingAsyncBase::cancelable(handler);
+}
+
+void
 ProxyOutgoingAsyncBase::retryException(const Exception& ex)
 {
     try
@@ -136,29 +632,15 @@ ProxyOutgoingAsyncBase::retryException(const Exception& ex)
         // connection to be done.
         //
         _proxy->__updateRequestHandler(_handler, 0); // Clear request handler and always retry.
-        _instance->retryQueue()->add(this, 0);
+        _instance->retryQueue()->add(shared_from_this(), 0);
     }
     catch(const Ice::Exception& exc)
     {
-        if(completed(exc))
-        {
-            invokeCompletedAsync();
-        }
-    }
-}
-
-void
-ProxyOutgoingAsyncBase::cancelable(const CancellationHandlerPtr& handler)
-{
-    if(_proxy->__reference()->getInvocationTimeout() == -2 && _cachedConnection)
-    {
-        const int timeout = _cachedConnection->timeout();
-        if(timeout > 0)
+        if(exception(exc))
         {
-            _instance->timer()->schedule(this, IceUtil::Time::milliSeconds(timeout));
+            invokeExceptionAsync();
         }
     }
-    AsyncResult::cancelable(handler);
 }
 
 void
@@ -172,9 +654,9 @@ ProxyOutgoingAsyncBase::abort(const Ice::Exception& ex)
 {
     assert(!_childObserver);
 
-    if(finished(ex))
+    if(exceptionImpl(ex))
     {
-        invokeCompletedAsync();
+        invokeExceptionAsync();
     }
     else if(dynamic_cast<const Ice::CommunicatorDestroyedException*>(&ex))
     {
@@ -187,18 +669,33 @@ ProxyOutgoingAsyncBase::abort(const Ice::Exception& ex)
     }
 }
 
-ProxyOutgoingAsyncBase::ProxyOutgoingAsyncBase(const ObjectPrx& prx,
-                                               const string& operation,
-                                               const CallbackBasePtr& delegate,
-                                               const LocalObjectPtr& cookie) :
-    OutgoingAsyncBase(prx->ice_getCommunicator(), prx->__reference()->getInstance(), operation, delegate, cookie),
+#ifndef ICE_CPP11_MAPPING
+Ice::ObjectPrx
+ProxyOutgoingAsyncBase::getProxy() const
+{
+    return _proxy;
+}
+
+Ice::CommunicatorPtr
+ProxyOutgoingAsyncBase::getCommunicator() const
+{
+    return _proxy->ice_getCommunicator();
+}
+#endif
+
+ProxyOutgoingAsyncBase::ProxyOutgoingAsyncBase(const ObjectPrxPtr& prx) :
+    OutgoingAsyncBase(prx->__reference()->getInstance()),
     _proxy(prx),
-    _mode(Normal),
+    _mode(ICE_ENUM(OperationMode, Normal)),
     _cnt(0),
     _sent(false)
 {
 }
 
+ProxyOutgoingAsyncBase::~ProxyOutgoingAsyncBase()
+{
+}
+
 void
 ProxyOutgoingAsyncBase::invokeImpl(bool userThread)
 {
@@ -209,7 +706,7 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread)
             int invocationTimeout = _proxy->__reference()->getInvocationTimeout();
             if(invocationTimeout > 0)
             {
-                _instance->timer()->schedule(this, IceUtil::Time::milliSeconds(invocationTimeout));
+                _instance->timer()->schedule(shared_from_this(), IceUtil::Time::milliSeconds(invocationTimeout));
             }
         }
         else
@@ -223,7 +720,7 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread)
             {
                 _sent = false;
                 _handler = _proxy->__getRequestHandler();
-                AsyncStatus status = _handler->sendAsyncRequest(this);
+                AsyncStatus status = _handler->sendAsyncRequest(shared_from_this());
                 if(status & AsyncStatusSent)
                 {
                     if(userThread)
@@ -252,13 +749,13 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread)
             {
                 if(_childObserver)
                 {
-                    _childObserver.failed(ex.ice_name());
+                    _childObserver.failed(ex.ice_id());
                     _childObserver.detach();
                 }
-                int interval = handleException(ex);
+                int interval = _proxy->__handleException(ex, _handler, _mode, _sent, _cnt);
                 if(interval > 0)
                 {
-                    _instance->retryQueue()->add(this, interval);
+                    _instance->retryQueue()->add(shared_from_this(), interval);
                     return;
                 }
                 else
@@ -278,51 +775,45 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread)
         {
             throw;
         }
-        else if(finished(ex)) // No retries, we're done
+        else if(exceptionImpl(ex)) // No retries, we're done
         {
-            invokeCompletedAsync();
+            invokeExceptionAsync();
         }
     }
 }
 
 bool
-ProxyOutgoingAsyncBase::sent(bool done)
+ProxyOutgoingAsyncBase::sentImpl(bool done)
 {
     _sent = true;
     if(done)
     {
         if(_proxy->__reference()->getInvocationTimeout() != -1)
         {
-            _instance->timer()->cancel(this);
+            _instance->timer()->cancel(shared_from_this());
         }
     }
-    return OutgoingAsyncBase::sent(done);
+    return OutgoingAsyncBase::sentImpl(done);
 }
 
 bool
-ProxyOutgoingAsyncBase::finished(const Exception& ex)
+ProxyOutgoingAsyncBase::exceptionImpl(const Exception& ex)
 {
     if(_proxy->__reference()->getInvocationTimeout() != -1)
     {
-        _instance->timer()->cancel(this);
+        _instance->timer()->cancel(shared_from_this());
     }
-    return OutgoingAsyncBase::finished(ex);
+    return OutgoingAsyncBase::exceptionImpl(ex);
 }
 
 bool
-ProxyOutgoingAsyncBase::finished(bool ok)
+ProxyOutgoingAsyncBase::responseImpl(bool ok)
 {
     if(_proxy->__reference()->getInvocationTimeout() != -1)
     {
-        _instance->timer()->cancel(this);
+        _instance->timer()->cancel(shared_from_this());
     }
-    return AsyncResult::finished(ok);
-}
-
-int
-ProxyOutgoingAsyncBase::handleException(const Exception& exc)
-{
-    return _proxy->__handleException(exc, _handler, _mode, _sent, _cnt);
+    return OutgoingAsyncBase::responseImpl(ok);
 }
 
 void
@@ -338,22 +829,20 @@ ProxyOutgoingAsyncBase::runTimerTask()
     }
 }
 
-OutgoingAsync::OutgoingAsync(const ObjectPrx& prx,
-                             const string& operation,
-                             const CallbackBasePtr& delegate,
-                             const LocalObjectPtr& cookie) :
-    ProxyOutgoingAsyncBase(prx, operation, delegate, cookie),
-    _encoding(getCompatibleEncoding(prx->__reference()->getEncoding()))
+OutgoingAsync::OutgoingAsync(const ObjectPrxPtr& prx) :
+    ProxyOutgoingAsyncBase(prx),
+    _encoding(getCompatibleEncoding(prx->__reference()->getEncoding())),
+    _synchronous(false)
 {
 }
 
 void
-OutgoingAsync::prepare(const string& operation, OperationMode mode, const Context* context)
+OutgoingAsync::prepare(const string& operation, OperationMode mode, const Context& context)
 {
     checkSupportedProtocol(getCompatibleProtocol(_proxy->__reference()->getProtocol()));
 
     _mode = mode;
-    _observer.attach(_proxy.get(), operation, context);
+    _observer.attach(_proxy, operation, context);
 
     switch(_proxy->__reference()->getMode())
     {
@@ -394,12 +883,12 @@ OutgoingAsync::prepare(const string& operation, OperationMode mode, const Contex
 
     _os.write(static_cast<Byte>(_mode));
 
-    if(context != 0)
+    if(&context != &Ice::noExplicitContext)
     {
         //
         // Explicit context
         //
-        _os.write(*context);
+        _os.write(context);
     }
     else
     {
@@ -422,61 +911,11 @@ OutgoingAsync::prepare(const string& operation, OperationMode mode, const Contex
 bool
 OutgoingAsync::sent()
 {
-    return ProxyOutgoingAsyncBase::sent(!_proxy->ice_isTwoway()); // done = true if it's not a two-way proxy
-}
-
-AsyncStatus
-OutgoingAsync::invokeRemote(const ConnectionIPtr& connection, bool compress, bool response)
-{
-    _cachedConnection = connection;
-    return connection->sendAsyncRequest(this, compress, response, 0);
-}
-
-AsyncStatus
-OutgoingAsync::invokeCollocated(CollocatedRequestHandler* handler)
-{
-    return handler->invokeAsyncRequest(this, 0);
-}
-
-void
-OutgoingAsync::abort(const Exception& ex)
-{
-    const Reference::Mode mode = _proxy->__reference()->getMode();
-    if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram)
-    {
-        //
-        // If we didn't finish a batch oneway or datagram request, we
-        // must notify the connection about that we give up ownership
-        // of the batch stream.
-        //
-        _proxy->__getBatchRequestQueue()->abortBatchRequest(&_os);
-    }
-
-    ProxyOutgoingAsyncBase::abort(ex);
-}
-
-void
-OutgoingAsync::invoke()
-{
-    const Reference::Mode mode = _proxy->__reference()->getMode();
-    if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram)
-    {
-        _sentSynchronously = true;
-        _proxy->__getBatchRequestQueue()->finishBatchRequest(&_os, _proxy, getOperation());
-        finished(true);
-        return; // Don't call sent/completed callback for batch AMI requests
-    }
-
-    //
-    // NOTE: invokeImpl doesn't throw so this can be called from the
-    // try block with the catch block calling abort() in case of an
-    // exception.
-    //
-    invokeImpl(true); // userThread = true
+    return ProxyOutgoingAsyncBase::sentImpl(!_proxy->ice_isTwoway()); // done = true if it's not a two-way proxy
 }
 
 bool
-OutgoingAsync::completed()
+OutgoingAsync::response()
 {
     //
     // NOTE: this method is called from ConnectionI.parseMessage
@@ -612,22 +1051,116 @@ OutgoingAsync::completed()
             }
         }
 
-        return finished(replyStatus == replyOK);
+        return responseImpl(replyStatus == replyOK);
     }
     catch(const Exception& ex)
     {
-        return completed(ex);
+        return exception(ex);
+    }
+}
+
+AsyncStatus
+OutgoingAsync::invokeRemote(const ConnectionIPtr& connection, bool compress, bool response)
+{
+    _cachedConnection = connection;
+    return connection->sendAsyncRequest(shared_from_this(), compress, response, 0);
+}
+
+AsyncStatus
+OutgoingAsync::invokeCollocated(CollocatedRequestHandler* handler)
+{
+    return handler->invokeAsyncRequest(this, 0, _synchronous);
+}
+
+void
+OutgoingAsync::abort(const Exception& ex)
+{
+    const Reference::Mode mode = _proxy->__reference()->getMode();
+    if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram)
+    {
+        //
+        // If we didn't finish a batch oneway or datagram request, we
+        // must notify the connection about that we give up ownership
+        // of the batch stream.
+        //
+        _proxy->__getBatchRequestQueue()->abortBatchRequest(&_os);
+    }
+
+    ProxyOutgoingAsyncBase::abort(ex);
+}
+
+void
+OutgoingAsync::invoke(const string& operation)
+{
+    const Reference::Mode mode = _proxy->__reference()->getMode();
+    if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram)
+    {
+        _sentSynchronously = true;
+        _proxy->__getBatchRequestQueue()->finishBatchRequest(&_os, _proxy, operation);
+        responseImpl(true);
+        return; // Don't call sent/completed callback for batch AMI requests
+    }
+
+    //
+    // NOTE: invokeImpl doesn't throw so this can be called from the
+    // try block with the catch block calling abort() in case of an
+    // exception.
+    //
+    invokeImpl(true); // userThread = true
+}
+
+#ifdef ICE_CPP11_MAPPING
+void
+OutgoingAsync::invoke(const string& operation,
+                      Ice::OperationMode mode,
+                      Ice::FormatType format,
+                      const Ice::Context& context,
+                      const function<void(Ice::OutputStream*)>& write)
+{
+    try
+    {
+        prepare(operation, mode, context);
+        if(write)
+        {
+            _os.startEncapsulation(_encoding, format);
+            write(&_os);
+            _os.endEncapsulation();
+        }
+        else
+        {
+            _os.writeEmptyEncapsulation(_encoding);
+        }
+        invoke(operation);
+    }
+    catch(const Ice::Exception& ex)
+    {
+        abort(ex);
+    }
+}
+
+void
+OutgoingAsync::throwUserException()
+{
+    try
+    {
+        _is.startEncapsulation();
+        _is.throwException();
+    }
+    catch(const UserException& ex)
+    {
+        _is.endEncapsulation();
+        if(_userException)
+        {
+            _userException(ex);
+        }
+        throw UnknownUserException(__FILE__, __LINE__, ex.ice_id());
     }
 }
 
-ProxyFlushBatchAsync::ProxyFlushBatchAsync(const ObjectPrx& proxy,
-                                           const string& operation,
-                                           const CallbackBasePtr& delegate,
-                                           const LocalObjectPtr& cookie) :
-    ProxyOutgoingAsyncBase(proxy, operation, delegate, cookie)
+#endif
+
+ProxyFlushBatchAsync::ProxyFlushBatchAsync(const ObjectPrxPtr& proxy) : ProxyOutgoingAsyncBase(proxy)
 {
-    _observer.attach(proxy.get(), operation, 0);
-    _batchRequestNum = proxy->__getBatchRequestQueue()->swap(&_os);
 }
 
 AsyncStatus
@@ -645,7 +1178,7 @@ ProxyFlushBatchAsync::invokeRemote(const ConnectionIPtr& connection, bool compre
         }
     }
     _cachedConnection = connection;
-    return connection->sendAsyncRequest(this, compress, false, _batchRequestNum);
+    return connection->sendAsyncRequest(shared_from_this(), compress, false, _batchRequestNum);
 }
 
 AsyncStatus
@@ -662,32 +1195,29 @@ ProxyFlushBatchAsync::invokeCollocated(CollocatedRequestHandler* handler)
             return AsyncStatusSent;
         }
     }
-    return handler->invokeAsyncRequest(this, _batchRequestNum);
+    return handler->invokeAsyncRequest(this, _batchRequestNum, false);
 }
 
 void
-ProxyFlushBatchAsync::invoke()
+ProxyFlushBatchAsync::invoke(const string& operation)
 {
     checkSupportedProtocol(getCompatibleProtocol(_proxy->__reference()->getProtocol()));
+    _observer.attach(_proxy, operation, ::Ice::noExplicitContext);
+    _batchRequestNum = _proxy->__getBatchRequestQueue()->swap(&_os);
     invokeImpl(true); // userThread = true
 }
 
-ProxyGetConnection::ProxyGetConnection(const ObjectPrx& prx,
-                                       const string& operation,
-                                       const CallbackBasePtr& delegate,
-                                       const LocalObjectPtr& cookie) :
-    ProxyOutgoingAsyncBase(prx, operation, delegate, cookie)
+ProxyGetConnection::ProxyGetConnection(const ObjectPrxPtr& prx) : ProxyOutgoingAsyncBase(prx)
 {
-    _observer.attach(prx.get(), operation, 0);
 }
 
 AsyncStatus
 ProxyGetConnection::invokeRemote(const ConnectionIPtr& connection, bool, bool)
 {
     _cachedConnection = connection;
-    if(finished(true))
+    if(responseImpl(true))
     {
-        invokeCompletedAsync();
+        invokeResponseAsync();
     }
     return AsyncStatusSent;
 }
@@ -695,28 +1225,23 @@ ProxyGetConnection::invokeRemote(const ConnectionIPtr& connection, bool, bool)
 AsyncStatus
 ProxyGetConnection::invokeCollocated(CollocatedRequestHandler*)
 {
-    if(finished(true))
+    if(responseImpl(true))
     {
-        invokeCompletedAsync();
+        invokeResponseAsync();
     }
     return AsyncStatusSent;
 }
 
 void
-ProxyGetConnection::invoke()
+ProxyGetConnection::invoke(const string& operation)
 {
+    _observer.attach(_proxy, operation, ::Ice::noExplicitContext);
     invokeImpl(true); // userThread = true
 }
 
-ConnectionFlushBatchAsync::ConnectionFlushBatchAsync(const ConnectionIPtr& connection,
-                                                     const CommunicatorPtr& communicator,
-                                                     const InstancePtr& instance,
-                                                     const string& operation,
-                                                     const CallbackBasePtr& delegate,
-                                                     const LocalObjectPtr& cookie) :
-    OutgoingAsyncBase(communicator, instance, operation, delegate, cookie), _connection(connection)
+ConnectionFlushBatchAsync::ConnectionFlushBatchAsync(const ConnectionIPtr& connection, const InstancePtr& instance) :
+    OutgoingAsyncBase(instance), _connection(connection)
 {
-    _observer.attach(instance.get(), operation);
 }
 
 ConnectionPtr
@@ -726,8 +1251,9 @@ ConnectionFlushBatchAsync::getConnection() const
 }
 
 void
-ConnectionFlushBatchAsync::invoke()
+ConnectionFlushBatchAsync::invoke(const string& operation)
 {
+    _observer.attach(_instance.get(), operation);
     try
     {
         AsyncStatus status;
@@ -742,7 +1268,7 @@ ConnectionFlushBatchAsync::invoke()
         }
         else
         {
-            status = _connection->sendAsyncRequest(this, false, false, batchRequestNum);
+            status = _connection->sendAsyncRequest(shared_from_this(), false, false, batchRequestNum);
         }
 
         if(status & AsyncStatusSent)
@@ -756,29 +1282,42 @@ ConnectionFlushBatchAsync::invoke()
     }
     catch(const RetryException& ex)
     {
-        if(completed(*ex.get()))
+#ifdef ICE_CPP11_MAPPING
+        try
         {
-            invokeCompletedAsync();
+            rethrow_exception(ex.get());
         }
+        catch(const Ice::LocalException& ee)
+        {
+            if(exception(ee))
+            {
+                invokeExceptionAsync();
+            }
+        }
+#else
+        if(exception(*ex.get()))
+        {
+            invokeExceptionAsync();
+        }
+#endif
     }
     catch(const Exception& ex)
     {
-        if(completed(ex))
+        if(exception(ex))
         {
-            invokeCompletedAsync();
+            invokeExceptionAsync();
         }
     }
 }
 
-CommunicatorFlushBatchAsync::CommunicatorFlushBatchAsync(const CommunicatorPtr& communicator,
-                                                         const InstancePtr& instance,
-                                                         const string& operation,
-                                                         const CallbackBasePtr& cb,
-                                                         const LocalObjectPtr& cookie) :
-    AsyncResult(communicator, instance, operation, cb, cookie)
+CommunicatorFlushBatchAsync::~CommunicatorFlushBatchAsync()
 {
-    _observer.attach(instance.get(), operation);
+    // Out of line to avoid weak vtable
+}
 
+CommunicatorFlushBatchAsync::CommunicatorFlushBatchAsync(const InstancePtr& instance) :
+    OutgoingAsyncBase(instance)
+{
     //
     // _useCount is initialized to 1 to prevent premature callbacks.
     // The caller must invoke ready() after all flush requests have
@@ -797,46 +1336,77 @@ CommunicatorFlushBatchAsync::flushConnection(const ConnectionIPtr& con)
         FlushBatch(const CommunicatorFlushBatchAsyncPtr& outAsync,
                    const InstancePtr& instance,
                    InvocationObserver& observer) :
-            OutgoingAsyncBase(outAsync->getCommunicator(), instance, outAsync->getOperation(), __dummyCallback, 0),
-            _outAsync(outAsync),
-            _observer(observer)
+            OutgoingAsyncBase(instance), _outAsync(outAsync), _observer(observer)
         {
         }
 
-        virtual bool sent()
+        virtual bool
+        sent()
         {
             _childObserver.detach();
             _outAsync->check(false);
             return false;
         }
 
-        virtual bool completed(const Exception& ex)
+        virtual bool
+        exception(const Exception& ex)
         {
-            _childObserver.failed(ex.ice_name());
+            _childObserver.failed(ex.ice_id());
             _childObserver.detach();
             _outAsync->check(false);
             return false;
         }
 
-    private:
-
-        virtual InvocationObserver& getObserver()
+        virtual InvocationObserver&
+        getObserver()
         {
             return _observer;
         }
 
+        virtual bool handleSent(bool, bool)
+        {
+            return false;
+        }
+
+        virtual bool handleException(const Ice::Exception&)
+        {
+            return false;
+        }
+
+        virtual bool handleResponse(bool)
+        {
+            return false;
+        }
+
+        virtual void handleInvokeSent(bool, OutgoingAsyncBase*) const
+        {
+            assert(false);
+        }
+
+        virtual void handleInvokeException(const Ice::Exception&, OutgoingAsyncBase*) const
+        {
+            assert(false);
+        }
+
+        virtual void handleInvokeResponse(bool, OutgoingAsyncBase*) const
+        {
+            assert(false);
+        }
+
+    private:
+
         const CommunicatorFlushBatchAsyncPtr _outAsync;
         InvocationObserver& _observer;
     };
 
     {
-        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
+        Lock sync(_m);
         ++_useCount;
     }
 
     try
     {
-        OutgoingAsyncBasePtr flushBatch = new FlushBatch(this, _instance, _observer);
+        OutgoingAsyncBasePtr flushBatch = ICE_MAKE_SHARED(FlushBatch, shared_from_this(), _instance, _observer);
         int batchRequestNum = con->getBatchRequestQueue()->swap(flushBatch->getOs());
         if(batchRequestNum == 0)
         {
@@ -855,8 +1425,11 @@ CommunicatorFlushBatchAsync::flushConnection(const ConnectionIPtr& con)
 }
 
 void
-CommunicatorFlushBatchAsync::ready()
+CommunicatorFlushBatchAsync::invoke(const string& operation)
 {
+    _observer.attach(_instance.get(), operation);
+    _instance->outgoingConnectionFactory()->flushAsyncBatchRequests(shared_from_this());
+    _instance->objectAdapterFactory()->flushAsyncBatchRequests(shared_from_this());
     check(true);
 }
 
@@ -864,7 +1437,7 @@ void
 CommunicatorFlushBatchAsync::check(bool userThread)
 {
     {
-        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
+        Lock sync(_m);
         assert(_useCount > 0);
         if(--_useCount > 0)
         {
@@ -872,7 +1445,7 @@ CommunicatorFlushBatchAsync::check(bool userThread)
         }
     }
 
-    if(sent(true))
+    if(sentImpl(true))
     {
         if(userThread)
         {
@@ -885,3 +1458,137 @@ CommunicatorFlushBatchAsync::check(bool userThread)
         }
     }
 }
+
+#ifdef ICE_CPP11_MAPPING
+
+bool
+LambdaInvoke::handleSent(bool, bool alreadySent)
+{
+    return _sent != nullptr && !alreadySent; // Invoke the sent callback only if not already invoked.
+}
+
+bool
+LambdaInvoke::handleException(const Ice::Exception&)
+{
+    return _exception != nullptr; // Invoke the callback
+}
+
+bool
+LambdaInvoke::handleResponse(bool)
+{
+    return _response != nullptr;
+}
+
+void
+LambdaInvoke::handleInvokeSent(bool sentSynchronously, OutgoingAsyncBase*) const
+{
+    _sent(sentSynchronously);
+}
+
+void
+LambdaInvoke::handleInvokeException(const Ice::Exception& ex, OutgoingAsyncBase*) const
+{
+    try
+    {
+        ex.ice_throw();
+    }
+    catch(const Ice::Exception&)
+    {
+        _exception(current_exception());
+    }
+}
+
+void
+LambdaInvoke::handleInvokeResponse(bool ok, OutgoingAsyncBase*) const
+{
+    _response(ok);
+}
+
+#else // C++98
+
+namespace
+{
+
+//
+// Dummy class derived from CallbackBase
+// We use this class for the __dummyCallback extern pointer in OutgoingAsync. In turn,
+// this allows us to test whether the user supplied a null delegate instance to the
+// generated begin_ method without having to generate a separate test to throw IllegalArgumentException
+// in the inlined versions of the begin_ method. In other words, this reduces the amount of generated
+// object code.
+//
+class DummyCallback : public CallbackBase
+{
+public:
+
+    DummyCallback()
+    {
+    }
+
+    virtual void
+    completed(const Ice::AsyncResultPtr&) const
+    {
+         assert(false);
+    }
+
+    virtual CallbackBasePtr
+    verify(const Ice::LocalObjectPtr&)
+    {
+        //
+        // Called by the AsyncResult constructor to verify the delegate. The dummy
+        // delegate is passed when the user used a begin_ method without delegate.
+        // By returning 0 here, we tell the AsyncResult that no delegates was
+        // provided.
+        //
+        return 0;
+    }
+
+    virtual void
+    sent(const AsyncResultPtr&) const
+    {
+         assert(false);
+    }
+
+    virtual bool
+    hasSentCallback() const
+    {
+        assert(false);
+        return false;
+    }
+};
+
+}
+
+//
+// This gives a pointer value to compare against in the generated
+// begin_ method to decide whether the caller passed a null pointer
+// versus the generated inline version of the begin_ method having
+// passed a pointer to the dummy delegate.
+//
+CallbackBasePtr IceInternal::__dummyCallback = new DummyCallback;
+
+CallbackBase::~CallbackBase()
+{
+    // Out of line to avoid weak vtable
+}
+
+void
+CallbackBase::checkCallback(bool obj, bool cb)
+{
+    if(!obj)
+    {
+        throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "callback object cannot be null");
+    }
+    if(!cb)
+    {
+        throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "callback cannot be null");
+    }
+}
+
+GenericCallbackBase::~GenericCallbackBase()
+{
+    // Out of line to avoid weak vtable
+}
+
+
+#endif
diff --git a/cpp/src/Ice/OutputStream.cpp b/cpp/src/Ice/OutputStream.cpp
new file mode 100644
index 00000000000..653b8e39adb
--- /dev/null
+++ b/cpp/src/Ice/OutputStream.cpp
@@ -0,0 +1,1380 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceUtil/DisableWarnings.h>
+#include <Ice/OutputStream.h>
+#include <Ice/DefaultsAndOverrides.h>
+#include <Ice/Instance.h>
+#include <Ice/Object.h>
+#include <Ice/Proxy.h>
+#include <Ice/ProxyFactory.h>
+#include <Ice/ValueFactory.h>
+#include <Ice/LocalException.h>
+#include <Ice/Protocol.h>
+#include <Ice/TraceUtil.h>
+#include <Ice/LoggerUtil.h>
+#include <Ice/SlicedData.h>
+#include <IceUtil/StringConverter.h>
+#include <iterator>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+namespace
+{
+
+class StreamUTF8BufferI : public IceUtil::UTF8Buffer
+{
+public:
+
+    StreamUTF8BufferI(OutputStream& stream) :
+        _stream(stream)
+    {
+    }
+
+    Ice::Byte* getMoreBytes(size_t howMany, Ice::Byte* firstUnused)
+    {
+        assert(howMany > 0);
+
+        if(firstUnused != 0)
+        {
+            //
+            // Return unused bytes
+            //
+            _stream.resize(firstUnused - _stream.b.begin());
+        }
+
+        //
+        // Index of first unused byte
+        //
+        Buffer::Container::size_type pos = _stream.b.size();
+
+        //
+        // Since resize may reallocate the buffer, when firstUnused != 0, the
+        // return value can be != firstUnused
+        //
+        _stream.resize(pos + howMany);
+
+        return &_stream.b[pos];
+    }
+
+private:
+
+    OutputStream& _stream;
+};
+
+}
+
+Ice::OutputStream::OutputStream() :
+    _instance(0),
+    _closure(0),
+    _encoding(currentEncoding),
+    _format(CompactFormat),
+    _currentEncaps(0)
+{
+}
+
+Ice::OutputStream::OutputStream(const CommunicatorPtr& communicator) :
+    _closure(0),
+    _currentEncaps(0)
+{
+    initialize(communicator);
+}
+
+Ice::OutputStream::OutputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding) :
+    _closure(0),
+    _currentEncaps(0)
+{
+    initialize(communicator, encoding);
+}
+
+Ice::OutputStream::OutputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding,
+                                const pair<const Byte*, const Byte*>& buf) :
+    Buffer(buf.first, buf.second),
+    _closure(0),
+    _currentEncaps(0)
+{
+    initialize(communicator, encoding);
+    b.reset();
+}
+
+Ice::OutputStream::OutputStream(Instance* instance, const EncodingVersion& encoding) :
+    _closure(0),
+    _currentEncaps(0)
+{
+    initialize(instance, encoding);
+}
+
+void
+Ice::OutputStream::initialize(const CommunicatorPtr& communicator)
+{
+    assert(communicator);
+    Instance* instance = getInstance(communicator).get();
+    initialize(instance, instance->defaultsAndOverrides()->defaultEncoding);
+}
+
+void
+Ice::OutputStream::initialize(const CommunicatorPtr& communicator, const EncodingVersion& encoding)
+{
+    assert(communicator);
+    initialize(getInstance(communicator).get(), encoding);
+}
+
+void
+Ice::OutputStream::initialize(Instance* instance, const EncodingVersion& encoding)
+{
+    assert(instance);
+
+    _instance = instance;
+    _encoding = encoding;
+
+    _stringConverter = _instance->getStringConverter();
+    _wstringConverter = _instance->getWstringConverter();
+
+    _format = _instance->defaultsAndOverrides()->defaultFormat;
+}
+
+void
+Ice::OutputStream::clear()
+{
+    while(_currentEncaps && _currentEncaps != &_preAllocatedEncaps)
+    {
+        Encaps* oldEncaps = _currentEncaps;
+        _currentEncaps = _currentEncaps->previous;
+        delete oldEncaps;
+    }
+}
+
+void
+Ice::OutputStream::setStringConverters(const IceUtil::StringConverterPtr& sc, const IceUtil::WstringConverterPtr& wsc)
+{
+    _stringConverter = sc;
+    _wstringConverter = wsc;
+}
+
+void
+Ice::OutputStream::setFormat(FormatType fmt)
+{
+    _format = fmt;
+}
+
+void*
+Ice::OutputStream::getClosure() const
+{
+    return _closure;
+}
+
+void*
+Ice::OutputStream::setClosure(void* p)
+{
+    void* prev = _closure;
+    _closure = p;
+    return prev;
+}
+
+void
+Ice::OutputStream::swap(OutputStream& other)
+{
+    swapBuffer(other);
+
+    std::swap(_instance, other._instance);
+    std::swap(_closure, other._closure);
+    std::swap(_encoding, other._encoding);
+    std::swap(_format, other._format);
+
+    //
+    // Swap is never called for streams that have encapsulations being written. However,
+    // encapsulations might still be set in case marshalling failed. We just
+    // reset the encapsulations if there are still some set.
+    //
+    resetEncapsulation();
+    other.resetEncapsulation();
+}
+
+void
+Ice::OutputStream::resetEncapsulation()
+{
+    while(_currentEncaps && _currentEncaps != &_preAllocatedEncaps)
+    {
+        Encaps* oldEncaps = _currentEncaps;
+        _currentEncaps = _currentEncaps->previous;
+        delete oldEncaps;
+    }
+
+    _preAllocatedEncaps.reset();
+}
+
+void
+Ice::OutputStream::startEncapsulation()
+{
+    //
+    // If no encoding version is specified, use the current write
+    // encapsulation encoding version if there's a current write
+    // encapsulation, otherwise, use the stream encoding version.
+    //
+
+    if(_currentEncaps)
+    {
+        startEncapsulation(_currentEncaps->encoding, _currentEncaps->format);
+    }
+    else
+    {
+        startEncapsulation(_encoding, Ice::DefaultFormat);
+    }
+}
+
+void
+Ice::OutputStream::writePendingValues()
+{
+    if(_currentEncaps && _currentEncaps->encoder)
+    {
+        _currentEncaps->encoder->writePendingValues();
+    }
+    else if(getEncoding() == Ice::Encoding_1_0)
+    {
+        //
+        // If using the 1.0 encoding and no instances were written, we
+        // still write an empty sequence for pending instances if
+        // requested (i.e.: if this is called).
+        //
+        // This is required by the 1.0 encoding, even if no instances
+        // are written we do marshal an empty sequence if marshaled
+        // data types use classes.
+        //
+        writeSize(0);
+    }
+}
+
+void
+Ice::OutputStream::writeBlob(const vector<Byte>& v)
+{
+    if(!v.empty())
+    {
+        Container::size_type pos = b.size();
+        resize(pos + v.size());
+        memcpy(&b[pos], &v[0], v.size());
+    }
+}
+
+void
+Ice::OutputStream::write(const Byte* begin, const Byte* end)
+{
+    Int sz = static_cast<Int>(end - begin);
+    writeSize(sz);
+    if(sz > 0)
+    {
+        Container::size_type pos = b.size();
+        resize(pos + sz);
+        memcpy(&b[pos], begin, sz);
+    }
+}
+
+void
+Ice::OutputStream::write(const vector<bool>& v)
+{
+    Int sz = static_cast<Int>(v.size());
+    writeSize(sz);
+    if(sz > 0)
+    {
+        Container::size_type pos = b.size();
+        resize(pos + sz);
+        copy(v.begin(), v.end(), b.begin() + pos);
+    }
+}
+
+namespace
+{
+
+template<size_t boolSize>
+struct WriteBoolHelper
+{
+    static void write(const bool* begin, OutputStream::Container::size_type pos, OutputStream::Container& b, Int sz)
+    {
+        for(int idx = 0; idx < sz; ++idx)
+        {
+           b[pos + idx] = static_cast<Byte>(*(begin + idx));
+        }
+    }
+};
+
+template<>
+struct WriteBoolHelper<1>
+{
+    static void write(const bool* begin, OutputStream::Container::size_type pos, OutputStream::Container& b, Int sz)
+    {
+        memcpy(&b[pos], begin, sz);
+    }
+};
+
+}
+
+void
+Ice::OutputStream::write(const bool* begin, const bool* end)
+{
+    Int sz = static_cast<Int>(end - begin);
+    writeSize(sz);
+    if(sz > 0)
+    {
+        Container::size_type pos = b.size();
+        resize(pos + sz);
+        WriteBoolHelper<sizeof(bool)>::write(begin, pos, b, sz);
+    }
+}
+
+void
+Ice::OutputStream::write(Short v)
+{
+    Container::size_type pos = b.size();
+    resize(pos + sizeof(Short));
+    Byte* dest = &b[pos];
+#ifdef ICE_BIG_ENDIAN
+    const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Short) - 1;
+    *dest++ = *src--;
+    *dest = *src;
+#else
+    const Byte* src = reinterpret_cast<const Byte*>(&v);
+    *dest++ = *src++;
+    *dest = *src;
+#endif
+}
+
+void
+Ice::OutputStream::write(const Short* begin, const Short* end)
+{
+    Int sz = static_cast<Int>(end - begin);
+    writeSize(sz);
+    if(sz > 0)
+    {
+        Container::size_type pos = b.size();
+        resize(pos + sz * sizeof(Short));
+#ifdef ICE_BIG_ENDIAN
+        const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Short) - 1;
+        Byte* dest = &(*(b.begin() + pos));
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest++ = *src--;
+            *dest++ = *src--;
+            src += 2 * sizeof(Short);
+        }
+#else
+        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Short));
+#endif
+    }
+}
+
+void
+Ice::OutputStream::write(const Int* begin, const Int* end)
+{
+    Int sz = static_cast<Int>(end - begin);
+    writeSize(sz);
+    if(sz > 0)
+    {
+        Container::size_type pos = b.size();
+        resize(pos + sz * sizeof(Int));
+#ifdef ICE_BIG_ENDIAN
+        const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Int) - 1;
+        Byte* dest = &(*(b.begin() + pos));
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            src += 2 * sizeof(Int);
+        }
+#else
+        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Int));
+#endif
+    }
+}
+
+void
+Ice::OutputStream::write(Long v)
+{
+    Container::size_type pos = b.size();
+    resize(pos + sizeof(Long));
+    Byte* dest = &b[pos];
+#ifdef ICE_BIG_ENDIAN
+    const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Long) - 1;
+    *dest++ = *src--;
+    *dest++ = *src--;
+    *dest++ = *src--;
+    *dest++ = *src--;
+    *dest++ = *src--;
+    *dest++ = *src--;
+    *dest++ = *src--;
+    *dest = *src;
+#else
+    const Byte* src = reinterpret_cast<const Byte*>(&v);
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest = *src;
+#endif
+}
+
+void
+Ice::OutputStream::write(const Long* begin, const Long* end)
+{
+    Int sz = static_cast<Int>(end - begin);
+    writeSize(sz);
+    if(sz > 0)
+    {
+        Container::size_type pos = b.size();
+        resize(pos + sz * sizeof(Long));
+#ifdef ICE_BIG_ENDIAN
+        const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Long) - 1;
+        Byte* dest = &(*(b.begin() + pos));
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            src += 2 * sizeof(Long);
+        }
+#else
+        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Long));
+#endif
+    }
+}
+
+void
+Ice::OutputStream::write(Float v)
+{
+    Container::size_type pos = b.size();
+    resize(pos + sizeof(Float));
+    Byte* dest = &b[pos];
+#ifdef ICE_BIG_ENDIAN
+    const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Float) - 1;
+    *dest++ = *src--;
+    *dest++ = *src--;
+    *dest++ = *src--;
+    *dest = *src;
+#else
+    const Byte* src = reinterpret_cast<const Byte*>(&v);
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest = *src;
+#endif
+}
+
+void
+Ice::OutputStream::write(const Float* begin, const Float* end)
+{
+    Int sz = static_cast<Int>(end - begin);
+    writeSize(sz);
+    if(sz > 0)
+    {
+        Container::size_type pos = b.size();
+        resize(pos + sz * sizeof(Float));
+#ifdef ICE_BIG_ENDIAN
+        const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Float) - 1;
+        Byte* dest = &(*(b.begin() + pos));
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            src += 2 * sizeof(Float);
+        }
+#else
+        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Float));
+#endif
+    }
+}
+
+void
+Ice::OutputStream::write(Double v)
+{
+    Container::size_type pos = b.size();
+    resize(pos + sizeof(Double));
+    Byte* dest = &b[pos];
+#ifdef ICE_BIG_ENDIAN
+    const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Double) - 1;
+    *dest++ = *src--;
+    *dest++ = *src--;
+    *dest++ = *src--;
+    *dest++ = *src--;
+    *dest++ = *src--;
+    *dest++ = *src--;
+    *dest++ = *src--;
+    *dest = *src;
+#else
+    const Byte* src = reinterpret_cast<const Byte*>(&v);
+#  if defined(ICE_LITTLEBYTE_BIGWORD)
+    dest[4] = *src++;
+    dest[5] = *src++;
+    dest[6] = *src++;
+    dest[7] = *src++;
+    dest[0] = *src++;
+    dest[1] = *src++;
+    dest[2] = *src++;
+    dest[3] = *src;
+#  else
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest++ = *src++;
+    *dest = *src;
+#  endif
+#endif
+}
+
+void
+Ice::OutputStream::write(const Double* begin, const Double* end)
+{
+    Int sz = static_cast<Int>(end - begin);
+    writeSize(sz);
+    if(sz > 0)
+    {
+        Container::size_type pos = b.size();
+        resize(pos + sz * sizeof(Double));
+#ifdef ICE_BIG_ENDIAN
+        const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Double) - 1;
+        Byte* dest = &(*(b.begin() + pos));
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            *dest++ = *src--;
+            src += 2 * sizeof(Double);
+        }
+#elif defined(ICE_LITTLEBYTE_BIGWORD)
+        const Byte* src = reinterpret_cast<const Byte*>(begin);
+        Byte* dest = &(*(b.begin() + pos));
+        for(int j = 0 ; j < sz ; ++j)
+        {
+            dest[4] = *src++;
+            dest[5] = *src++;
+            dest[6] = *src++;
+            dest[7] = *src++;
+            dest[0] = *src++;
+            dest[1] = *src++;
+            dest[2] = *src++;
+            dest[3] = *src++;
+            dest += sizeof(Double);
+        }
+#else
+        memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Double));
+#endif
+    }
+}
+
+//
+// NOTE: This member function is intentionally omitted in order to
+// cause a link error if it is used. This is for efficiency reasons:
+// writing a const char * requires a traversal of the string to get
+// the string length first, which takes O(n) time, whereas getting the
+// string length from a std::string takes constant time.
+//
+/*
+void
+Ice::OutputStream::write(const char*)
+{
+}
+*/
+
+void
+Ice::OutputStream::writeConverted(const char* vdata, size_t vsize)
+{
+    if(!_stringConverter)
+    {
+        throw MarshalException(__FILE__, __LINE__, "no string converter provided");
+    }
+
+    //
+    // What is the size of the resulting UTF-8 encoded string?
+    // Impossible to tell, so we guess. If we don't guess correctly,
+    // we'll have to fix the mistake afterwards
+    //
+    try
+    {
+        Int guessedSize = static_cast<Int>(vsize);
+        writeSize(guessedSize); // writeSize() only writes the size; it does not reserve any buffer space.
+
+        size_t firstIndex = b.size();
+        StreamUTF8BufferI buffer(*this);
+
+        Byte* lastByte = _stringConverter->toUTF8(vdata, vdata + vsize, buffer);
+        if(lastByte != b.end())
+        {
+            resize(lastByte - b.begin());
+        }
+        size_t lastIndex = b.size();
+
+        Int actualSize = static_cast<Int>(lastIndex - firstIndex);
+
+        //
+        // Check against the guess
+        //
+        if(guessedSize != actualSize)
+        {
+            if(guessedSize <= 254 && actualSize > 254)
+            {
+                //
+                // Move the UTF-8 sequence 4 bytes further
+                // Use memmove instead of memcpy since the source and destination typically overlap.
+                //
+                resize(b.size() + 4);
+                memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize);
+            }
+            else if(guessedSize > 254 && actualSize <= 254)
+            {
+                //
+                // Move the UTF-8 sequence 4 bytes back
+                //
+                memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize);
+                resize(b.size() - 4);
+            }
+
+            if(guessedSize <= 254)
+            {
+                rewriteSize(actualSize, b.begin() + firstIndex - 1);
+            }
+            else
+            {
+                rewriteSize(actualSize, b.begin() + firstIndex - 1 - 4);
+            }
+        }
+    }
+    catch(const IceUtil::IllegalConversionException& ex)
+    {
+        throw StringConversionException(__FILE__, __LINE__, ex.reason());
+    }
+}
+
+void
+Ice::OutputStream::write(const string* begin, const string* end, bool convert)
+{
+    Int sz = static_cast<Int>(end - begin);
+    writeSize(sz);
+    if(sz > 0)
+    {
+        for(int i = 0; i < sz; ++i)
+        {
+            write(begin[i], convert);
+        }
+    }
+}
+
+void
+Ice::OutputStream::write(const wstring& v)
+{
+    if(v.empty())
+    {
+        writeSize(0);
+        return;
+    }
+
+    if(!_wstringConverter)
+    {
+        throw MarshalException(__FILE__, __LINE__, "no wstring converter provided");
+    }
+
+    //
+    // What is the size of the resulting UTF-8 encoded string?
+    // Impossible to tell, so we guess. If we don't guess correctly,
+    // we'll have to fix the mistake afterwards
+    //
+    try
+    {
+        Int guessedSize = static_cast<Int>(v.size());
+        writeSize(guessedSize); // writeSize() only writes the size; it does not reserve any buffer space.
+
+        size_t firstIndex = b.size();
+        StreamUTF8BufferI buffer(*this);
+
+        Byte* lastByte = _wstringConverter->toUTF8(v.data(), v.data() + v.size(), buffer);
+        if(lastByte != b.end())
+        {
+            resize(lastByte - b.begin());
+        }
+        size_t lastIndex = b.size();
+
+        Int actualSize = static_cast<Int>(lastIndex - firstIndex);
+
+        //
+        // Check against the guess
+        //
+        if(guessedSize != actualSize)
+        {
+            if(guessedSize <= 254 && actualSize > 254)
+            {
+                //
+                // Move the UTF-8 sequence 4 bytes further
+                // Use memmove instead of memcpy since the source and destination typically overlap.
+                //
+                resize(b.size() + 4);
+                memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize);
+            }
+            else if(guessedSize > 254 && actualSize <= 254)
+            {
+                //
+                // Move the UTF-8 sequence 4 bytes back
+                //
+                memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize);
+                resize(b.size() - 4);
+            }
+
+            if(guessedSize <= 254)
+            {
+                rewriteSize(actualSize, b.begin() + firstIndex - 1);
+            }
+            else
+            {
+                rewriteSize(actualSize, b.begin() + firstIndex - 1 - 4);
+            }
+        }
+    }
+    catch(const IceUtil::IllegalConversionException& ex)
+    {
+        throw StringConversionException(__FILE__, __LINE__, ex.reason());
+    }
+}
+
+void
+Ice::OutputStream::write(const wstring* begin, const wstring* end)
+{
+    Int sz = static_cast<Int>(end - begin);
+    writeSize(sz);
+    if(sz > 0)
+    {
+        for(int i = 0; i < sz; ++i)
+        {
+            write(begin[i]);
+        }
+    }
+}
+
+void
+#ifdef ICE_CPP11_MAPPING
+Ice::OutputStream::writeProxy(const shared_ptr<ObjectPrx>& v)
+#else
+Ice::OutputStream::write(const ObjectPrx& v)
+#endif
+{
+    if(v)
+    {
+        v->__write(*this);
+    }
+    else
+    {
+        Identity ident;
+        write(ident);
+    }
+}
+
+void
+Ice::OutputStream::writeEnum(Int v, Int maxValue)
+{
+    if(getEncoding() == Encoding_1_0)
+    {
+        if(maxValue < 127)
+        {
+            write(static_cast<Byte>(v));
+        }
+        else if(maxValue < 32767)
+        {
+            write(static_cast<Short>(v));
+        }
+        else
+        {
+            write(v);
+        }
+    }
+    else
+    {
+        writeSize(v);
+    }
+}
+
+void
+Ice::OutputStream::writeException(const UserException& e)
+{
+    initEncaps();
+    _currentEncaps->encoder->write(e);
+}
+
+bool
+Ice::OutputStream::writeOptImpl(Int tag, OptionalFormat type)
+{
+    if(getEncoding() == Encoding_1_0)
+    {
+        return false; // Optional members aren't supported with the 1.0 encoding.
+    }
+
+    Byte v = static_cast<Byte>(type);
+    if(tag < 30)
+    {
+        v |= static_cast<Byte>(tag << 3);
+        write(v);
+    }
+    else
+    {
+        v |= 0xF0; // tag = 30
+        write(v);
+        writeSize(tag);
+    }
+    return true;
+}
+
+void
+Ice::OutputStream::finished(vector<Byte>& bytes)
+{
+    vector<Byte>(b.begin(), b.end()).swap(bytes);
+}
+
+pair<const Byte*, const Byte*>
+Ice::OutputStream::finished()
+{
+    if(b.empty())
+    {
+        return pair<const Byte*, const Byte*>(reinterpret_cast<Ice::Byte*>(0), reinterpret_cast<Ice::Byte*>(0));
+    }
+    else
+    {
+        return pair<const Byte*, const Byte*>(&b[0], &b[0] + b.size());
+    }
+}
+
+void
+Ice::OutputStream::throwEncapsulationException(const char* file, int line)
+{
+    throw EncapsulationException(file, line);
+}
+
+void
+Ice::OutputStream::initEncaps()
+{
+    if(!_currentEncaps) // Lazy initialization.
+    {
+        _currentEncaps = &_preAllocatedEncaps;
+        _currentEncaps->start = b.size();
+        _currentEncaps->encoding = _encoding;
+    }
+
+    if(_currentEncaps->format == Ice::DefaultFormat)
+    {
+        _currentEncaps->format = _format;
+    }
+
+    if(!_currentEncaps->encoder) // Lazy initialization.
+    {
+        if(_currentEncaps->encoding == Encoding_1_0)
+        {
+            _currentEncaps->encoder = new EncapsEncoder10(this, _currentEncaps);
+        }
+        else
+        {
+            _currentEncaps->encoder = new EncapsEncoder11(this, _currentEncaps);
+        }
+    }
+}
+
+Ice::OutputStream::EncapsEncoder::~EncapsEncoder()
+{
+    // Out of line to avoid weak vtable
+}
+
+Int
+Ice::OutputStream::EncapsEncoder::registerTypeId(const string& typeId)
+{
+    TypeIdMap::const_iterator p = _typeIdMap.find(typeId);
+    if(p != _typeIdMap.end())
+    {
+        return p->second;
+    }
+    else
+    {
+        _typeIdMap.insert(make_pair(typeId, ++_typeIdIndex));
+        return -1;
+    }
+}
+
+void
+Ice::OutputStream::EncapsEncoder10::write(const ValuePtr& v)
+{
+    //
+    // Object references are encoded as a negative integer in 1.0.
+    //
+    if(v)
+    {
+        _stream->write(-registerValue(v));
+    }
+    else
+    {
+        _stream->write(0);
+    }
+}
+
+void
+Ice::OutputStream::EncapsEncoder10::write(const UserException& v)
+{
+    //
+    // User exception with the 1.0 encoding start with a boolean
+    // flag that indicates whether or not the exception uses
+    // classes.
+    //
+    // This allows reading the pending instances even if some part of
+    // the exception was sliced.
+    //
+    bool usesClasses = v.__usesClasses();
+    _stream->write(usesClasses);
+    v.__write(_stream);
+    if(usesClasses)
+    {
+        writePendingValues();
+    }
+}
+
+void
+Ice::OutputStream::EncapsEncoder10::startInstance(SliceType sliceType, const SlicedDataPtr&)
+{
+    _sliceType = sliceType;
+}
+
+void
+Ice::OutputStream::EncapsEncoder10::endInstance()
+{
+    if(_sliceType == ValueSlice)
+    {
+        //
+        // Write the Object slice.
+        //
+        startSlice(Object::ice_staticId(), -1, true);
+        _stream->writeSize(0); // For compatibility with the old AFM.
+        endSlice();
+    }
+    _sliceType = NoSlice;
+}
+
+void
+Ice::OutputStream::EncapsEncoder10::startSlice(const string& typeId, int, bool /*last*/)
+{
+    //
+    // For instance slices, encode a boolean to indicate how the type ID
+    // is encoded and the type ID either as a string or index. For
+    // exception slices, always encode the type ID as a string.
+    //
+    if(_sliceType == ValueSlice)
+    {
+        Int index = registerTypeId(typeId);
+        if(index < 0)
+        {
+            _stream->write(false);
+            _stream->write(typeId, false);
+        }
+        else
+        {
+            _stream->write(true);
+            _stream->writeSize(index);
+        }
+    }
+    else
+    {
+        _stream->write(typeId, false);
+    }
+
+    _stream->write(Int(0)); // Placeholder for the slice length.
+
+    _writeSlice = _stream->b.size();
+}
+
+void
+Ice::OutputStream::EncapsEncoder10::endSlice()
+{
+    //
+    // Write the slice length.
+    //
+    Int sz = static_cast<Int>(_stream->b.size() - _writeSlice + sizeof(Int));
+    Byte* dest = &(*(_stream->b.begin() + _writeSlice - sizeof(Int)));
+    _stream->write(sz, dest);
+}
+
+void
+Ice::OutputStream::EncapsEncoder10::writePendingValues()
+{
+    while(!_toBeMarshaledMap.empty())
+    {
+        //
+        // Consider the to be marshalled instances as marshalled now,
+        // this is necessary to avoid adding again the "to be
+        // marshalled instances" into _toBeMarshaledMap while writing
+        // instances.
+        //
+        _marshaledMap.insert(_toBeMarshaledMap.begin(), _toBeMarshaledMap.end());
+
+        PtrToIndexMap savedMap;
+        savedMap.swap(_toBeMarshaledMap);
+        _stream->writeSize(static_cast<Int>(savedMap.size()));
+        for(PtrToIndexMap::iterator p = savedMap.begin(); p != savedMap.end(); ++p)
+        {
+            //
+            // Ask the instance to marshal itself. Any new class
+            // instances that are triggered by the classes marshaled
+            // are added to toBeMarshaledMap.
+            //
+            _stream->write(p->second);
+
+            try
+            {
+                p->first->ice_preMarshal();
+            }
+            catch(const std::exception& ex)
+            {
+                Warning out(_stream->instance()->initializationData().logger);
+                out << "std::exception raised by ice_preMarshal:\n" << ex;
+            }
+            catch(...)
+            {
+                Warning out(_stream->instance()->initializationData().logger);
+                out << "unknown exception raised by ice_preMarshal";
+            }
+
+            p->first->__write(_stream);
+        }
+    }
+    _stream->writeSize(0); // Zero marker indicates end of sequence of sequences of instances.
+}
+
+Int
+Ice::OutputStream::EncapsEncoder10::registerValue(const ValuePtr& v)
+{
+    assert(v);
+
+    //
+    // Look for this instance in the to-be-marshaled map.
+    //
+    PtrToIndexMap::const_iterator p = _toBeMarshaledMap.find(v);
+    if(p != _toBeMarshaledMap.end())
+    {
+        return p->second;
+    }
+
+    //
+    // Didn't find it, try the marshaled map next.
+    //
+    PtrToIndexMap::const_iterator q = _marshaledMap.find(v);
+    if(q != _marshaledMap.end())
+    {
+        return q->second;
+    }
+
+    //
+    // We haven't seen this instance previously, create a new
+    // index, and insert it into the to-be-marshaled map.
+    //
+    _toBeMarshaledMap.insert(make_pair(v, ++_valueIdIndex));
+    return _valueIdIndex;
+}
+
+void
+Ice::OutputStream::EncapsEncoder11::write(const ValuePtr& v)
+{
+    if(!v)
+    {
+        _stream->writeSize(0); // Nil reference.
+    }
+    else if(_current && _encaps->format == SlicedFormat)
+    {
+        //
+        // If writing an instance within a slice and using the sliced
+        // format, write an index from the instance indirection
+        // table. The indirect instance table is encoded at the end of
+        // each slice and is always read (even if the Slice is
+        // unknown).
+        //
+        PtrToIndexMap::const_iterator p = _current->indirectionMap.find(v);
+        if(p == _current->indirectionMap.end())
+        {
+            _current->indirectionTable.push_back(v);
+            Int idx = static_cast<Int>(_current->indirectionTable.size()); // Position + 1 (0 is reserved for nil)
+            _current->indirectionMap.insert(make_pair(v, idx));
+            _stream->writeSize(idx);
+        }
+        else
+        {
+            _stream->writeSize(p->second);
+        }
+    }
+    else
+    {
+        writeInstance(v); // Write the instance or a reference if already marshaled.
+    }
+}
+
+void
+Ice::OutputStream::EncapsEncoder11::write(const UserException& v)
+{
+    v.__write(_stream);
+}
+
+void
+Ice::OutputStream::EncapsEncoder11::startInstance(SliceType sliceType, const SlicedDataPtr& data)
+{
+    if(!_current)
+    {
+        _current = &_preAllocatedInstanceData;
+    }
+    else
+    {
+        _current = _current->next ? _current->next : new InstanceData(_current);
+    }
+    _current->sliceType = sliceType;
+    _current->firstSlice = true;
+
+    if(data)
+    {
+        writeSlicedData(data);
+    }
+}
+
+void
+Ice::OutputStream::EncapsEncoder11::endInstance()
+{
+    _current = _current->previous;
+}
+
+void
+Ice::OutputStream::EncapsEncoder11::startSlice(const string& typeId, int compactId, bool last)
+{
+    assert(_current->indirectionTable.empty() && _current->indirectionMap.empty());
+
+    _current->sliceFlagsPos = _stream->b.size();
+
+    _current->sliceFlags = 0;
+    if(_encaps->format == SlicedFormat)
+    {
+        _current->sliceFlags |= FLAG_HAS_SLICE_SIZE; // Encode the slice size if using the sliced format.
+    }
+    if(last)
+    {
+        _current->sliceFlags |= FLAG_IS_LAST_SLICE; // This is the last slice.
+    }
+
+    _stream->write(Byte(0)); // Placeholder for the slice flags
+
+    //
+    // For instance slices, encode the flag and the type ID either as a
+    // string or index. For exception slices, always encode the type
+    // ID a string.
+    //
+    if(_current->sliceType == ValueSlice)
+    {
+        //
+        // Encode the type ID (only in the first slice for the compact
+        // encoding).
+        //
+        if(_encaps->format == SlicedFormat || _current->firstSlice)
+        {
+            if(compactId >= 0)
+            {
+                _current->sliceFlags |= FLAG_HAS_TYPE_ID_COMPACT;
+                _stream->writeSize(compactId);
+            }
+            else
+            {
+                Int index = registerTypeId(typeId);
+                if(index < 0)
+                {
+                    _current->sliceFlags |= FLAG_HAS_TYPE_ID_STRING;
+                    _stream->write(typeId, false);
+                }
+                else
+                {
+                    _current->sliceFlags |= FLAG_HAS_TYPE_ID_INDEX;
+                    _stream->writeSize(index);
+                }
+            }
+        }
+    }
+    else
+    {
+        _stream->write(typeId, false);
+    }
+
+    if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE)
+    {
+        _stream->write(Int(0)); // Placeholder for the slice length.
+    }
+
+    _current->writeSlice = _stream->b.size();
+    _current->firstSlice = false;
+}
+
+void
+Ice::OutputStream::EncapsEncoder11::endSlice()
+{
+    //
+    // Write the optional member end marker if some optional members
+    // were encoded. Note that the optional members are encoded before
+    // the indirection table and are included in the slice size.
+    //
+    if(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS)
+    {
+        _stream->write(OPTIONAL_END_MARKER);
+    }
+
+    //
+    // Write the slice length if necessary.
+    //
+    if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE)
+    {
+        Int sz = static_cast<Int>(_stream->b.size() - _current->writeSlice + sizeof(Int));
+        Byte* dest = &(*(_stream->b.begin() + _current->writeSlice - sizeof(Int)));
+        _stream->write(sz, dest);
+    }
+
+    //
+    // Only write the indirection table if it contains entries.
+    //
+    if(!_current->indirectionTable.empty())
+    {
+        assert(_encaps->format == SlicedFormat);
+        _current->sliceFlags |= FLAG_HAS_INDIRECTION_TABLE;
+
+        //
+        // Write the indirect instance table.
+        //
+        _stream->writeSize(static_cast<Int>(_current->indirectionTable.size()));
+        ValueList::const_iterator p;
+        for(p = _current->indirectionTable.begin(); p != _current->indirectionTable.end(); ++p)
+        {
+            writeInstance(*p);
+        }
+        _current->indirectionTable.clear();
+        _current->indirectionMap.clear();
+    }
+
+    //
+    // Finally, update the slice flags.
+    //
+    Byte* dest = &(*(_stream->b.begin() + _current->sliceFlagsPos));
+    *dest = _current->sliceFlags;
+}
+
+bool
+Ice::OutputStream::EncapsEncoder11::writeOptional(Ice::Int tag, Ice::OptionalFormat format)
+{
+    if(!_current)
+    {
+        return _stream->writeOptImpl(tag, format);
+    }
+    else
+    {
+        if(_stream->writeOptImpl(tag, format))
+        {
+            _current->sliceFlags |= FLAG_HAS_OPTIONAL_MEMBERS;
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+}
+
+void
+Ice::OutputStream::EncapsEncoder11::writeSlicedData(const SlicedDataPtr& slicedData)
+{
+    assert(slicedData);
+
+    //
+    // We only remarshal preserved slices if we are using the sliced
+    // format. Otherwise, we ignore the preserved slices, which
+    // essentially "slices" the instance into the most-derived type
+    // known by the sender.
+    //
+    if(_encaps->format != SlicedFormat)
+    {
+        return;
+    }
+
+    for(SliceInfoSeq::const_iterator p = slicedData->slices.begin(); p != slicedData->slices.end(); ++p)
+    {
+        startSlice((*p)->typeId, (*p)->compactId, (*p)->isLastSlice);
+
+        //
+        // Write the bytes associated with this slice.
+        //
+        _stream->writeBlob((*p)->bytes);
+
+        if((*p)->hasOptionalMembers)
+        {
+            _current->sliceFlags |= FLAG_HAS_OPTIONAL_MEMBERS;
+        }
+
+        //
+        // Make sure to also re-write the instance indirection table.
+        //
+        _current->indirectionTable = (*p)->instances;
+
+        endSlice();
+    }
+}
+
+void
+Ice::OutputStream::EncapsEncoder11::writeInstance(const ValuePtr& v)
+{
+    assert(v);
+
+    //
+    // If the instance was already marshaled, just write it's ID.
+    //
+    PtrToIndexMap::const_iterator q = _marshaledMap.find(v);
+    if(q != _marshaledMap.end())
+    {
+        _stream->writeSize(q->second);
+        return;
+    }
+
+    //
+    // We haven't seen this instance previously, create a new ID,
+    // insert it into the marshaled map, and write the instance.
+    //
+    _marshaledMap.insert(make_pair(v, ++_valueIdIndex));
+
+    try
+    {
+        v->ice_preMarshal();
+    }
+    catch(const std::exception& ex)
+    {
+        Warning out(_stream->instance()->initializationData().logger);
+        out << "std::exception raised by ice_preMarshal:\n" << ex;
+    }
+    catch(...)
+    {
+        Warning out(_stream->instance()->initializationData().logger);
+        out << "unknown exception raised by ice_preMarshal";
+    }
+
+    _stream->writeSize(1); // Object instance marker.
+    v->__write(_stream);
+}
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index 2152d955cbd..090bbd593cc 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -25,7 +25,7 @@ const char * const Ice::PluginManagerI::_kindOfObject = "plugin";
 namespace
 {
 
-map<string, PLUGIN_FACTORY>* factories = 0;
+map<string, PluginFactory>* factories = 0;
 vector<string>* loadOnInitialization = 0;
 
 class PluginFactoryDestroy
@@ -46,14 +46,14 @@ PluginFactoryDestroy destroy;
 }
 
 void
-Ice::PluginManagerI::registerPluginFactory(const std::string& name, PLUGIN_FACTORY factory, bool loadOnInit)
+Ice::PluginManagerI::registerPluginFactory(const std::string& name, PluginFactory factory, bool loadOnInit)
 {
     if(factories == 0)
     {
-        factories = new map<string, PLUGIN_FACTORY>();
+        factories = new map<string, PluginFactory>();
     }
 
-    map<string, PLUGIN_FACTORY>::const_iterator p = factories->find(name);
+    map<string, PluginFactory>::const_iterator p = factories->find(name);
     if(p == factories->end())
     {
         factories->insert(make_pair(name, factory));
@@ -440,8 +440,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
         cmdArgs = properties->parseCommandLineOptions(name, cmdArgs);
     }
 
-    PluginPtr plugin;
-    PLUGIN_FACTORY factory = 0;
+    PluginFactory factory = 0;
     DynamicLibraryPtr library;
 
     //
@@ -451,7 +450,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
     //
     if(factories)
     {
-        map<string, PLUGIN_FACTORY>::const_iterator p = factories->find(name);
+        map<string, PluginFactory>::const_iterator p = factories->find(name);
         if(p != factories->end())
         {
             factory = p->second;
@@ -480,19 +479,20 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
             ex.reason = out.str();
             throw ex;
         }
+
 #ifdef __IBMCPP__
-	// xlC warns when casting a void* to function pointer
-#pragma report(disable, "1540-0216")
+    // xlC warns when casting a void* to function pointer
+#   pragma report(disable, "1540-0216")
 #endif
 
-        factory = reinterpret_cast<PLUGIN_FACTORY>(sym);
+        factory = reinterpret_cast<PluginFactory>(sym);
     }
 
     //
     // Invoke the factory function. No exceptions can be raised
     // by the factory function because it's declared extern "C".
     //
-    plugin = factory(_communicator, name, args);
+    PluginPtr plugin(factory(_communicator, name, args));
     if(!plugin)
     {
         PluginInitializationException e(__FILE__, __LINE__);
diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h
index 27da4f77c2c..b803c4312ee 100644
--- a/cpp/src/Ice/PluginManagerI.h
+++ b/cpp/src/Ice/PluginManagerI.h
@@ -21,23 +21,23 @@
 namespace Ice
 {
 
-typedef Ice::Plugin* (*PLUGIN_FACTORY)(const ::Ice::CommunicatorPtr&, const std::string&, const ::Ice::StringSeq&);
+typedef Ice::Plugin* (*PluginFactory)(const ::Ice::CommunicatorPtr&, const std::string&, const ::Ice::StringSeq&);
 
 class PluginManagerI : public PluginManager, public IceUtil::Mutex
 {
 public:
 
-    static void registerPluginFactory(const std::string&, PLUGIN_FACTORY, bool);
+    static void registerPluginFactory(const std::string&, PluginFactory, bool);
 
     virtual void initializePlugins();
     virtual StringSeq getPlugins();
     virtual PluginPtr getPlugin(const std::string&);
     virtual void addPlugin(const std::string&, const PluginPtr&);
     virtual void destroy();
+    PluginManagerI(const CommunicatorPtr&, const IceInternal::DynamicLibraryListPtr&);
 
 private:
 
-    PluginManagerI(const CommunicatorPtr&, const IceInternal::DynamicLibraryListPtr&);
     friend class IceInternal::Instance;
 
     void loadPlugins(int&, char*[]);
diff --git a/cpp/src/Ice/PropertiesAdminI.cpp b/cpp/src/Ice/PropertiesAdminI.cpp
index 32b71b80f39..a7e6174c79c 100644
--- a/cpp/src/Ice/PropertiesAdminI.cpp
+++ b/cpp/src/Ice/PropertiesAdminI.cpp
@@ -21,6 +21,16 @@ const char* traceCategory = "Admin.Properties";
 
 }
 
+PropertiesAdminUpdateCallback::~PropertiesAdminUpdateCallback()
+{
+    // Out of line to avoid weak vtable
+}
+
+NativePropertiesAdmin::~NativePropertiesAdmin()
+{
+    // Out of line to avoid weak vtable
+}
+
 namespace IceInternal
 {
 
@@ -30,22 +40,37 @@ PropertiesAdminI::PropertiesAdminI(const PropertiesPtr& properties, const Logger
 }
 
 string
+#ifdef ICE_CPP11_MAPPING
+PropertiesAdminI::getProperty(string name, const Current&)
+#else
 PropertiesAdminI::getProperty(const string& name, const Current&)
+#endif
 {
     Lock sync(*this);
     return _properties->getProperty(name);
 }
 
 PropertyDict
+#ifdef ICE_CPP11_MAPPING
+PropertiesAdminI::getPropertiesForPrefix(string prefix, const Current&)
+#else
 PropertiesAdminI::getPropertiesForPrefix(const string& prefix, const Current&)
+#endif
 {
     Lock sync(*this);
     return _properties->getPropertiesForPrefix(prefix);
 }
 
 void
+#ifdef ICE_CPP11_MAPPING
+PropertiesAdminI::setPropertiesAsync(PropertyDict props,
+                                     function<void()> response,
+                                     function<void(exception_ptr)>,
+                                     const Current&)
+#else
 PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setPropertiesPtr& cb, const PropertyDict& props,
-                                           const Current&)
+                                      const Current&)
+#endif
 {
     Lock sync(*this);
 
@@ -164,7 +189,11 @@ PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setPropertiesPtr
     // Send the response now so that we do not block the client during
     // the call to the update callback.
     //
+#ifdef ICE_CPP11_MAPPING
+    response();
+#else
     cb->ice_response();
+#endif
 
     //
     // Copy the callbacks to allow callbacks to update the callbacks.
diff --git a/cpp/src/Ice/PropertiesAdminI.h b/cpp/src/Ice/PropertiesAdminI.h
index fae88cf71c3..6e852c7b583 100644
--- a/cpp/src/Ice/PropertiesAdminI.h
+++ b/cpp/src/Ice/PropertiesAdminI.h
@@ -25,9 +25,18 @@ public:
 
     PropertiesAdminI(const Ice::PropertiesPtr&, const Ice::LoggerPtr&);
 
+#ifdef ICE_CPP11_MAPPING
+    virtual std::string getProperty(std::string, const Ice::Current&);
+    virtual Ice::PropertyDict getPropertiesForPrefix(std::string, const Ice::Current&);
+    virtual void setPropertiesAsync(::Ice::PropertyDict,
+                                    ::std::function<void()>,
+                                    ::std::function<void(::std::exception_ptr)>,
+                                    const Ice::Current&);
+#else
     virtual std::string getProperty(const std::string&, const Ice::Current&);
     virtual Ice::PropertyDict getPropertiesForPrefix(const std::string&, const Ice::Current&);
     virtual void setProperties_async(const Ice::AMD_PropertiesAdmin_setPropertiesPtr&, const Ice::PropertyDict&, const Ice::Current&);
+#endif
 
     virtual void addUpdateCallback(const Ice::PropertiesAdminUpdateCallbackPtr&);
     virtual void removeUpdateCallback(const Ice::PropertiesAdminUpdateCallbackPtr&);
@@ -38,7 +47,7 @@ private:
     const Ice::LoggerPtr _logger;
     std::vector<Ice::PropertiesAdminUpdateCallbackPtr> _updateCallbacks;
 };
-typedef IceUtil::Handle<PropertiesAdminI> PropertiesAdminIPtr;
+ICE_DEFINE_PTR(PropertiesAdminIPtr, PropertiesAdminI);
 
 }
 
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index b200f231b98..1f03133ddf3 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -435,7 +435,7 @@ PropertiesPtr
 Ice::PropertiesI::clone()
 {
     IceUtil::Mutex::Lock sync(*this);
-    return new PropertiesI(this);
+    return ICE_MAKE_SHARED(PropertiesI, this);
 }
 
 set<string>
diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h
index 764aaa44554..592c564ed05 100644
--- a/cpp/src/Ice/PropertiesI.h
+++ b/cpp/src/Ice/PropertiesI.h
@@ -19,10 +19,11 @@
 namespace Ice
 {
 
-class PropertiesI : public Properties, public IceUtil::Mutex
+class PropertiesI : public Properties,
+                    public IceUtil::Mutex
 {
 public:
-    
+
     virtual std::string getProperty(const std::string&);
     virtual std::string getPropertyWithDefault(const std::string&, const std::string&);
     virtual Ice::Int getPropertyAsInt(const std::string&);
@@ -40,10 +41,11 @@ public:
 
     std::set<std::string> getUnusedProperties();
 
+    PropertiesI(const PropertiesI*);
+    
 private:
     PropertiesI(const IceUtil::StringConverterPtr&);
     PropertiesI(StringSeq&, const PropertiesPtr&, const IceUtil::StringConverterPtr&);
-    PropertiesI(const PropertiesI*);
 
     friend ICE_API PropertiesPtr createProperties();
     friend ICE_API PropertiesPtr createProperties(StringSeq&, const PropertiesPtr&);
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index e4f02285b90..f0ea3285ed6 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jul  1 19:08:40 2016
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jul  1 19:50:59 2016
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -728,7 +728,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Client.ThreadPool.ThreadPriority", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.MessageSizeMax", false, 0),
     IceInternal::Property("IceGrid.Registry.CryptPasswords", false, 0),
-    IceInternal::Property("IceGrid.Registry.Data", false, 0),
     IceInternal::Property("IceGrid.Registry.DefaultTemplates", false, 0),
     IceInternal::Property("IceGrid.Registry.Discovery.ACM.Timeout", false, 0),
     IceInternal::Property("IceGrid.Registry.Discovery.ACM.Heartbeat", false, 0),
@@ -809,6 +808,8 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.ThreadIdleTime", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.ThreadPriority", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.MessageSizeMax", false, 0),
+    IceInternal::Property("IceGrid.Registry.LMDB.MapSize", false, 0),
+    IceInternal::Property("IceGrid.Registry.LMDB.Path", false, 0),
     IceInternal::Property("IceGrid.Registry.NodeSessionTimeout", false, 0),
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier.EndpointSelection", false, 0),
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier.ConnectionCached", false, 0),
@@ -923,13 +924,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Trace.Topic", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.TopicManager", false, 0),
     IceInternal::Property("IceGrid.Registry.UserAccounts", false, 0),
-    IceInternal::Property("IceGrid.SQL.DatabaseType", false, 0),
-    IceInternal::Property("IceGrid.SQL.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.SQL.HostName", false, 0),
-    IceInternal::Property("IceGrid.SQL.Port", false, 0),
-    IceInternal::Property("IceGrid.SQL.DatabaseName", false, 0),
-    IceInternal::Property("IceGrid.SQL.UserName", false, 0),
-    IceInternal::Property("IceGrid.SQL.Password", false, 0),
 };
 
 const IceInternal::PropertyArray
@@ -1061,6 +1055,16 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceStormAdminProps(IceStormAdminPropsData,
                                                 sizeof(IceStormAdminPropsData)/sizeof(IceStormAdminPropsData[0]));
 
+const IceInternal::Property IceBTPropsData[] = 
+{
+    IceInternal::Property("IceBT.RcvSize", false, 0),
+    IceInternal::Property("IceBT.SndSize", false, 0),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::IceBTProps(IceBTPropsData,
+                                                sizeof(IceBTPropsData)/sizeof(IceBTPropsData[0]));
+
 const IceInternal::Property Glacier2PropsData[] = 
 {
     IceInternal::Property("Glacier2.AddConnectionContext", false, 0),
@@ -1270,6 +1274,7 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] =
     IcePatch2ClientProps,
     IceSSLProps,
     IceStormAdminProps,
+    IceBTProps,
     Glacier2Props,
     Glacier2CryptPermissionsVerifierProps,
     FreezeProps,
@@ -1291,6 +1296,7 @@ const char* IceInternal::PropertyNames::clPropNames[] =
     "IcePatch2Client",
     "IceSSL",
     "IceStormAdmin",
+    "IceBT",
     "Glacier2",
     "Glacier2CryptPermissionsVerifier",
     "Freeze",
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 151097655fc..f73b3a5192b 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jul  1 19:08:40 2016
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jul  1 19:50:59 2016
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -68,6 +68,7 @@ public:
     static const PropertyArray IcePatch2ClientProps;
     static const PropertyArray IceSSLProps;
     static const PropertyArray IceStormAdminProps;
+    static const PropertyArray IceBTProps;
     static const PropertyArray Glacier2Props;
     static const PropertyArray Glacier2CryptPermissionsVerifierProps;
     static const PropertyArray FreezeProps;
diff --git a/cpp/src/Ice/Protocol.cpp b/cpp/src/Ice/Protocol.cpp
index 27a074830c5..dd7e737fc91 100644
--- a/cpp/src/Ice/Protocol.cpp
+++ b/cpp/src/Ice/Protocol.cpp
@@ -121,11 +121,11 @@ namespace Ice
 
 const EncodingVersion currentEncoding = { IceInternal::encodingMajor, IceInternal::encodingMinor };
 const ProtocolVersion currentProtocol = { IceInternal::protocolMajor, IceInternal::protocolMinor };
-
 //
 // The encoding to use for protocol messages, this version is tied to
 // the protocol version.
 //
+
 const EncodingVersion currentProtocolEncoding = { IceInternal::protocolEncodingMajor,
                                                   IceInternal::protocolEncodingMinor };
 
diff --git a/cpp/src/Ice/ProtocolInstance.cpp b/cpp/src/Ice/ProtocolInstance.cpp
index c0f84c32682..ff34eb018ad 100644
--- a/cpp/src/Ice/ProtocolInstance.cpp
+++ b/cpp/src/Ice/ProtocolInstance.cpp
@@ -20,6 +20,11 @@ using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(ProtocolInstance* p) { return p; }
 
+IceInternal::ProtocolInstance::~ProtocolInstance()
+{
+    // Out of line to avoid weak vtable
+}
+
 IceInternal::ProtocolInstance::ProtocolInstance(const CommunicatorPtr& com, Short type, const string& protocol,
                                                  bool secure) :
     _instance(getInstance(com)),
@@ -44,6 +49,30 @@ IceInternal::ProtocolInstance::ProtocolInstance(const InstancePtr& instance, Sho
 {
 }
 
+const LoggerPtr&
+IceInternal::ProtocolInstance::logger() const
+{
+    return _instance->initializationData().logger;
+}
+
+BufSizeWarnInfo
+IceInternal::ProtocolInstance::getBufSizeWarn(Short type)
+{
+    return _instance->getBufSizeWarn(type);
+}
+
+void
+IceInternal::ProtocolInstance::setSndBufSizeWarn(Short type, int size)
+{
+    _instance->setSndBufSizeWarn(type, size);
+}
+
+void
+IceInternal::ProtocolInstance::setRcvBufSizeWarn(Short type, int size)
+{
+    _instance->setRcvBufSizeWarn(type, size);
+}
+
 bool
 IceInternal::ProtocolInstance::preferIPv6() const
 {
diff --git a/cpp/src/Ice/ProtocolInstance.h b/cpp/src/Ice/ProtocolInstance.h
index 6f6120f09b7..0fce9e8b121 100644
--- a/cpp/src/Ice/ProtocolInstance.h
+++ b/cpp/src/Ice/ProtocolInstance.h
@@ -27,6 +27,8 @@ class ICE_API ProtocolInstance : public IceUtil::Shared
 {
 public:
 
+    virtual ~ProtocolInstance();
+
     ProtocolInstance(const Ice::CommunicatorPtr&, Ice::Short, const std::string&, bool);
 
     int traceLevel() const
@@ -39,10 +41,7 @@ public:
         return _traceCategory;
     }
 
-    const Ice::LoggerPtr& logger() const
-    {
-        return _instance->initializationData().logger;
-    }
+    const Ice::LoggerPtr& logger() const;
 
     const std::string& protocol() const
     {
@@ -64,21 +63,9 @@ public:
         return _secure;
     }
 
-    BufSizeWarnInfo getBufSizeWarn(Ice::Short type)
-    {
-        return _instance->getBufSizeWarn(type);
-    }
-
-    void setSndBufSizeWarn(Ice::Short type, int size)
-    {
-        _instance->setSndBufSizeWarn(type, size);
-    }
-
-    void setRcvBufSizeWarn(Ice::Short type, int size)
-    {
-        _instance->setRcvBufSizeWarn(type, size);
-    }
-
+    BufSizeWarnInfo getBufSizeWarn(Ice::Short type);
+    void setSndBufSizeWarn(Ice::Short type, int size);
+    void setRcvBufSizeWarn(Ice::Short type, int size);
     bool preferIPv6() const;
     ProtocolSupport protocolSupport() const;
     const std::string& defaultHost() const;
diff --git a/cpp/src/Ice/ProtocolPluginFacade.cpp b/cpp/src/Ice/ProtocolPluginFacade.cpp
index 545b588c602..657764923aa 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.cpp
+++ b/cpp/src/Ice/ProtocolPluginFacade.cpp
@@ -20,6 +20,11 @@ using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(ProtocolPluginFacade* p) { return p; }
 
+IceInternal::ProtocolPluginFacade::~ProtocolPluginFacade()
+{
+    // Out of line to avoid weak vtable
+}
+
 ProtocolPluginFacadePtr
 IceInternal::getProtocolPluginFacade(const CommunicatorPtr& communicator)
 {
diff --git a/cpp/src/Ice/ProtocolPluginFacade.h b/cpp/src/Ice/ProtocolPluginFacade.h
index 3da47418f6c..d8f7ac2965f 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.h
+++ b/cpp/src/Ice/ProtocolPluginFacade.h
@@ -36,6 +36,8 @@ class ICE_API ProtocolPluginFacade : public ::IceUtil::Shared
 {
 public:
 
+    virtual ~ProtocolPluginFacade();
+
     //
     // Get the Communicator instance with which this facade is
     // associated.
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index f69594a8cc4..e2cc8a9b6e3 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -19,16 +19,23 @@
 #include <Ice/Instance.h>
 #include <Ice/RouterInfo.h>
 #include <Ice/LocatorInfo.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/LocalException.h>
 #include <Ice/ConnectionI.h> // To convert from ConnectionIPtr to ConnectionPtr in ice_getConnection().
-#include <Ice/Stream.h>
 #include <Ice/ImplicitContextI.h>
 
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+namespace Ice
+{
+
+const Context noExplicitContext;
+
+}
+
 namespace
 {
 
@@ -42,98 +49,111 @@ const string ice_flushBatchRequests_name = "ice_flushBatchRequests";
 
 }
 
-::Ice::ObjectPrx
-IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f, const string& typeId, const Context* context)
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+bool
+Ice::ObjectPrx::operator==(const ObjectPrx& r) const
 {
-    if(b)
-    {
-        ObjectPrx bb = b->ice_facet(f);
-        try
-        {
-            if(context == 0 ? bb->ice_isA(typeId) : bb->ice_isA(typeId, *context))
-            {
-                return bb;
-            }
-#ifndef NDEBUG
-            else
-            {
-                assert(typeId != "::Ice::Object");
-            }
-#endif
-        }
-        catch(const FacetNotExistException&)
-        {
-        }
-    }
-    return 0;
+    return _reference == r._reference;
 }
 
-#ifdef ICE_CPP11
+bool
+Ice::ObjectPrx::operator!=(const ObjectPrx& r) const
+{
+    return _reference != r._reference;
+}
 
-IceInternal::Cpp11FnCallbackNC::Cpp11FnCallbackNC(const ::std::function<void (const ::Ice::Exception&)>& excb,
-                                                  const ::std::function<void (bool)>& sentcb) :
-    _exception(excb),
-    _sent(sentcb)
+bool
+Ice::ObjectPrx::operator<(const ObjectPrx& r) const
 {
+    return _reference < r._reference;
 }
 
-IceInternal::CallbackBasePtr
-IceInternal::Cpp11FnCallbackNC::verify(const ::Ice::LocalObjectPtr&)
+void
+Ice::ObjectPrx::__ice_isA(const shared_ptr<IceInternal::OutgoingAsyncT<bool>>& outAsync,
+                          const string& typeId,
+                          const Context& ctx)
 {
-    return this;
+    __checkAsyncTwowayOnly(ice_isA_name);
+    outAsync->invoke(ice_isA_name, OperationMode::Nonmutating, DefaultFormat, ctx,
+                     [&](Ice::OutputStream* os)
+                     {
+                         os->write(typeId, false);
+                     },
+                     nullptr);
 }
 
 void
-IceInternal::Cpp11FnCallbackNC::sent(const ::Ice::AsyncResultPtr& result) const
+Ice::ObjectPrx::__ice_ping(const shared_ptr<IceInternal::OutgoingAsyncT<void>>& outAsync, const Context& ctx)
 {
-    if(_sent != nullptr)
-    {
-        _sent(result->sentSynchronously());
-    }
+    outAsync->invoke(ice_ping_name, OperationMode::Nonmutating, DefaultFormat, ctx, nullptr, nullptr);
 }
 
-bool
-IceInternal::Cpp11FnCallbackNC::hasSentCallback() const
+void
+Ice::ObjectPrx::__ice_ids(const shared_ptr<IceInternal::OutgoingAsyncT<vector<string>>>& outAsync, const Context& ctx)
 {
-    return _sent != nullptr;
+    __checkAsyncTwowayOnly(ice_ids_name);
+    outAsync->invoke(ice_ids_name, OperationMode::Nonmutating, DefaultFormat, ctx, nullptr, nullptr);
 }
 
 void
-IceInternal::Cpp11FnCallbackNC::exception(const ::Ice::AsyncResultPtr&, const ::Ice::Exception& ex) const
+Ice::ObjectPrx::__ice_id(const shared_ptr<IceInternal::OutgoingAsyncT<string>>& outAsync, const Context& ctx)
 {
-    if(_exception != nullptr)
-    {
-        _exception(ex);
-    }
+    __checkAsyncTwowayOnly(ice_id_name);
+    outAsync->invoke(ice_id_name, OperationMode::Nonmutating, DefaultFormat, ctx, nullptr, nullptr);
 }
 
-IceInternal::Cpp11FnOnewayCallbackNC::Cpp11FnOnewayCallbackNC(const ::std::function<void ()>& cb,
-                                                              const ::std::function<void (const ::Ice::Exception&)>& excb,
-                                                              const ::std::function<void (bool)>& sentcb) :
-    Cpp11FnCallbackNC(excb, sentcb),
-    _cb(cb)
+void
+Ice::ObjectPrx::__ice_getConnection(const shared_ptr<IceInternal::ProxyGetConnection>& outAsync)
 {
-    CallbackBase::checkCallback(true, cb || excb != nullptr);
+    outAsync->invoke(ice_getConnection_name);
 }
 
 void
-IceInternal::Cpp11FnOnewayCallbackNC::completed(const ::Ice::AsyncResultPtr& result) const
+Ice::ObjectPrx::__ice_flushBatchRequests(const shared_ptr<IceInternal::ProxyFlushBatchAsync>& outAsync)
 {
-    try
-    {
-        result->getProxy()->__end(result, result->getOperation());
-    }
-    catch(const ::Ice::Exception& ex)
-    {
-        Cpp11FnCallbackNC::exception(result, ex);
-        return;
-    }
-    if(_cb != nullptr)
+    outAsync->invoke(ice_flushBatchRequests_name);
+}
+
+shared_ptr<ObjectPrx>
+Ice::ObjectPrx::__newInstance() const
+{
+    return createProxy<ObjectPrx>();
+}
+
+ostream&
+Ice::operator<<(ostream& os, const Ice::ObjectPrx& p)
+{
+    return os << p.ice_toString();
+}
+
+#else // C++98 mapping
+
+::Ice::ObjectPrxPtr
+IceInternal::checkedCastImpl(const ObjectPrxPtr& b, const string& f, const string& typeId, const Context& context)
+{
+    if(b != ICE_NULLPTR)
     {
-        _cb();
+        ObjectPrxPtr bb = b->ice_facet(f);
+        try
+        {
+            if(bb->ice_isA(typeId, context))
+            {
+                return bb;
+            }
+#ifndef NDEBUG
+            else
+            {
+                assert(typeId != "::Ice::Object");
+            }
+#endif
+        }
+        catch(const FacetNotExistException&)
+        {
+        }
     }
+    return ICE_NULLPTR;
 }
-#endif
 
 bool
 IceProxy::Ice::Object::operator==(const Object& r) const
@@ -153,32 +173,14 @@ IceProxy::Ice::Object::operator<(const Object& r) const
     return _reference < r._reference;
 }
 
-CommunicatorPtr
-IceProxy::Ice::Object::ice_getCommunicator() const
-{
-    return _reference->getCommunicator();
-}
-
-string
-IceProxy::Ice::Object::ice_toString() const
-{
-    //
-    // Returns the stringified proxy. There's no need to convert the
-    // string to a native string: a stringified proxy only contains
-    // printable ASCII which is a subset of all native character sets.
-    //
-    return _reference->toString();
-}
-
-
 bool
-IceProxy::Ice::Object::ice_isA(const string& typeId, const Context* context)
+IceProxy::Ice::Object::ice_isA(const string& typeId, const Context& context)
 {
     __checkTwowayOnly(ice_isA_name);
     Outgoing __og(this, ice_isA_name, ::Ice::Nonmutating, context);
     try
     {
-        BasicStream* __os = __og.startWriteParams(DefaultFormat);
+        OutputStream* __os = __og.startWriteParams(DefaultFormat);
         __os->write(typeId, false);
         __og.endWriteParams();
     }
@@ -194,31 +196,31 @@ IceProxy::Ice::Object::ice_isA(const string& typeId, const Context* context)
         }
         catch(const ::Ice::UserException& __ex)
         {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_id());
         }
     }
     bool __ret;
-    BasicStream* __is = __og.startReadParams();
+    InputStream* __is = __og.startReadParams();
     __is->read(__ret);
     __og.endReadParams();
     return __ret;
 }
 
 Ice::AsyncResultPtr
-IceProxy::Ice::Object::begin_ice_isA(const string& typeId,
-                                     const Context* ctx,
-                                     const ::IceInternal::CallbackBasePtr& del,
-                                     const ::Ice::LocalObjectPtr& cookie)
+IceProxy::Ice::Object::__begin_ice_isA(const string& typeId,
+                                       const Context& ctx,
+                                       const ::IceInternal::CallbackBasePtr& del,
+                                       const ::Ice::LocalObjectPtr& cookie)
 {
     __checkAsyncTwowayOnly(ice_isA_name);
-    OutgoingAsyncPtr __result = new OutgoingAsync(this, ice_isA_name, del, cookie);
+    OutgoingAsyncPtr __result = new CallbackOutgoing(this, ice_isA_name, del, cookie);
     try
     {
         __result->prepare(ice_isA_name, Nonmutating, ctx);
-        IceInternal::BasicStream* __os = __result->startWriteParams(DefaultFormat);
+        ::Ice::OutputStream* __os = __result->startWriteParams(DefaultFormat);
         __os->write(typeId);
         __result->endWriteParams();
-        __result->invoke();
+        __result->invoke(ice_isA_name);
     }
     catch(const Exception& __ex)
     {
@@ -227,293 +229,6 @@ IceProxy::Ice::Object::begin_ice_isA(const string& typeId,
     return __result;
 }
 
-#ifdef ICE_CPP11
-
-Ice::AsyncResultPtr
-IceProxy::Ice::Object::__begin_ice_isA(const ::std::string& typeId,
-                                       const ::Ice::Context* ctx,
-                                       const ::IceInternal::Function<void (bool)>& response,
-                                       const ::IceInternal::Function<void (const ::Ice::Exception&)>& exception,
-                                       const ::IceInternal::Function<void (bool)>& sent)
-{
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
-
-        Cpp11CB(const ::std::function<void (bool)>& responseFunc,
-                const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc,
-                const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
-
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            ::Ice::ObjectPrx __proxy = ::Ice::ObjectPrx::uncheckedCast(__result->getProxy());
-            bool __ret;
-            try
-            {
-                __ret = __proxy->end_ice_isA(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response(__ret);
-            }
-        }
-
-    private:
-
-        ::std::function<void (bool)> _response;
-    };
-
-    return begin_ice_isA(typeId, ctx, new Cpp11CB(response, exception, sent), 0);
-}
-
-Ice::AsyncResultPtr
-IceProxy::Ice::Object::__begin_ice_id(const ::Ice::Context* ctx,
-                                      const ::IceInternal::Function<void (const ::std::string&)>& response,
-                                      const ::IceInternal::Function<void (const ::Ice::Exception&)>& exception,
-                                      const ::IceInternal::Function<void (bool)>& sent)
-{
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
-
-        Cpp11CB(const ::std::function<void (const ::std::string&)>& responseFunc,
-                const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc,
-                const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
-
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            ::Ice::ObjectPrx __proxy = ::Ice::ObjectPrx::uncheckedCast(__result->getProxy());
-            ::std::string __ret;
-            try
-            {
-                __ret = __proxy->end_ice_id(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response(__ret);
-            }
-        }
-
-    private:
-
-        ::std::function<void (const ::std::string&)> _response;
-    };
-    return begin_ice_id(ctx, new Cpp11CB(response, exception, sent), 0);
-}
-
-Ice::AsyncResultPtr
-IceProxy::Ice::Object::__begin_ice_ids(
-    const ::Ice::Context* ctx,
-    const ::IceInternal::Function<void (const ::std::vector< ::std::string>&)>& response,
-    const ::IceInternal::Function<void (const ::Ice::Exception&)>& exception,
-    const ::IceInternal::Function<void (bool)>& sent)
-{
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
-
-        Cpp11CB(const ::std::function<void (const ::std::vector< ::std::string>&)>& responseFunc,
-                const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc,
-                const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
-
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            ::Ice::ObjectPrx __proxy = ::Ice::ObjectPrx::uncheckedCast(__result->getProxy());
-            ::std::vector< ::std::string> __ret;
-            try
-            {
-                __ret = __proxy->end_ice_ids(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response(__ret);
-            }
-        }
-
-    private:
-
-        ::std::function<void (const ::std::vector< ::std::string>&)> _response;
-    };
-    return begin_ice_ids(ctx, new Cpp11CB(response, exception, sent), 0);
-}
-
-Ice::AsyncResultPtr
-IceProxy::Ice::Object::__begin_ice_invoke(
-    const ::std::string& operation,
-    ::Ice::OperationMode mode,
-    const ::std::vector< ::Ice::Byte>& inParams,
-    const ::Ice::Context* ctx,
-    const ::IceInternal::Function<void (bool, const ::std::vector< ::Ice::Byte>&)>& response,
-    const ::IceInternal::Function<void (const ::Ice::Exception&)>& exception,
-    const ::IceInternal::Function<void (bool)>& sent)
-{
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
-
-        Cpp11CB(const ::std::function<void (bool, const ::std::vector< ::Ice::Byte>&)>& responseFunc,
-                const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc,
-                const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
-
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            ::Ice::ObjectPrx __proxy = ::Ice::ObjectPrx::uncheckedCast(__result->getProxy());
-            bool __ret;
-            ::std::vector< ::Ice::Byte> p1;
-            try
-            {
-                __ret = __proxy->end_ice_invoke(p1, __result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response(__ret, p1);
-            }
-        }
-
-    private:
-
-        ::std::function<void (bool, const ::std::vector< ::Ice::Byte>&)> _response;
-    };
-
-    return begin_ice_invoke(operation, mode, inParams, ctx, new Cpp11CB(response, exception, sent), 0);
-}
-
-Ice::AsyncResultPtr
-IceProxy::Ice::Object::__begin_ice_invoke(
-    const ::std::string& operation,
-    ::Ice::OperationMode mode,
-    const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inParams,
-    const ::Ice::Context* ctx,
-    const ::IceInternal::Function<void (bool, const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&)>& response,
-    const ::IceInternal::Function<void (const ::Ice::Exception&)>& exception,
-    const ::IceInternal::Function<void (bool)>& sent)
-{
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
-
-        Cpp11CB(const ::std::function<void (bool, const ::std::pair<const ::Ice::Byte*,
-                                            const ::Ice::Byte*>&)>& responseFunc,
-                const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc,
-                const ::std::function<void (bool)>& sentFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, _response || _exception != nullptr);
-        }
-
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            bool __ret;
-            ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*> p1;
-            try
-            {
-                __ret = __result->getProxy()->___end_ice_invoke(p1, __result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response(__ret, p1);
-            }
-        }
-
-    private:
-
-        ::std::function<void (bool, const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&)> _response;
-    };
-    return begin_ice_invoke(operation, mode, inParams, ctx, new Cpp11CB(response, exception, sent), 0);
-}
-
-Ice::AsyncResultPtr
-IceProxy::Ice::Object::begin_ice_getConnection(
-    const ::IceInternal::Function<void (const ::Ice::ConnectionPtr&)>& response,
-    const ::IceInternal::Function<void (const ::Ice::Exception&)>& exception)
-{
-    class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
-    {
-    public:
-
-        Cpp11CB(const ::std::function<void (const ::Ice::ConnectionPtr&)>& responseFunc,
-                const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc) :
-            ::IceInternal::Cpp11FnCallbackNC(exceptionFunc, nullptr),
-            _response(responseFunc)
-        {
-            CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
-        }
-
-        virtual void completed(const ::Ice::AsyncResultPtr& __result) const
-        {
-            ::Ice::ObjectPrx __proxy = ::Ice::ObjectPrx::uncheckedCast(__result->getProxy());
-            ::Ice::ConnectionPtr __ret;
-            try
-            {
-                __ret = __proxy->end_ice_getConnection(__result);
-            }
-            catch(const ::Ice::Exception& ex)
-            {
-                Cpp11FnCallbackNC::exception(__result, ex);
-                return;
-            }
-            if(_response != nullptr)
-            {
-                _response(__ret);
-            }
-        }
-
-    private:
-
-        ::std::function<void (const ::Ice::ConnectionPtr&)> _response;
-    };
-    return begin_ice_getConnectionInternal(new Cpp11CB(response, exception), 0);
-}
-
-#endif
-
-
 bool
 IceProxy::Ice::Object::end_ice_isA(const AsyncResultPtr& __result)
 {
@@ -527,18 +242,18 @@ IceProxy::Ice::Object::end_ice_isA(const AsyncResultPtr& __result)
         }
         catch(const UserException& __ex)
         {
-            throw UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+            throw UnknownUserException(__FILE__, __LINE__, __ex.ice_id());
         }
     }
     bool __ret;
-    IceInternal::BasicStream* __is = __result->__startReadParams();
+    ::Ice::InputStream* __is = __result->__startReadParams();
     __is->read(__ret);
     __result->__endReadParams();
     return __ret;
 }
 
 void
-IceProxy::Ice::Object::ice_ping(const Context* context)
+IceProxy::Ice::Object::ice_ping(const Context& context)
 {
     Outgoing __og(this, ice_ping_name, ::Ice::Nonmutating, context);
     __og.writeEmptyParams();
@@ -553,7 +268,7 @@ IceProxy::Ice::Object::ice_ping(const Context* context)
             }
             catch(const ::Ice::UserException& __ex)
             {
-                throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+                throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_id());
             }
         }
         __og.readEmptyParams();
@@ -561,16 +276,16 @@ IceProxy::Ice::Object::ice_ping(const Context* context)
 }
 
 AsyncResultPtr
-IceProxy::Ice::Object::begin_ice_ping(const Context* ctx,
-                                      const ::IceInternal::CallbackBasePtr& del,
-                                      const ::Ice::LocalObjectPtr& cookie)
+IceProxy::Ice::Object::__begin_ice_ping(const Context& ctx,
+                                        const ::IceInternal::CallbackBasePtr& del,
+                                        const ::Ice::LocalObjectPtr& cookie)
 {
-    OutgoingAsyncPtr __result = new OutgoingAsync(this, ice_ping_name, del, cookie);
+    OutgoingAsyncPtr __result = new CallbackOutgoing(this, ice_ping_name, del, cookie);
     try
     {
         __result->prepare(ice_ping_name, Nonmutating, ctx);
         __result->writeEmptyParams();
-        __result->invoke();
+        __result->invoke(ice_ping_name);
     }
     catch(const Exception& __ex)
     {
@@ -586,7 +301,7 @@ IceProxy::Ice::Object::end_ice_ping(const AsyncResultPtr& __result)
 }
 
 vector<string>
-IceProxy::Ice::Object::ice_ids(const Context* context)
+IceProxy::Ice::Object::ice_ids(const Context& context)
 {
     __checkTwowayOnly(ice_ids_name);
     Outgoing __og(this, ice_ids_name, ::Ice::Nonmutating, context);
@@ -599,18 +314,18 @@ IceProxy::Ice::Object::ice_ids(const Context* context)
         }
         catch(const ::Ice::UserException& __ex)
         {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_id());
         }
     }
     vector<string> __ret;
-    BasicStream* __is = __og.startReadParams();
+    InputStream* __is = __og.startReadParams();
     __is->read(__ret, false);
     __og.endReadParams();
     return __ret;
 }
 
 string
-IceProxy::Ice::Object::ice_id(const Context* context)
+IceProxy::Ice::Object::ice_id(const Context& context)
 {
     __checkTwowayOnly(ice_id_name);
     Outgoing __og(this, ice_id_name, ::Ice::Nonmutating, context);
@@ -623,28 +338,28 @@ IceProxy::Ice::Object::ice_id(const Context* context)
         }
         catch(const ::Ice::UserException& __ex)
         {
-            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+            throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_id());
         }
     }
     string __ret;
-    BasicStream* __is = __og.startReadParams();
+    InputStream* __is = __og.startReadParams();
     __is->read(__ret, false);
     __og.endReadParams();
     return __ret;
 }
 
 AsyncResultPtr
-IceProxy::Ice::Object::begin_ice_ids(const Context* ctx,
-                                     const ::IceInternal::CallbackBasePtr& del,
-                                     const ::Ice::LocalObjectPtr& cookie)
+IceProxy::Ice::Object::__begin_ice_ids(const Context& ctx,
+                                       const ::IceInternal::CallbackBasePtr& del,
+                                       const ::Ice::LocalObjectPtr& cookie)
 {
     __checkAsyncTwowayOnly(ice_ids_name);
-    OutgoingAsyncPtr __result = new OutgoingAsync(this, ice_ids_name, del, cookie);
+    OutgoingAsyncPtr __result = new CallbackOutgoing(this, ice_ids_name, del, cookie);
     try
     {
         __result->prepare(ice_ids_name, Nonmutating, ctx);
         __result->writeEmptyParams();
-        __result->invoke();
+        __result->invoke(ice_ids_name);
     }
     catch(const Exception& __ex)
     {
@@ -666,28 +381,28 @@ IceProxy::Ice::Object::end_ice_ids(const AsyncResultPtr& __result)
         }
         catch(const UserException& __ex)
         {
-            throw UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+            throw UnknownUserException(__FILE__, __LINE__, __ex.ice_id());
         }
     }
     vector<string> __ret;
-    IceInternal::BasicStream* __is = __result->__startReadParams();
+    ::Ice::InputStream* __is = __result->__startReadParams();
     __is->read(__ret);
     __result->__endReadParams();
     return __ret;
 }
 
 AsyncResultPtr
-IceProxy::Ice::Object::begin_ice_id(const Context* ctx,
-                                    const ::IceInternal::CallbackBasePtr& del,
-                                    const ::Ice::LocalObjectPtr& cookie)
+IceProxy::Ice::Object::__begin_ice_id(const Context& ctx,
+                                      const ::IceInternal::CallbackBasePtr& del,
+                                      const ::Ice::LocalObjectPtr& cookie)
 {
     __checkAsyncTwowayOnly(ice_id_name);
-    OutgoingAsyncPtr __result = new OutgoingAsync(this, ice_id_name, del, cookie);
+    OutgoingAsyncPtr __result = new CallbackOutgoing(this, ice_id_name, del, cookie);
     try
     {
         __result->prepare(ice_id_name, Nonmutating, ctx);
         __result->writeEmptyParams();
-        __result->invoke();
+        __result->invoke(ice_id_name);
     }
     catch(const Exception& __ex)
     {
@@ -709,11 +424,11 @@ IceProxy::Ice::Object::end_ice_id(const AsyncResultPtr& __result)
         }
         catch(const UserException& __ex)
         {
-            throw UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+            throw UnknownUserException(__FILE__, __LINE__, __ex.ice_id());
         }
     }
     string __ret;
-    IceInternal::BasicStream* __is = __result->__startReadParams();
+    ::Ice::InputStream* __is = __result->__startReadParams();
     __is->read(__ret);
     __result->__endReadParams();
     return __ret;
@@ -724,7 +439,7 @@ IceProxy::Ice::Object::ice_invoke(const string& operation,
                                   OperationMode mode,
                                   const vector<Byte>& inEncaps,
                                   vector<Byte>& outEncaps,
-                                  const Context* context)
+                                  const Context& context)
 {
     pair<const Byte*, const Byte*> inPair;
     if(inEncaps.empty())
@@ -740,12 +455,12 @@ IceProxy::Ice::Object::ice_invoke(const string& operation,
 }
 
 AsyncResultPtr
-IceProxy::Ice::Object::begin_ice_invoke(const string& operation,
-                                        OperationMode mode,
-                                        const vector<Byte>& inEncaps,
-                                        const Context* ctx,
-                                        const ::IceInternal::CallbackBasePtr& del,
-                                        const ::Ice::LocalObjectPtr& cookie)
+IceProxy::Ice::Object::__begin_ice_invoke(const string& operation,
+                                          OperationMode mode,
+                                          const vector<Byte>& inEncaps,
+                                          const Context& ctx,
+                                          const ::IceInternal::CallbackBasePtr& del,
+                                          const ::Ice::LocalObjectPtr& cookie)
 {
     pair<const Byte*, const Byte*> inPair;
     if(inEncaps.empty())
@@ -757,7 +472,7 @@ IceProxy::Ice::Object::begin_ice_invoke(const string& operation,
         inPair.first = &inEncaps[0];
         inPair.second = inPair.first + inEncaps.size();
     }
-    return begin_ice_invoke(operation, mode, inPair, ctx, del, cookie);
+    return __begin_ice_invoke(operation, mode, inPair, ctx, del, cookie);
 }
 
 bool
@@ -780,7 +495,7 @@ IceProxy::Ice::Object::ice_invoke(const string& operation,
                                   OperationMode mode,
                                   const pair<const Byte*, const Byte*>& inEncaps,
                                   vector<Byte>& outEncaps,
-                                  const Context* context)
+                                  const Context& context)
 {
     Outgoing __og(this, operation, mode, context);
     try
@@ -803,19 +518,19 @@ IceProxy::Ice::Object::ice_invoke(const string& operation,
 }
 
 AsyncResultPtr
-IceProxy::Ice::Object::begin_ice_invoke(const string& operation,
-                                        OperationMode mode,
-                                        const pair<const Byte*, const Byte*>& inEncaps,
-                                        const Context* ctx,
-                                        const ::IceInternal::CallbackBasePtr& del,
-                                        const ::Ice::LocalObjectPtr& cookie)
-{
-    OutgoingAsyncPtr __result = new OutgoingAsync(this, ice_invoke_name, del, cookie);
+IceProxy::Ice::Object::__begin_ice_invoke(const string& operation,
+                                          OperationMode mode,
+                                          const pair<const Byte*, const Byte*>& inEncaps,
+                                          const Context& ctx,
+                                          const ::IceInternal::CallbackBasePtr& del,
+                                          const ::Ice::LocalObjectPtr& cookie)
+{
+    OutgoingAsyncPtr __result = new CallbackOutgoing(this, ice_invoke_name, del, cookie);
     try
     {
         __result->prepare(operation, mode, ctx);
         __result->writeParamEncaps(inEncaps.first, static_cast<Int>(inEncaps.second - inEncaps.first));
-        __result->invoke();
+        __result->invoke(operation);
     }
     catch(const Exception& __ex)
     {
@@ -838,14 +553,256 @@ IceProxy::Ice::Object::___end_ice_invoke(pair<const Byte*, const Byte*>& outEnca
     return ok;
 }
 
+::Ice::AsyncResultPtr
+IceProxy::Ice::Object::begin_ice_flushBatchRequestsInternal(const ::IceInternal::CallbackBasePtr& del,
+                                                            const ::Ice::LocalObjectPtr& cookie)
+{
+    class ProxyFlushBatchAsyncWithCallback : public ProxyFlushBatchAsync, public CallbackCompletion
+    {
+    public:
+
+        ProxyFlushBatchAsyncWithCallback(const ::Ice::ObjectPrx& proxy,
+                                         const CallbackBasePtr& cb,
+                                         const ::Ice::LocalObjectPtr& cookie) :
+            ProxyFlushBatchAsync(proxy), CallbackCompletion(cb, cookie)
+        {
+            _cookie = cookie;
+        }
+
+        virtual const std::string&
+        getOperation() const
+        {
+            return ice_flushBatchRequests_name;
+        }
+    };
+
+    ProxyFlushBatchAsyncPtr result = new ProxyFlushBatchAsyncWithCallback(this, del, cookie);
+    try
+    {
+        result->invoke(ice_flushBatchRequests_name);
+    }
+    catch(const Exception& ex)
+    {
+        result->abort(ex);
+    }
+    return result;
+}
+
+void
+IceProxy::Ice::Object::end_ice_flushBatchRequests(const AsyncResultPtr& result)
+{
+    AsyncResult::__check(result, this, ice_flushBatchRequests_name);
+    result->__wait();
+}
+
+void
+IceProxy::Ice::Object::__invoke(Outgoing& __og) const
+{
+    //
+    // Helper for operations without out/return parameters and user
+    // exceptions.
+    //
+
+    bool __ok = __og.invoke();
+    if(__og.hasResponse())
+    {
+        if(!__ok)
+        {
+            try
+            {
+                __og.throwUserException();
+            }
+            catch(const ::Ice::UserException& __ex)
+            {
+                ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_id());
+                throw __uue;
+            }
+        }
+        __og.readEmptyParams();
+    }
+}
+
+void
+IceProxy::Ice::Object::__end(const ::Ice::AsyncResultPtr& __result, const std::string& operation) const
+{
+    AsyncResult::__check(__result, this, operation);
+    bool __ok = __result->__wait();
+    if(_reference->getMode() == Reference::ModeTwoway)
+    {
+        if(!__ok)
+        {
+            try
+            {
+                __result->__throwUserException();
+            }
+            catch(const UserException& __ex)
+            {
+                throw UnknownUserException(__FILE__, __LINE__, __ex.ice_id());
+            }
+        }
+        __result->__readEmptyParams();
+    }
+}
+
+namespace IceProxy
+{
+
+namespace Ice
+{
+
+ostream&
+operator<<(ostream& os, const ::IceProxy::Ice::Object& p)
+{
+    return os << p.ice_toString();
+}
+
+}
+
+}
+
+IceProxy::Ice::Object*
+IceProxy::Ice::Object::__newInstance() const
+{
+    return new Object;
+}
+
+ConnectionPtr
+IceProxy::Ice::Object::ice_getConnection()
+{
+    InvocationObserver observer(this, ice_getConnection_name, ::Ice::noExplicitContext);
+    int cnt = 0;
+    while(true)
+    {
+        RequestHandlerPtr handler;
+        try
+        {
+            handler = __getRequestHandler();
+            return handler->waitForConnection(); // Wait for the connection to be established.
+        }
+        catch(const IceInternal::RetryException&)
+        {
+            __updateRequestHandler(handler, 0); // Clear request handler and retry.
+        }
+        catch(const Exception& ex)
+        {
+            try
+            {
+                int interval = __handleException(ex, handler, ICE_ENUM(OperationMode, Idempotent), false, cnt);
+                observer.retried();
+                if(interval > 0)
+                {
+                    IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(interval));
+                }
+            }
+            catch(const Exception& exc)
+            {
+                observer.failed(exc.ice_id());
+                throw;
+            }
+        }
+    }
+}
+
+AsyncResultPtr
+IceProxy::Ice::Object::begin_ice_getConnectionInternal(const ::IceInternal::CallbackBasePtr& del,
+                                                       const ::Ice::LocalObjectPtr& cookie)
+{
+    class ProxyGetConnectionWithCallback :  public ProxyGetConnection, public CallbackCompletion
+    {
+    public:
+
+        ProxyGetConnectionWithCallback(const ::Ice::ObjectPrx& proxy,
+                                       const ::IceInternal::CallbackBasePtr& cb,
+                                       const ::Ice::LocalObjectPtr& cookie) :
+            ProxyGetConnection(proxy), CallbackCompletion(cb, cookie)
+        {
+            _cookie = cookie;
+        }
+
+        virtual const std::string&
+        getOperation() const
+        {
+            return ice_getConnection_name;
+        }
+    };
+
+    ProxyGetConnectionPtr result = new ProxyGetConnectionWithCallback(this, del, cookie);
+    try
+    {
+        result->invoke(ice_getConnection_name);
+    }
+    catch(const Exception& ex)
+    {
+        result->abort(ex);
+    }
+    return result;
+}
+
+ConnectionPtr
+IceProxy::Ice::Object::end_ice_getConnection(const AsyncResultPtr& __result)
+{
+    AsyncResult::__check(__result, this, ice_getConnection_name);
+    __result->__wait();
+    return ice_getCachedConnection();
+}
+
+void
+IceProxy::Ice::Object::ice_flushBatchRequests()
+{
+    ProxyFlushBatch og(ICE_SHARED_FROM_THIS, ice_flushBatchRequests_name);
+    og.invoke();
+}
+
+void
+IceProxy::Ice::Object::__checkTwowayOnly(const string& name) const
+{
+    //
+    // No mutex lock necessary, there is nothing mutable in this operation.
+    //
+    if(!ice_isTwoway())
+    {
+        TwowayOnlyException ex(__FILE__, __LINE__);
+        ex.operation = name;
+        throw ex;
+    }
+}
+
+#endif
+
+#ifdef ICE_CPP11_MAPPING
+#  define ICE_OBJECT_PRX Ice::ObjectPrx
+#  define CONST_POINTER_CAST_OBJECT_PRX const_pointer_cast<ObjectPrx>(shared_from_this())
+#else
+#  define ICE_OBJECT_PRX IceProxy::Ice::Object
+#  define CONST_POINTER_CAST_OBJECT_PRX ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this))
+#endif
+
+//
+// methods common for both C++11/C++98 mappings
+//
+
+void
+ICE_OBJECT_PRX::__checkAsyncTwowayOnly(const string& name) const
+{
+    //
+    // No mutex lock necessary, there is nothing mutable in this operation.
+    //
+    if(!ice_isTwoway())
+    {
+        throw IceUtil::IllegalArgumentException(__FILE__,
+                                                __LINE__,
+                                                "`" + name + "' can only be called with a twoway proxy");
+    }
+}
+
 Identity
-IceProxy::Ice::Object::ice_getIdentity() const
+ICE_OBJECT_PRX::ice_getIdentity() const
 {
     return _reference->getIdentity();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_identity(const Identity& newIdentity) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_identity(const Identity& newIdentity) const
 {
     if(newIdentity.name.empty())
     {
@@ -853,113 +810,121 @@ IceProxy::Ice::Object::ice_identity(const Identity& newIdentity) const
     }
     if(newIdentity == _reference->getIdentity())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = new Object;
+#ifdef ICE_CPP11_MAPPING
+        auto proxy = createProxy<ObjectPrx>();
+#else
+        ObjectPrxPtr proxy = new IceProxy::Ice::Object;
+#endif
         proxy->setup(_reference->changeIdentity(newIdentity));
         return proxy;
     }
 }
 
 Context
-IceProxy::Ice::Object::ice_getContext() const
+ICE_OBJECT_PRX::ice_getContext() const
 {
     return _reference->getContext()->getValue();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_context(const Context& newContext) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_context(const Context& newContext) const
 {
-    ObjectPrx proxy = __newInstance();
+    ObjectPrxPtr proxy = __newInstance();
     proxy->setup(_reference->changeContext(newContext));
     return proxy;
 }
 
 const string&
-IceProxy::Ice::Object::ice_getFacet() const
+ICE_OBJECT_PRX::ice_getFacet() const
 {
     return _reference->getFacet();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_facet(const string& newFacet) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_facet(const string& newFacet) const
 {
     if(newFacet == _reference->getFacet())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = new Object;
+#ifdef ICE_CPP11_MAPPING
+        auto proxy = createProxy<ObjectPrx>();
+#else
+        ObjectPrx proxy = new IceProxy::Ice::Object;
+#endif
         proxy->setup(_reference->changeFacet(newFacet));
         return proxy;
     }
 }
 
 string
-IceProxy::Ice::Object::ice_getAdapterId() const
+ICE_OBJECT_PRX::ice_getAdapterId() const
 {
     return _reference->getAdapterId();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_adapterId(const string& newAdapterId) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_adapterId(const string& newAdapterId) const
 {
     if(newAdapterId == _reference->getAdapterId())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeAdapterId(newAdapterId));
         return proxy;
     }
 }
 
 EndpointSeq
-IceProxy::Ice::Object::ice_getEndpoints() const
+ICE_OBJECT_PRX::ice_getEndpoints() const
 {
     vector<EndpointIPtr> endpoints = _reference->getEndpoints();
     EndpointSeq retSeq;
     for(vector<EndpointIPtr>::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p)
     {
-        retSeq.push_back(EndpointPtr::dynamicCast(*p));
+        retSeq.push_back(ICE_DYNAMIC_CAST(Endpoint, *p));
     }
     return retSeq;
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_endpoints(const EndpointSeq& newEndpoints) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_endpoints(const EndpointSeq& newEndpoints) const
 {
     vector<EndpointIPtr> endpoints;
     for(EndpointSeq::const_iterator p = newEndpoints.begin(); p != newEndpoints.end(); ++p)
     {
-        endpoints.push_back(EndpointIPtr::dynamicCast(*p));
+        endpoints.push_back(ICE_DYNAMIC_CAST(EndpointI, *p));
     }
 
     if(endpoints == _reference->getEndpoints())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeEndpoints(endpoints));
         return proxy;
     }
 }
 
 Int
-IceProxy::Ice::Object::ice_getLocatorCacheTimeout() const
+ICE_OBJECT_PRX::ice_getLocatorCacheTimeout() const
 {
     return _reference->getLocatorCacheTimeout();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_locatorCacheTimeout(Int newTimeout) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_locatorCacheTimeout(Int newTimeout) const
 {
     if(newTimeout < -1)
     {
@@ -969,196 +934,204 @@ IceProxy::Ice::Object::ice_locatorCacheTimeout(Int newTimeout) const
     }
     if(newTimeout == _reference->getLocatorCacheTimeout())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeLocatorCacheTimeout(newTimeout));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isConnectionCached() const
+ICE_OBJECT_PRX::ice_isConnectionCached() const
 {
     return _reference->getCacheConnection();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_connectionCached(bool newCache) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_connectionCached(bool newCache) const
 {
     if(newCache == _reference->getCacheConnection())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeCacheConnection(newCache));
         return proxy;
     }
 }
 
 EndpointSelectionType
-IceProxy::Ice::Object::ice_getEndpointSelection() const
+ICE_OBJECT_PRX::ice_getEndpointSelection() const
 {
     return _reference->getEndpointSelection();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_endpointSelection(EndpointSelectionType newType) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_endpointSelection(EndpointSelectionType newType) const
 {
     if(newType == _reference->getEndpointSelection())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeEndpointSelection(newType));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isSecure() const
+ICE_OBJECT_PRX::ice_isSecure() const
 {
     return _reference->getSecure();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_secure(bool b) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_secure(bool b) const
 {
     if(b == _reference->getSecure())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeSecure(b));
         return proxy;
     }
 }
 
 ::Ice::EncodingVersion
-IceProxy::Ice::Object::ice_getEncodingVersion() const
+ICE_OBJECT_PRX::ice_getEncodingVersion() const
 {
     return _reference->getEncoding();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_encodingVersion(const ::Ice::EncodingVersion& encoding) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_encodingVersion(const ::Ice::EncodingVersion& encoding) const
 {
     if(encoding == _reference->getEncoding())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeEncoding(encoding));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isPreferSecure() const
+ICE_OBJECT_PRX::ice_isPreferSecure() const
 {
     return _reference->getPreferSecure();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_preferSecure(bool b) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_preferSecure(bool b) const
 {
     if(b == _reference->getPreferSecure())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changePreferSecure(b));
         return proxy;
     }
 }
 
-RouterPrx
-IceProxy::Ice::Object::ice_getRouter() const
+RouterPrxPtr
+ICE_OBJECT_PRX::ice_getRouter() const
 {
     RouterInfoPtr ri = _reference->getRouterInfo();
-    return ri ? ri->getRouter() : RouterPrx();
+#ifdef ICE_CPP11_MAPPING
+    return ri ? ri->getRouter() : nullptr;
+#else
+    return ri ? ri->getRouter() : RouterPrxPtr();
+#endif
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_router(const RouterPrx& router) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_router(const RouterPrxPtr& router) const
 {
     ReferencePtr ref = _reference->changeRouter(router);
     if(ref == _reference)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(ref);
         return proxy;
     }
 }
 
-LocatorPrx
-IceProxy::Ice::Object::ice_getLocator() const
+LocatorPrxPtr
+ICE_OBJECT_PRX::ice_getLocator() const
 {
     LocatorInfoPtr ri = _reference->getLocatorInfo();
-    return ri ? ri->getLocator() : LocatorPrx();
+#ifdef ICE_CPP11_MAPPING
+    return ri ? ri->getLocator() : nullptr;
+#else
+    return ri ? ri->getLocator() : LocatorPrxPtr();
+#endif
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_locator(const LocatorPrx& locator) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_locator(const LocatorPrxPtr& locator) const
 {
     ReferencePtr ref = _reference->changeLocator(locator);
     if(ref == _reference)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(ref);
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isCollocationOptimized() const
+ICE_OBJECT_PRX::ice_isCollocationOptimized() const
 {
     return _reference->getCollocationOptimized();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_collocationOptimized(bool b) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_collocationOptimized(bool b) const
 {
     if(b == _reference->getCollocationOptimized())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeCollocationOptimized(b));
         return proxy;
     }
 }
 
 Int
-IceProxy::Ice::Object::ice_getInvocationTimeout() const
+ICE_OBJECT_PRX::ice_getInvocationTimeout() const
 {
     return _reference->getInvocationTimeout();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_invocationTimeout(Int newTimeout) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_invocationTimeout(Int newTimeout) const
 {
     if(newTimeout < 1 && newTimeout != -1 && newTimeout != -2)
     {
@@ -1168,139 +1141,139 @@ IceProxy::Ice::Object::ice_invocationTimeout(Int newTimeout) const
     }
     if(newTimeout == _reference->getInvocationTimeout())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeInvocationTimeout(newTimeout));
         return proxy;
     }
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_twoway() const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_twoway() const
 {
     if(_reference->getMode() == Reference::ModeTwoway)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeMode(Reference::ModeTwoway));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isTwoway() const
+ICE_OBJECT_PRX::ice_isTwoway() const
 {
     return _reference->getMode() == Reference::ModeTwoway;
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_oneway() const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_oneway() const
 {
     if(_reference->getMode() == Reference::ModeOneway)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeMode(Reference::ModeOneway));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isOneway() const
+ICE_OBJECT_PRX::ice_isOneway() const
 {
     return _reference->getMode() == Reference::ModeOneway;
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_batchOneway() const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_batchOneway() const
 {
     if(_reference->getMode() == Reference::ModeBatchOneway)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeMode(Reference::ModeBatchOneway));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isBatchOneway() const
+ICE_OBJECT_PRX::ice_isBatchOneway() const
 {
     return _reference->getMode() == Reference::ModeBatchOneway;
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_datagram() const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_datagram() const
 {
     if(_reference->getMode() == Reference::ModeDatagram)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeMode(Reference::ModeDatagram));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isDatagram() const
+ICE_OBJECT_PRX::ice_isDatagram() const
 {
     return _reference->getMode() == Reference::ModeDatagram;
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_batchDatagram() const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_batchDatagram() const
 {
     if(_reference->getMode() == Reference::ModeBatchDatagram)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeMode(Reference::ModeBatchDatagram));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isBatchDatagram() const
+ICE_OBJECT_PRX::ice_isBatchDatagram() const
 {
     return _reference->getMode() == Reference::ModeBatchDatagram;
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_compress(bool b) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_compress(bool b) const
 {
     ReferencePtr ref = _reference->changeCompress(b);
     if(ref == _reference)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(ref);
         return proxy;
     }
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_timeout(int t) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_timeout(int t) const
 {
     if(t < 1 && t != -1)
     {
@@ -1311,101 +1284,40 @@ IceProxy::Ice::Object::ice_timeout(int t) const
     ReferencePtr ref = _reference->changeTimeout(t);
     if(ref == _reference)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(ref);
         return proxy;
     }
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_connectionId(const string& id) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_connectionId(const string& id) const
 {
     ReferencePtr ref = _reference->changeConnectionId(id);
     if(ref == _reference)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(ref);
         return proxy;
     }
 }
 
 string
-IceProxy::Ice::Object::ice_getConnectionId() const
+ICE_OBJECT_PRX::ice_getConnectionId() const
 {
     return _reference->getConnectionId();
 }
 
 ConnectionPtr
-IceProxy::Ice::Object::ice_getConnection()
-{
-    InvocationObserver observer(this, "ice_getConnection", 0);
-    int cnt = 0;
-    while(true)
-    {
-        RequestHandlerPtr handler;
-        try
-        {
-            handler = __getRequestHandler();
-            return handler->waitForConnection(); // Wait for the connection to be established.
-        }
-        catch(const IceInternal::RetryException&)
-        {
-            __updateRequestHandler(handler, 0); // Clear request handler and retry.
-        }
-        catch(const Exception& ex)
-        {
-            try
-            {
-                int interval = __handleException(ex, handler, Idempotent, false, cnt);
-                observer.retried();
-                if(interval > 0)
-                {
-                    IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(interval));
-                }
-            }
-            catch(const Exception& exc)
-            {
-                observer.failed(exc.ice_name());
-                throw;
-            }
-        }
-    }
-}
-
-AsyncResultPtr
-IceProxy::Ice::Object::begin_ice_getConnectionInternal(const ::IceInternal::CallbackBasePtr& del,
-                                                       const ::Ice::LocalObjectPtr& cookie)
-{
-    ProxyGetConnectionPtr result = new ProxyGetConnection(this, ice_getConnection_name, del, cookie);
-    try
-    {
-        result->invoke();
-    }
-    catch(const Exception& ex)
-    {
-        result->abort(ex);
-    }
-    return result;
-}
-
-ConnectionPtr
-IceProxy::Ice::Object::end_ice_getConnection(const AsyncResultPtr& __result)
-{
-    AsyncResult::__check(__result, this, ice_getConnection_name);
-    __result->__wait();
-    return ice_getCachedConnection();
-}
-
-ConnectionPtr
-IceProxy::Ice::Object::ice_getCachedConnection() const
+ICE_OBJECT_PRX::ice_getCachedConnection() const
 {
     RequestHandlerPtr __handler;
     {
@@ -1427,51 +1339,21 @@ IceProxy::Ice::Object::ice_getCachedConnection() const
 }
 
 void
-IceProxy::Ice::Object::ice_flushBatchRequests()
-{
-    ProxyFlushBatch og(this, ice_flushBatchRequests_name);
-    og.invoke();
-}
-
-::Ice::AsyncResultPtr
-IceProxy::Ice::Object::begin_ice_flushBatchRequestsInternal(const ::IceInternal::CallbackBasePtr& del,
-                                                            const ::Ice::LocalObjectPtr& cookie)
-{
-    ProxyFlushBatchAsyncPtr result = new ProxyFlushBatchAsync(this, ice_flushBatchRequests_name, del, cookie);
-    try
-    {
-        result->invoke();
-    }
-    catch(const Exception& ex)
-    {
-        result->abort(ex);
-    }
-    return result;
-}
-
-void
-IceProxy::Ice::Object::end_ice_flushBatchRequests(const AsyncResultPtr& result)
+ICE_OBJECT_PRX::setup(const ReferencePtr& ref)
 {
-    AsyncResult::__check(result, this, ice_flushBatchRequests_name);
-    result->__wait();
-}
+    //
+    // No need to synchronize "*this", as this operation is only
+    // called upon initialization.
+    //
 
-Int
-IceProxy::Ice::Object::__hash() const
-{
-    return _reference->hash();
-}
+    assert(!_reference);
+    assert(!_requestHandler);
 
-void
-IceProxy::Ice::Object::__copyFrom(const ObjectPrx& from)
-{
-    IceUtil::Mutex::Lock sync(from->_mutex);
-    _reference = from->_reference;
-    _requestHandler = from->_requestHandler;
+    _reference = ref;
 }
 
 int
-IceProxy::Ice::Object::__handleException(const Exception& ex,
+ICE_OBJECT_PRX::__handleException(const Exception& ex,
                                          const RequestHandlerPtr& handler,
                                          OperationMode mode,
                                          bool sent,
@@ -1496,7 +1378,7 @@ IceProxy::Ice::Object::__handleException(const Exception& ex,
     //
     const LocalException* localEx = dynamic_cast<const LocalException*>(&ex);
     if(localEx && (!sent ||
-                   mode == Nonmutating || mode == Idempotent ||
+                   mode == ICE_ENUM(OperationMode, Nonmutating) || mode == ICE_ENUM(OperationMode, Idempotent) ||
                    dynamic_cast<const CloseConnectionException*>(&ex) ||
                    dynamic_cast<const ObjectNotExistException*>(&ex)))
     {
@@ -1519,101 +1401,8 @@ IceProxy::Ice::Object::__handleException(const Exception& ex,
     return 0; // Keep the compiler happy.
 }
 
-void
-IceProxy::Ice::Object::__checkTwowayOnly(const string& name) const
-{
-    //
-    // No mutex lock necessary, there is nothing mutable in this operation.
-    //
-    if(!ice_isTwoway())
-    {
-        TwowayOnlyException ex(__FILE__, __LINE__);
-        ex.operation = name;
-        throw ex;
-    }
-}
-
-void
-IceProxy::Ice::Object::__checkAsyncTwowayOnly(const string& name) const
-{
-    //
-    // No mutex lock necessary, there is nothing mutable in this operation.
-    //
-    if(!ice_isTwoway())
-    {
-        throw IceUtil::IllegalArgumentException(__FILE__,
-                                                __LINE__,
-                                                "`" + name + "' can only be called with a twoway proxy");
-    }
-}
-
-void
-IceProxy::Ice::Object::__invoke(Outgoing& __og) const
-{
-    //
-    // Helper for operations without out/return parameters and user
-    // exceptions.
-    //
-
-    bool __ok = __og.invoke();
-    if(__og.hasResponse())
-    {
-        if(!__ok)
-        {
-            try
-            {
-                __og.throwUserException();
-            }
-            catch(const ::Ice::UserException& __ex)
-            {
-                ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
-                throw __uue;
-            }
-        }
-        __og.readEmptyParams();
-    }
-}
-
-void
-IceProxy::Ice::Object::__end(const ::Ice::AsyncResultPtr& __result, const std::string& operation) const
-{
-    AsyncResult::__check(__result, this, operation);
-    bool __ok = __result->__wait();
-    if(_reference->getMode() == Reference::ModeTwoway)
-    {
-        if(!__ok)
-        {
-            try
-            {
-                __result->__throwUserException();
-            }
-            catch(const UserException& __ex)
-            {
-                throw UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
-            }
-        }
-        __result->__readEmptyParams();
-    }
-}
-
-namespace IceProxy
-{
-
-namespace Ice
-{
-
-ostream&
-operator<<(ostream& os, const ::IceProxy::Ice::Object& p)
-{
-    return os << p.ice_toString();
-}
-
-}
-
-}
-
 ::IceInternal::RequestHandlerPtr
-IceProxy::Ice::Object::__getRequestHandler()
+ICE_OBJECT_PRX::__getRequestHandler()
 {
     RequestHandlerPtr handler;
     if(_reference->getCacheConnection())
@@ -1624,11 +1413,11 @@ IceProxy::Ice::Object::__getRequestHandler()
             return _requestHandler;
         }
     }
-    return _reference->getRequestHandler(this);
+    return _reference->getRequestHandler(ICE_SHARED_FROM_THIS);
 }
 
 IceInternal::BatchRequestQueuePtr
-IceProxy::Ice::Object::__getBatchRequestQueue()
+ICE_OBJECT_PRX::__getBatchRequestQueue()
 {
     IceUtil::Mutex::Lock sync(_mutex);
     if(!_batchRequestQueue)
@@ -1639,7 +1428,7 @@ IceProxy::Ice::Object::__getBatchRequestQueue()
 }
 
 ::IceInternal::RequestHandlerPtr
-IceProxy::Ice::Object::__setRequestHandler(const ::IceInternal::RequestHandlerPtr& handler)
+ICE_OBJECT_PRX::__setRequestHandler(const ::IceInternal::RequestHandlerPtr& handler)
 {
     if(_reference->getCacheConnection())
     {
@@ -1654,7 +1443,7 @@ IceProxy::Ice::Object::__setRequestHandler(const ::IceInternal::RequestHandlerPt
 }
 
 void
-IceProxy::Ice::Object::__updateRequestHandler(const ::IceInternal::RequestHandlerPtr& previous,
+ICE_OBJECT_PRX::__updateRequestHandler(const ::IceInternal::RequestHandlerPtr& previous,
                                               const ::IceInternal::RequestHandlerPtr& handler)
 {
     if(_reference->getCacheConnection() && previous)
@@ -1674,28 +1463,46 @@ IceProxy::Ice::Object::__updateRequestHandler(const ::IceInternal::RequestHandle
     }
 }
 
-IceProxy::Ice::Object*
-IceProxy::Ice::Object::__newInstance() const
+void
+ICE_OBJECT_PRX::__copyFrom(const ObjectPrxPtr& from)
 {
-    return new Object;
+    IceUtil::Mutex::Lock sync(from->_mutex);
+    _reference = from->_reference;
+    _requestHandler = from->_requestHandler;
 }
 
-void
-IceProxy::Ice::Object::setup(const ReferencePtr& ref)
+CommunicatorPtr
+ICE_OBJECT_PRX::ice_getCommunicator() const
+{
+    return _reference->getCommunicator();
+}
+
+string
+ICE_OBJECT_PRX::ice_toString() const
 {
     //
-    // No need to synchronize "*this", as this operation is only
-    // called upon initialization.
+    // Returns the stringified proxy. There's no need to convert the
+    // string to a native string: a stringified proxy only contains
+    // printable ASCII which is a subset of all native character sets.
     //
+    return _reference->toString();
+}
 
-    assert(!_reference);
-    assert(!_requestHandler);
+Int
+ICE_OBJECT_PRX::__hash() const
+{
+    return _reference->hash();
+}
 
-    _reference = ref;
+void
+ICE_OBJECT_PRX::__write(OutputStream& os) const
+{
+    os.write(__reference()->getIdentity());
+    __reference()->streamWrite(&os);
 }
 
 bool
-Ice::proxyIdentityLess(const ObjectPrx& lhs, const ObjectPrx& rhs)
+Ice::proxyIdentityLess(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs)
 {
     if(!lhs && !rhs)
     {
@@ -1716,7 +1523,7 @@ Ice::proxyIdentityLess(const ObjectPrx& lhs, const ObjectPrx& rhs)
 }
 
 bool
-Ice::proxyIdentityEqual(const ObjectPrx& lhs, const ObjectPrx& rhs)
+Ice::proxyIdentityEqual(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs)
 {
     if(!lhs && !rhs)
     {
@@ -1737,7 +1544,7 @@ Ice::proxyIdentityEqual(const ObjectPrx& lhs, const ObjectPrx& rhs)
 }
 
 bool
-Ice::proxyIdentityAndFacetLess(const ObjectPrx& lhs, const ObjectPrx& rhs)
+Ice::proxyIdentityAndFacetLess(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs)
 {
     if(!lhs && !rhs)
     {
@@ -1782,7 +1589,7 @@ Ice::proxyIdentityAndFacetLess(const ObjectPrx& lhs, const ObjectPrx& rhs)
 }
 
 bool
-Ice::proxyIdentityAndFacetEqual(const ObjectPrx& lhs, const ObjectPrx& rhs)
+Ice::proxyIdentityAndFacetEqual(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs)
 {
     if(!lhs && !rhs)
     {
@@ -1815,15 +1622,3 @@ Ice::proxyIdentityAndFacetEqual(const ObjectPrx& lhs, const ObjectPrx& rhs)
         return false;
     }
 }
-
-void
-Ice::ice_writeObjectPrx(const OutputStreamPtr& out, const ObjectPrx& v)
-{
-    out->write(v);
-}
-
-void
-Ice::ice_readObjectPrx(const InputStreamPtr& in, ObjectPrx& v)
-{
-    in->read(v);
-}
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp
index 8a4f9d09f9d..b0037fa9ce5 100644
--- a/cpp/src/Ice/ProxyFactory.cpp
+++ b/cpp/src/Ice/ProxyFactory.cpp
@@ -15,7 +15,8 @@
 #include <Ice/ReferenceFactory.h>
 #include <Ice/LocatorInfo.h>
 #include <Ice/RouterInfo.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/Properties.h>
 #include <Ice/LoggerUtil.h>
 #include <Ice/TraceLevels.h>
@@ -28,7 +29,7 @@ using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(ProxyFactory* p) { return p; }
 
-ObjectPrx
+ObjectPrxPtr
 IceInternal::ProxyFactory::stringToProxy(const string& str) const
 {
     ReferencePtr ref = _instance->referenceFactory()->create(str, "");
@@ -36,7 +37,7 @@ IceInternal::ProxyFactory::stringToProxy(const string& str) const
 }
 
 string
-IceInternal::ProxyFactory::proxyToString(const ObjectPrx& proxy) const
+IceInternal::ProxyFactory::proxyToString(const ObjectPrxPtr& proxy) const
 {
     if(proxy)
     {
@@ -48,7 +49,7 @@ IceInternal::ProxyFactory::proxyToString(const ObjectPrx& proxy) const
     }
 }
 
-ObjectPrx
+ObjectPrxPtr
 IceInternal::ProxyFactory::propertyToProxy(const string& prefix) const
 {
     string proxy = _instance->initializationData().properties->getProperty(prefix);
@@ -57,7 +58,7 @@ IceInternal::ProxyFactory::propertyToProxy(const string& prefix) const
 }
 
 PropertyDict
-IceInternal::ProxyFactory::proxyToProperty(const ObjectPrx& proxy, const string& prefix) const
+IceInternal::ProxyFactory::proxyToProperty(const ObjectPrxPtr& proxy, const string& prefix) const
 {
     if(proxy)
     {
@@ -69,8 +70,8 @@ IceInternal::ProxyFactory::proxyToProperty(const ObjectPrx& proxy, const string&
     }
 }
 
-ObjectPrx
-IceInternal::ProxyFactory::streamToProxy(BasicStream* s) const
+ObjectPrxPtr
+IceInternal::ProxyFactory::streamToProxy(InputStream* s) const
 {
     Identity ident;
     s->read(ident);
@@ -79,33 +80,22 @@ IceInternal::ProxyFactory::streamToProxy(BasicStream* s) const
     return referenceToProxy(ref);
 }
 
-void
-IceInternal::ProxyFactory::proxyToStream(const ObjectPrx& proxy, BasicStream* s) const
-{
-    if(proxy)
-    {
-        s->write(proxy->__reference()->getIdentity());
-        proxy->__reference()->streamWrite(s);
-    }
-    else
-    {
-        Identity ident;
-        s->write(ident);
-    }
-}
-
-ObjectPrx
+ObjectPrxPtr
 IceInternal::ProxyFactory::referenceToProxy(const ReferencePtr& ref) const
 {
     if(ref)
     {
-        ObjectPrx proxy = new ::IceProxy::Ice::Object;
+#ifdef ICE_CPP11_MAPPING
+        auto proxy = createProxy<ObjectPrx>();
+#else
+        ObjectPrx proxy = new ::IceProxy::Ice::Object();
+#endif
         proxy->setup(ref);
         return proxy;
     }
     else
     {
-        return 0;
+        return ICE_NULLPTR;
     }
 }
 
diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h
index fa9b640ed4c..1aa11d39f9e 100644
--- a/cpp/src/Ice/ProxyFactory.h
+++ b/cpp/src/Ice/ProxyFactory.h
@@ -20,25 +20,30 @@
 #include <Ice/OutgoingAsyncF.h>
 #include <Ice/Properties.h>
 
-namespace IceInternal
+namespace Ice
 {
 
-class BasicStream;
+class OutputStream;
+class InputStream;
+
+}
+
+namespace IceInternal
+{
 
 class ProxyFactory : public IceUtil::Shared
 {
 public:
     
-    Ice::ObjectPrx stringToProxy(const std::string&) const;
-    std::string proxyToString(const Ice::ObjectPrx&) const;
+    Ice::ObjectPrxPtr stringToProxy(const std::string&) const;
+    std::string proxyToString(const Ice::ObjectPrxPtr&) const;
 
-    Ice::ObjectPrx propertyToProxy(const std::string&) const;
-    Ice::PropertyDict proxyToProperty(const Ice::ObjectPrx&, const std::string&) const;
+    Ice::ObjectPrxPtr propertyToProxy(const std::string&) const;
+    Ice::PropertyDict proxyToProperty(const Ice::ObjectPrxPtr&, const std::string&) const;
 
-    Ice::ObjectPrx streamToProxy(BasicStream*) const;
-    void proxyToStream(const Ice::ObjectPrx&, BasicStream*) const;
+    Ice::ObjectPrxPtr streamToProxy(Ice::InputStream*) const;
 
-    Ice::ObjectPrx referenceToProxy(const ReferencePtr&) const;
+    Ice::ObjectPrxPtr referenceToProxy(const ReferencePtr&) const;
 
     int checkRetryAfterException(const Ice::LocalException&, const ReferencePtr&, int&) const;
 
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index a80c282dc69..772af952742 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -13,7 +13,7 @@
 #include <Ice/Instance.h>
 #include <Ice/EndpointI.h>
 #include <Ice/OpaqueEndpointI.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
 #include <Ice/RouterInfo.h>
 #include <Ice/Router.h>
 #include <Ice/LocatorInfo.h>
@@ -27,11 +27,14 @@
 #include <Ice/RequestHandlerFactory.h>
 #include <Ice/ConnectionRequestHandler.h>
 #include <Ice/DefaultsAndOverrides.h>
+#include <Ice/Comparable.h>
+
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/Random.h>
 #include <IceUtil/MutexPtrLock.h>
 
 #include <functional>
+#include <algorithm>
 
 using namespace std;
 using namespace Ice;
@@ -184,7 +187,7 @@ Reference::hash() const
 }
 
 void
-IceInternal::Reference::streamWrite(BasicStream* s) const
+IceInternal::Reference::streamWrite(OutputStream* s) const
 {
     //
     // Don't write the identity here. Operations calling streamWrite
@@ -207,7 +210,7 @@ IceInternal::Reference::streamWrite(BasicStream* s) const
 
     s->write(_secure);
 
-    if(s->getWriteEncoding() != Ice::Encoding_1_0)
+    if(s->getEncoding() != Ice::Encoding_1_0)
     {
         s->write(_protocol);
         s->write(_encoding);
@@ -233,7 +236,7 @@ IceInternal::Reference::toString() const
     // the reference parser uses as separators, then we enclose
     // the identity string in quotes.
     //
-    string id = _instance->identityToString(_identity);
+    string id = Ice::identityToString(_identity);
     if(id.find_first_of(" :@") != string::npos)
     {
         s << '"' << id << '"';
@@ -376,7 +379,6 @@ IceInternal::Reference::operator==(const Reference& r) const
     {
         return false;
     }
-
     return true;
 }
 
@@ -654,14 +656,14 @@ IceInternal::FixedReference::changeAdapterId(const string& /*newAdapterId*/) con
 }
 
 ReferencePtr
-IceInternal::FixedReference::changeLocator(const LocatorPrx&) const
+IceInternal::FixedReference::changeLocator(const LocatorPrxPtr&) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
     return 0; // Keep the compiler happy.
 }
 
 ReferencePtr
-IceInternal::FixedReference::changeRouter(const RouterPrx&) const
+IceInternal::FixedReference::changeRouter(const RouterPrxPtr&) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
     return 0; // Keep the compiler happy.
@@ -729,7 +731,7 @@ IceInternal::FixedReference::isWellKnown() const
 }
 
 void
-IceInternal::FixedReference::streamWrite(BasicStream*) const
+IceInternal::FixedReference::streamWrite(OutputStream*) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
 }
@@ -753,7 +755,7 @@ IceInternal::FixedReference::toProperty(const string&) const
 }
 
 RequestHandlerPtr
-IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrx& proxy) const
+IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrxPtr& proxy) const
 {
     switch(getMode())
     {
@@ -815,7 +817,7 @@ IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrx& proxy) cons
     }
 
     ReferencePtr ref = const_cast<FixedReference*>(this);
-    return proxy->__setRequestHandler(new ConnectionRequestHandler(ref, _fixedConnection, compress));
+    return proxy->__setRequestHandler(ICE_MAKE_SHARED(ConnectionRequestHandler, ref, _fixedConnection, compress));
 }
 
 BatchRequestQueuePtr
@@ -1039,7 +1041,7 @@ IceInternal::RoutableReference::changeAdapterId(const string& newAdapterId) cons
 }
 
 ReferencePtr
-IceInternal::RoutableReference::changeLocator(const LocatorPrx& newLocator) const
+IceInternal::RoutableReference::changeLocator(const LocatorPrxPtr& newLocator) const
 {
     LocatorInfoPtr newLocatorInfo = getInstance()->locatorManager()->get(newLocator);
     if(newLocatorInfo == _locatorInfo)
@@ -1052,7 +1054,7 @@ IceInternal::RoutableReference::changeLocator(const LocatorPrx& newLocator) cons
 }
 
 ReferencePtr
-IceInternal::RoutableReference::changeRouter(const RouterPrx& newRouter) const
+IceInternal::RoutableReference::changeRouter(const RouterPrxPtr& newRouter) const
 {
     RouterInfoPtr newRouterInfo = getInstance()->routerManager()->get(newRouter);
     if(newRouterInfo == _routerInfo)
@@ -1180,7 +1182,7 @@ IceInternal::RoutableReference::isWellKnown() const
 }
 
 void
-IceInternal::RoutableReference::streamWrite(BasicStream* s) const
+IceInternal::RoutableReference::streamWrite(OutputStream* s) const
 {
     Reference::streamWrite(s);
 
@@ -1351,7 +1353,16 @@ IceInternal::RoutableReference::operator==(const Reference& r) const
     {
         return false;
     }
+#ifdef ICE_CPP11_MAPPING
+    //
+    // TODO: With C++14 we could use the vesion that receives four iterators and we don't need to explicitly
+    // check the sizesa are equal.
+    //
+    if(_endpoints.size() != rhs->_endpoints.size() ||
+       !equal(_endpoints.begin(), _endpoints.end(), rhs->_endpoints.begin(), Ice::TargetEquals<shared_ptr<EndpointI>>()))
+#else
     if(_endpoints != rhs->_endpoints)
+#endif
     {
         return false;
     }
@@ -1479,7 +1490,12 @@ IceInternal::RoutableReference::operator<(const Reference& r) const
     {
         return false;
     }
+#ifdef ICE_CPP11_MAPPING
+    if(lexicographical_compare(_endpoints.begin(), _endpoints.end(), rhs->_endpoints.begin(), rhs->_endpoints.end(),
+                               Ice::TargetLess<shared_ptr<EndpointI>>()))
+#else
     if(_endpoints < rhs->_endpoints)
+#endif
     {
         return true;
     }
@@ -1505,7 +1521,7 @@ IceInternal::RoutableReference::clone() const
 }
 
 RequestHandlerPtr
-IceInternal::RoutableReference::getRequestHandler(const Ice::ObjectPrx& proxy) const
+IceInternal::RoutableReference::getRequestHandler(const Ice::ObjectPrxPtr& proxy) const
 {
     return getInstance()->requestHandlerFactory()->getRequestHandler(const_cast<RoutableReference*>(this), proxy);
 }
@@ -1640,7 +1656,7 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal
 
             vector<EndpointIPtr> endpts = endpoints;
             _reference->applyOverrides(endpts);
-            _reference->createConnection(endpts, new Callback2(_reference, _callback, cached));
+            _reference->createConnection(endpts, ICE_MAKE_SHARED(Callback2, _reference, _callback, cached));
         }
 
         virtual void
@@ -1761,15 +1777,22 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all
             virtual void
             setException(const Ice::LocalException& ex)
             {
-                if(!_exception.get())
+                if(!ICE_EXCEPTION_ISSET(_exception))
                 {
-                    _exception.reset(ex.ice_clone());
+                    ICE_RESET_EXCEPTION(_exception, ex.ice_clone());
                 }
 
                 if(++_i == _endpoints.size())
                 {
-                    _callback->setException(*_exception.get());
-                    return;
+                    try
+                    {
+                        ICE_RETHROW_EXCEPTION(_exception);
+                    }
+                    catch(const Ice::LocalException& ee)
+                    {
+                        _callback->setException(ee);
+                        return;
+                    }
                 }
 
                 const bool more = _i != _endpoints.size() - 1;
@@ -1795,7 +1818,11 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all
             const vector<EndpointIPtr> _endpoints;
             const GetConnectionCallbackPtr _callback;
             size_t _i;
+#ifdef ICE_CPP11_MAPPING
+            std::exception_ptr _exception;
+#else
             IceUtil::UniquePtr<Ice::LocalException> _exception;
+#endif
         };
 
         //
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index 0bd3f893909..d1a6c4f5608 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -27,23 +27,31 @@
 #include <Ice/Protocol.h>
 #include <Ice/Properties.h>
 
-namespace IceInternal
+namespace Ice
 {
 
-class BasicStream;
+class OutputStream;
+
+}
+
+namespace IceInternal
+{
 
 class Reference : public IceUtil::Shared
 {
 public:
 
-    class GetConnectionCallback : virtual public IceUtil::Shared
+    class GetConnectionCallback 
+#ifndef ICE_CPP11_MAPPING
+        : public virtual IceUtil::Shared
+#endif
     {
     public:
 
         virtual void setConnection(const Ice::ConnectionIPtr&, bool) = 0;
         virtual void setException(const Ice::LocalException&) = 0;
     };
-    typedef IceUtil::Handle<GetConnectionCallback> GetConnectionCallbackPtr;
+    ICE_DEFINE_PTR(GetConnectionCallbackPtr, GetConnectionCallback);
 
     enum Mode
     {
@@ -95,8 +103,8 @@ public:
 
     virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const = 0;
     virtual ReferencePtr changeAdapterId(const std::string&) const = 0;
-    virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const = 0;
-    virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const = 0;
+    virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const = 0;
+    virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const = 0;
     virtual ReferencePtr changeCollocationOptimized(bool) const = 0;
     virtual ReferencePtr changeLocatorCacheTimeout(int) const = 0;
     virtual ReferencePtr changeCacheConnection(bool) const = 0;
@@ -117,7 +125,7 @@ public:
     //
     // Marshal the reference.
     //
-    virtual void streamWrite(BasicStream*) const;
+    virtual void streamWrite(Ice::OutputStream*) const;
 
     //
     // Convert the reference to its string form.
@@ -132,7 +140,7 @@ public:
     //
     // Get a suitable connection for this reference.
     //
-    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const = 0;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const = 0;
     virtual BatchRequestQueuePtr getBatchRequestQueue() const = 0;
 
     virtual bool operator==(const Reference&) const;
@@ -190,8 +198,8 @@ public:
 
     virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const;
     virtual ReferencePtr changeAdapterId(const std::string&) const;
-    virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const;
-    virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const;
+    virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const;
+    virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const;
     virtual ReferencePtr changeCollocationOptimized(bool) const;
     virtual ReferencePtr changeCacheConnection(bool) const;
     virtual ReferencePtr changePreferSecure(bool) const;
@@ -204,11 +212,11 @@ public:
     virtual bool isIndirect() const;
     virtual bool isWellKnown() const;
 
-    virtual void streamWrite(BasicStream*) const;
+    virtual void streamWrite(Ice::OutputStream*) const;
     virtual std::string toString() const;
     virtual Ice::PropertyDict toProperty(const std::string&) const;
 
-    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const;
     virtual BatchRequestQueuePtr getBatchRequestQueue() const;
 
     virtual bool operator==(const Reference&) const;
@@ -248,8 +256,8 @@ public:
     virtual ReferencePtr changeCompress(bool) const;
     virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const;
     virtual ReferencePtr changeAdapterId(const std::string&) const;
-    virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const;
-    virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const;
+    virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const;
+    virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const;
     virtual ReferencePtr changeCollocationOptimized(bool) const;
     virtual ReferencePtr changeCacheConnection(bool) const;
     virtual ReferencePtr changePreferSecure(bool) const;
@@ -262,7 +270,7 @@ public:
     virtual bool isIndirect() const;
     virtual bool isWellKnown() const;
 
-    virtual void streamWrite(BasicStream*) const;
+    virtual void streamWrite(Ice::OutputStream*) const;
     virtual std::string toString() const;
     virtual Ice::PropertyDict toProperty(const std::string&) const;
 
@@ -272,7 +280,7 @@ public:
 
     virtual ReferencePtr clone() const;
 
-    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const;
     virtual BatchRequestQueuePtr getBatchRequestQueue() const;
 
     void getConnection(const GetConnectionCallbackPtr&) const;
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp
index 8edde75734c..3788324d81d 100644
--- a/cpp/src/Ice/ReferenceFactory.cpp
+++ b/cpp/src/Ice/ReferenceFactory.cpp
@@ -20,7 +20,7 @@
 #include <Ice/LocatorInfo.h>
 #include <Ice/Locator.h>
 #include <Ice/LoggerUtil.h>
-#include <Ice/BasicStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/Properties.h>
 #include <Ice/DefaultsAndOverrides.h>
 #include <Ice/PropertyNames.h>
@@ -155,7 +155,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
     //
     // Parsing the identity may raise IdentityParseException.
     //
-    Identity ident = _instance->stringToIdentity(idstr);
+    Identity ident = Ice::stringToIdentity(idstr);
     if(ident.name.empty())
     {
         //
@@ -586,7 +586,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP
 }
 
 ReferencePtr
-IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
+IceInternal::ReferenceFactory::create(const Identity& ident, InputStream* s)
 {
     //
     // Don't read the identity here. Operations calling this
@@ -626,7 +626,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 
     Ice::ProtocolVersion protocol;
     Ice::EncodingVersion encoding;
-    if(s->getReadEncoding() != Ice::Encoding_1_0)
+    if(s->getEncoding() != Ice::Encoding_1_0)
     {
         s->read(protocol);
         s->read(encoding);
@@ -660,7 +660,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 }
 
 ReferenceFactoryPtr
-IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrx& defaultRouter)
+IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrxPtr& defaultRouter)
 {
     if(defaultRouter == _defaultRouter)
     {
@@ -673,14 +673,14 @@ IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrx& defaultRouter)
     return factory;
 }
 
-RouterPrx
+RouterPrxPtr
 IceInternal::ReferenceFactory::getDefaultRouter() const
 {
     return _defaultRouter;
 }
 
 ReferenceFactoryPtr
-IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrx& defaultLocator)
+IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrxPtr& defaultLocator)
 {
     if(defaultLocator == _defaultLocator)
     {
@@ -693,7 +693,7 @@ IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrx& defaultLocato
     return factory;
 }
 
-LocatorPrx
+LocatorPrxPtr
 IceInternal::ReferenceFactory::getDefaultLocator() const
 {
     return _defaultLocator;
@@ -815,7 +815,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
         string property;
 
         property = propertyPrefix + ".Locator";
-        LocatorPrx locator = LocatorPrx::uncheckedCast(_communicator->propertyToProxy(property));
+        LocatorPrxPtr locator = ICE_UNCHECKED_CAST(LocatorPrx, _communicator->propertyToProxy(property));
         if(locator)
         {
             if(locator->ice_getEncodingVersion() != encoding)
@@ -829,7 +829,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
         }
 
         property = propertyPrefix + ".Router";
-        RouterPrx router = RouterPrx::uncheckedCast(_communicator->propertyToProxy(property));
+        RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, _communicator->propertyToProxy(property));
         if(router)
         {
             if(propertyPrefix.size() > 7 && propertyPrefix.substr(propertyPrefix.size() - 7, 7) == ".Router")
diff --git a/cpp/src/Ice/ReferenceFactory.h b/cpp/src/Ice/ReferenceFactory.h
index de9f8afd047..043126b32f2 100644
--- a/cpp/src/Ice/ReferenceFactory.h
+++ b/cpp/src/Ice/ReferenceFactory.h
@@ -52,13 +52,13 @@ public:
     //
     // Create a reference by unmarshaling it from a stream.
     //
-    ReferencePtr create(const ::Ice::Identity&, BasicStream*);
+    ReferencePtr create(const ::Ice::Identity&, Ice::InputStream*);
 
-    ReferenceFactoryPtr setDefaultRouter(const ::Ice::RouterPrx&);
-    ::Ice::RouterPrx getDefaultRouter() const;
+    ReferenceFactoryPtr setDefaultRouter(const ::Ice::RouterPrxPtr&);
+    ::Ice::RouterPrxPtr getDefaultRouter() const;
 
-    ReferenceFactoryPtr setDefaultLocator(const ::Ice::LocatorPrx&);
-    ::Ice::LocatorPrx getDefaultLocator() const;
+    ReferenceFactoryPtr setDefaultLocator(const ::Ice::LocatorPrxPtr&);
+    ::Ice::LocatorPrxPtr getDefaultLocator() const;
 
 private:
 
@@ -72,8 +72,8 @@ private:
 
     const InstancePtr _instance;
     const ::Ice::CommunicatorPtr _communicator;
-    ::Ice::RouterPrx _defaultRouter;
-    ::Ice::LocatorPrx _defaultLocator;
+    ::Ice::RouterPrxPtr _defaultRouter;
+    ::Ice::LocatorPrxPtr _defaultLocator;
 };
 
 }
diff --git a/cpp/src/Ice/RegisterPluginsInit.cpp b/cpp/src/Ice/RegisterPluginsInit.cpp
index 2d4eadd2cea..181b31c5c0d 100644
--- a/cpp/src/Ice/RegisterPluginsInit.cpp
+++ b/cpp/src/Ice/RegisterPluginsInit.cpp
@@ -16,7 +16,6 @@ extern "C"
 
 Ice::Plugin* createIceUDP(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
 Ice::Plugin* createIceTCP(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
-Ice::Plugin* createStringConverter(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
 
 };
 
@@ -24,5 +23,4 @@ IceInternal::RegisterPluginsInit::RegisterPluginsInit()
 {
     Ice::registerPluginFactory("IceUDP", createIceUDP, true);
     Ice::registerPluginFactory("IceTCP", createIceTCP, true);
-    Ice::registerPluginFactory("IceStringConverter", createStringConverter, false);
 }
diff --git a/cpp/src/Ice/RequestHandler.cpp b/cpp/src/Ice/RequestHandler.cpp
index 563bbdde260..bca8cbb84eb 100644
--- a/cpp/src/Ice/RequestHandler.cpp
+++ b/cpp/src/Ice/RequestHandler.cpp
@@ -13,6 +13,23 @@
 using namespace std;
 using namespace IceInternal;
 
+#ifdef ICE_CPP11_MAPPING
+RetryException::RetryException(std::exception_ptr ex) : _ex(ex)
+{
+}
+
+RetryException::RetryException(const RetryException& ex) : _ex(ex.get())
+{
+}
+
+exception_ptr
+RetryException::get() const
+{
+    assert(_ex);
+    return _ex;
+}
+
+#else
 IceUtil::Shared* IceInternal::upCast(RequestHandler* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(CancellationHandler* p) { return p; }
 
@@ -32,6 +49,7 @@ RetryException::get() const
     assert(_ex.get());
     return _ex.get();
 }
+#endif
 
 RequestHandler::RequestHandler(const ReferencePtr& reference) :
     _reference(reference),
diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h
index 56daa4f06ae..dcad80c2c35 100644
--- a/cpp/src/Ice/RequestHandler.h
+++ b/cpp/src/Ice/RequestHandler.h
@@ -29,8 +29,6 @@ class LocalException;
 namespace IceInternal
 {
 
-class BasicStream;
-
 class OutgoingBase;
 class ProxyOutgoingBase;
 
@@ -38,6 +36,21 @@ class ProxyOutgoingBase;
 // An exception wrapper, which is used to notify that the request
 // handler should be cleared and the invocation retried.
 //
+#ifdef ICE_CPP11_MAPPING
+class RetryException
+{
+public:
+
+    RetryException(std::exception_ptr);
+    RetryException(const RetryException&);
+
+    std::exception_ptr get() const;
+
+private:
+
+    std::exception_ptr _ex;
+};
+#else
 class RetryException
 {
 public:
@@ -51,8 +64,13 @@ private:
 
     IceUtil::UniquePtr<Ice::LocalException> _ex;
 };
+#endif
 
-class CancellationHandler : virtual public IceUtil::Shared
+
+class CancellationHandler
+#ifndef ICE_CPP11_MAPPING
+    : public virtual IceUtil::Shared
+#endif
 {
 public:
 
@@ -63,6 +81,8 @@ public:
 class RequestHandler : public CancellationHandler
 {
 public:
+    
+    RequestHandler(const ReferencePtr&);
 
     virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&) = 0;
 
@@ -76,7 +96,6 @@ public:
 
 protected:
 
-    RequestHandler(const ReferencePtr&);
     const ReferencePtr _reference;
     const bool _response;
 };
diff --git a/cpp/src/Ice/RequestHandlerFactory.cpp b/cpp/src/Ice/RequestHandlerFactory.cpp
index 8a69555b8a4..414d1001220 100644
--- a/cpp/src/Ice/RequestHandlerFactory.cpp
+++ b/cpp/src/Ice/RequestHandlerFactory.cpp
@@ -23,14 +23,14 @@ RequestHandlerFactory::RequestHandlerFactory(const InstancePtr& instance) : _ins
 }
 
 RequestHandlerPtr
-IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr& ref, const Ice::ObjectPrx& proxy)
+IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr& ref, const Ice::ObjectPrxPtr& proxy)
 {
     if(ref->getCollocationOptimized())
     {
         Ice::ObjectAdapterPtr adapter = _instance->objectAdapterFactory()->findObjectAdapter(proxy);
         if(adapter)
         {
-            return proxy->__setRequestHandler(new CollocatedRequestHandler(ref, adapter));
+            return proxy->__setRequestHandler(ICE_MAKE_SHARED(CollocatedRequestHandler, ref, adapter));
         }
     }
 
@@ -42,7 +42,7 @@ IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr
         map<ReferencePtr, ConnectRequestHandlerPtr>::iterator p = _handlers.find(ref);
         if(p == _handlers.end())
         {
-            handler = new ConnectRequestHandler(ref, proxy);
+            handler = ICE_MAKE_SHARED(ConnectRequestHandler, ref, proxy);
             _handlers.insert(make_pair(ref, handler));
             connect = true;
         }
@@ -53,12 +53,16 @@ IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr
     }
     else
     {
-        handler = new ConnectRequestHandler(ref, proxy);
+        handler = ICE_MAKE_SHARED(ConnectRequestHandler, ref, proxy);
         connect = true;
     }
     if(connect)
     {
+#ifdef ICE_CPP11_MAPPING
+        ref->getConnection(handler);
+#else
         ref->getConnection(handler.get());
+#endif
     }
     return proxy->__setRequestHandler(handler->connect(proxy));
 }
diff --git a/cpp/src/Ice/RequestHandlerFactory.h b/cpp/src/Ice/RequestHandlerFactory.h
index 09a370733ef..0e37ff45f40 100644
--- a/cpp/src/Ice/RequestHandlerFactory.h
+++ b/cpp/src/Ice/RequestHandlerFactory.h
@@ -28,7 +28,7 @@ public:
 
     RequestHandlerFactory(const InstancePtr&);
 
-    RequestHandlerPtr getRequestHandler(const RoutableReferencePtr&, const Ice::ObjectPrx&);
+    RequestHandlerPtr getRequestHandler(const RoutableReferencePtr&, const Ice::ObjectPrxPtr&);
     void removeRequestHandler(const ReferencePtr&, const RequestHandlerPtr&);
 
 private:
diff --git a/cpp/src/Ice/ResponseHandler.cpp b/cpp/src/Ice/ResponseHandler.cpp
index a3bd28e5b43..b43c1ad5697 100644
--- a/cpp/src/Ice/ResponseHandler.cpp
+++ b/cpp/src/Ice/ResponseHandler.cpp
@@ -12,9 +12,6 @@
 using namespace std;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(ResponseHandler* obj) { return obj; }
-
-ResponseHandler::~ResponseHandler()
-{
-}
-
+#endif
diff --git a/cpp/src/Ice/ResponseHandler.h b/cpp/src/Ice/ResponseHandler.h
index 1c362975d9a..502af9c556d 100644
--- a/cpp/src/Ice/ResponseHandler.h
+++ b/cpp/src/Ice/ResponseHandler.h
@@ -16,19 +16,23 @@
 #include <Ice/Config.h>
 #include <Ice/LocalException.h>
 #include <Ice/ResponseHandlerF.h>
+#include <Ice/VirtualShared.h>
 
-namespace IceInternal
+namespace Ice
 {
 
-class BasicStream;
+class OutputStream;
+
+}
 
-class ResponseHandler : virtual public ::IceUtil::Shared
+namespace IceInternal
 {
-public:
 
-    virtual ~ResponseHandler();
+class ResponseHandler : public Ice::EnableSharedFromThis<ResponseHandler>
+{
+public:
 
-    virtual void sendResponse(Ice::Int, BasicStream*, Ice::Byte, bool) = 0;
+    virtual void sendResponse(Ice::Int, Ice::OutputStream*, Ice::Byte, bool) = 0;
     virtual void sendNoResponse() = 0;
     virtual bool systemException(Ice::Int, const Ice::SystemException&, bool) = 0;
     virtual void invokeException(Ice::Int, const Ice::LocalException&, int, bool) = 0;
diff --git a/cpp/src/Ice/RetryQueue.cpp b/cpp/src/Ice/RetryQueue.cpp
index c9513f1710c..f74988f65a9 100644
--- a/cpp/src/Ice/RetryQueue.cpp
+++ b/cpp/src/Ice/RetryQueue.cpp
@@ -40,7 +40,7 @@ IceInternal::RetryTask::runTimerTask()
     // (we still need the client thread pool at this point to call
     // exception callbacks with CommunicatorDestroyedException).
     //
-    _queue->remove(this);
+    _queue->remove(ICE_SHARED_FROM_THIS);
 }
 
 void
@@ -52,16 +52,16 @@ IceInternal::RetryTask::requestCanceled(OutgoingBase*, const Ice::LocalException
 void
 IceInternal::RetryTask::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, const Ice::LocalException& ex)
 {
-    if(_queue->cancel(this))
+    if(_queue->cancel(ICE_SHARED_FROM_THIS))
     {
         if(_instance->traceLevels()->retry >= 1)
         {
             Trace out(_instance->initializationData().logger, _instance->traceLevels()->retryCat);
             out << "operation retry canceled\n" << ex;
         }
-        if(_outAsync->completed(ex))
+        if(_outAsync->exception(ex))
         {
-            _outAsync->invokeCompletedAsync();
+            _outAsync->invokeExceptionAsync();
         }
     }
 }
@@ -97,7 +97,7 @@ IceInternal::RetryQueue::add(const ProxyOutgoingAsyncBasePtr& out, int interval)
     {
         throw CommunicatorDestroyedException(__FILE__, __LINE__);
     }
-    RetryTaskPtr task = new RetryTask(_instance, this, out);
+    RetryTaskPtr task = ICE_MAKE_SHARED(RetryTask, _instance, this, out);
     out->cancelable(task); // This will throw if the request is canceled.
     try
     {
diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h
index 1017ac1b5ab..ad19fc6d75f 100644
--- a/cpp/src/Ice/RetryQueue.h
+++ b/cpp/src/Ice/RetryQueue.h
@@ -17,11 +17,14 @@
 #include <Ice/OutgoingAsyncF.h>
 #include <Ice/InstanceF.h>
 #include <Ice/RequestHandler.h> // For CancellationHandler
+#include <Ice/VirtualShared.h>
 
 namespace IceInternal
 {
 
-class RetryTask : public IceUtil::TimerTask, public CancellationHandler
+class RetryTask : public IceUtil::TimerTask,
+                  public CancellationHandler,
+                  public Ice::EnableSharedFromThis<RetryTask>
 {
 public:
 
@@ -43,7 +46,7 @@ private:
     const RetryQueuePtr _queue;
     const ProxyOutgoingAsyncBasePtr _outAsync;
 };
-typedef IceUtil::Handle<RetryTask> RetryTaskPtr;
+ICE_DEFINE_PTR(RetryTaskPtr, RetryTask);
 
 class RetryQueue : public IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
 {
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp
index 97e22d05480..bd4bc46ff43 100644
--- a/cpp/src/Ice/RouterInfo.cpp
+++ b/cpp/src/Ice/RouterInfo.cpp
@@ -30,27 +30,29 @@ void
 IceInternal::RouterManager::destroy()
 {
     IceUtil::Mutex::Lock sync(*this);
-
+#ifdef ICE_CPP11_MAPPING
+    for_each(_table.begin(), _table.end(), [](const pair<shared_ptr<RouterPrx>, RouterInfoPtr> it){ it.second->destroy(); });
+#else
     for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun<const RouterPrx, RouterInfo>(&RouterInfo::destroy));
-
+#endif
     _table.clear();
     _tableHint = _table.end();
 }
 
 RouterInfoPtr
-IceInternal::RouterManager::get(const RouterPrx& rtr)
+IceInternal::RouterManager::get(const RouterPrxPtr& rtr)
 {
     if(!rtr)
     {
         return 0;
     }
 
-    RouterPrx router = RouterPrx::uncheckedCast(rtr->ice_router(0)); // The router cannot be routed.
+    RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, rtr->ice_router(0)); // The router cannot be routed.
 
     IceUtil::Mutex::Lock sync(*this);
 
-    map<RouterPrx, RouterInfoPtr>::iterator p = _table.end();
-    
+    map<RouterPrxPtr, RouterInfoPtr>::iterator p = _table.end();
+
     if(_tableHint != _table.end())
     {
         if(_tableHint->first == router)
@@ -58,7 +60,7 @@ IceInternal::RouterManager::get(const RouterPrx& rtr)
             p = _tableHint;
         }
     }
-    
+
     if(p == _table.end())
     {
         p = _table.find(router);
@@ -66,7 +68,7 @@ IceInternal::RouterManager::get(const RouterPrx& rtr)
 
     if(p == _table.end())
     {
-        _tableHint = _table.insert(_tableHint, pair<const RouterPrx, RouterInfoPtr>(router, new RouterInfo(router)));
+        _tableHint = _table.insert(_tableHint, pair<const RouterPrxPtr, RouterInfoPtr>(router, new RouterInfo(router)));
     }
     else
     {
@@ -77,26 +79,26 @@ IceInternal::RouterManager::get(const RouterPrx& rtr)
 }
 
 RouterInfoPtr
-IceInternal::RouterManager::erase(const RouterPrx& rtr)
+IceInternal::RouterManager::erase(const RouterPrxPtr& rtr)
 {
     RouterInfoPtr info;
     if(rtr)
     {
-        RouterPrx router = RouterPrx::uncheckedCast(rtr->ice_router(0)); // The router cannot be routed.
+        RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, rtr->ice_router(ICE_NULLPTR)); // The router cannot be routed.
         IceUtil::Mutex::Lock sync(*this);
 
-        map<RouterPrx, RouterInfoPtr>::iterator p = _table.end();
+        map<RouterPrxPtr, RouterInfoPtr>::iterator p = _table.end();
         if(_tableHint != _table.end() && _tableHint->first == router)
         {
             p = _tableHint;
             _tableHint = _table.end();
         }
-        
+
         if(p == _table.end())
         {
             p = _table.find(router);
         }
-        
+
         if(p != _table.end())
         {
             info = p->second;
@@ -107,7 +109,7 @@ IceInternal::RouterManager::erase(const RouterPrx& rtr)
     return info;
 }
 
-IceInternal::RouterInfo::RouterInfo(const RouterPrx& router) :
+IceInternal::RouterInfo::RouterInfo(const RouterPrxPtr& router) :
     _router(router)
 {
     assert(_router);
@@ -127,19 +129,31 @@ IceInternal::RouterInfo::destroy()
 bool
 IceInternal::RouterInfo::operator==(const RouterInfo& rhs) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return Ice::targetEquals(_router, rhs._router);
+#else
     return _router == rhs._router;
+#endif
 }
 
 bool
 IceInternal::RouterInfo::operator!=(const RouterInfo& rhs) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return !Ice::targetEquals(_router, rhs._router);
+#else
     return _router != rhs._router;
+#endif
 }
 
 bool
 IceInternal::RouterInfo::operator<(const RouterInfo& rhs) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return Ice::targetLess(_router, rhs._router);
+#else
     return _router < rhs._router;
+#endif
 }
 
 vector<EndpointIPtr>
@@ -157,14 +171,14 @@ IceInternal::RouterInfo::getClientEndpoints()
 }
 
 void
-IceInternal::RouterInfo::getClientProxyResponse(const Ice::ObjectPrx& proxy, 
+IceInternal::RouterInfo::getClientProxyResponse(const Ice::ObjectPrxPtr& proxy,
                                                 const GetClientEndpointsCallbackPtr& callback)
 {
     callback->setEndpoints(setClientEndpoints(proxy));
 }
 
 void
-IceInternal::RouterInfo::getClientProxyException(const Ice::Exception& ex, 
+IceInternal::RouterInfo::getClientProxyException(const Ice::Exception& ex,
                                                  const GetClientEndpointsCallbackPtr& callback)
 {
     callback->setException(dynamic_cast<const Ice::LocalException&>(ex));
@@ -185,10 +199,30 @@ IceInternal::RouterInfo::getClientEndpoints(const GetClientEndpointsCallbackPtr&
         return;
     }
 
-    _router->begin_getClientProxy(newCallback_Router_getClientProxy(this, 
-                                                                    &RouterInfo::getClientProxyResponse, 
+#ifdef ICE_CPP11_MAPPING
+    RouterInfoPtr self = this;
+    _router->getClientProxyAsync(
+        [self, callback](const Ice::ObjectPrxPtr& proxy)
+        {
+            self->getClientProxyResponse(proxy, callback);
+        },
+        [self, callback](exception_ptr e)
+        {
+            try
+            {
+                rethrow_exception(e);
+            }
+            catch(const Ice::Exception& ex)
+            {
+                self->getClientProxyException(ex, callback);
+            }
+        });
+#else
+    _router->begin_getClientProxy(newCallback_Router_getClientProxy(this,
+                                                                    &RouterInfo::getClientProxyResponse,
                                                                     &RouterInfo::getClientProxyException),
                                   callback);
+#endif
 }
 
 vector<EndpointIPtr>
@@ -206,7 +240,7 @@ IceInternal::RouterInfo::getServerEndpoints()
 }
 
 void
-IceInternal::RouterInfo::addProxy(const ObjectPrx& proxy)
+IceInternal::RouterInfo::addProxy(const ObjectPrxPtr& proxy)
 {
     assert(proxy); // Must not be called for null proxies.
 
@@ -240,7 +274,7 @@ IceInternal::RouterInfo::addProxyException(const Ice::Exception& ex, const AddPr
 }
 
 bool
-IceInternal::RouterInfo::addProxy(const Ice::ObjectPrx& proxy, const AddProxyCallbackPtr& callback)
+IceInternal::RouterInfo::addProxy(const Ice::ObjectPrxPtr& proxy, const AddProxyCallbackPtr& callback)
 {
     assert(proxy);
     {
@@ -258,11 +292,32 @@ IceInternal::RouterInfo::addProxy(const Ice::ObjectPrx& proxy, const AddProxyCal
     Ice::ObjectProxySeq proxies;
     proxies.push_back(proxy);
     AddProxyCookiePtr cookie = new AddProxyCookie(callback, proxy);
+
+#ifdef ICE_CPP11_MAPPING
+    RouterInfoPtr self = this;
+    _router->addProxiesAsync(proxies,
+        [self, cookie](const Ice::ObjectProxySeq& proxies)
+        {
+            self->addProxyResponse(proxies, cookie);
+        },
+        [self, cookie](exception_ptr e)
+        {
+            try
+            {
+                rethrow_exception(e);
+            }
+            catch(const Ice::Exception& ex)
+            {
+                self->addProxyException(ex, cookie);
+            }
+        });
+#else
     _router->begin_addProxies(proxies,
-                              newCallback_Router_addProxies(this, 
-                                                            &RouterInfo::addProxyResponse, 
-                                                            &RouterInfo::addProxyException), 
+                              newCallback_Router_addProxies(this,
+                                                            &RouterInfo::addProxyResponse,
+                                                            &RouterInfo::addProxyException),
                               cookie);
+#endif
     return false;
 }
 
@@ -288,7 +343,7 @@ IceInternal::RouterInfo::clearCache(const ReferencePtr& ref)
 }
 
 vector<EndpointIPtr>
-IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrx& proxy)
+IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrxPtr& proxy)
 {
     IceUtil::Mutex::Lock sync(*this);
     if(_clientEndpoints.empty())
@@ -302,7 +357,7 @@ IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrx& proxy)
         }
         else
         {
-            Ice::ObjectPrx clientProxy = proxy->ice_router(0); // The client proxy cannot be routed.
+            Ice::ObjectPrxPtr clientProxy = proxy->ice_router(0); // The client proxy cannot be routed.
 
             //
             // In order to avoid creating a new connection to the router,
@@ -322,12 +377,12 @@ IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrx& proxy)
 
 
 vector<EndpointIPtr>
-IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrx& /*serverProxy*/)
+IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrxPtr& /*serverProxy*/)
 {
     IceUtil::Mutex::Lock sync(*this);
     if(_serverEndpoints.empty()) // Lazy initialization.
     {
-        ObjectPrx serverProxy = _router->getServerProxy();
+        ObjectPrxPtr serverProxy = _router->getServerProxy();
         if(!serverProxy)
         {
             throw NoEndpointException(__FILE__, __LINE__);
@@ -341,12 +396,12 @@ IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrx& /*serverProxy*
 }
 
 void
-IceInternal::RouterInfo::addAndEvictProxies(const Ice::ObjectPrx& proxy, const Ice::ObjectProxySeq& evictedProxies)
+IceInternal::RouterInfo::addAndEvictProxies(const Ice::ObjectPrxPtr& proxy, const Ice::ObjectProxySeq& evictedProxies)
 {
     IceUtil::Mutex::Lock sync(*this);
 
     //
-    // Check if the proxy hasn't already been evicted by a concurrent addProxies call. 
+    // Check if the proxy hasn't already been evicted by a concurrent addProxies call.
     // If it's the case, don't add it to our local map.
     //
     multiset<Identity>::iterator p = _evictedIdentities.find(proxy->ice_getIdentity());
@@ -362,7 +417,7 @@ IceInternal::RouterInfo::addAndEvictProxies(const Ice::ObjectPrx& proxy, const I
         //
         _identities.insert(proxy->ice_getIdentity());
     }
-    
+
     //
     // We also must remove whatever proxies the router evicted.
     //
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h
index b5408d01ece..b7f7821d13d 100644
--- a/cpp/src/Ice/RouterInfo.h
+++ b/cpp/src/Ice/RouterInfo.h
@@ -10,15 +10,16 @@
 #ifndef ICE_ROUTER_INFO_H
 #define ICE_ROUTER_INFO_H
 
-#include <IceUtil/Shared.h>
 #include <IceUtil/Mutex.h>
 #include <Ice/RouterInfoF.h>
-#include <Ice/RouterF.h>
+#include <Ice/Router.h>
 #include <Ice/ProxyF.h>
 #include <Ice/ReferenceF.h>
 #include <Ice/EndpointIF.h>
 #include <Ice/BuiltinSequences.h>
 #include <Ice/Identity.h>
+#include <Ice/Comparable.h>
+#include <Ice/VirtualShared.h>
 
 #include <set>
 
@@ -37,38 +38,46 @@ public:
     // Returns router info for a given router. Automatically creates
     // the router info if it doesn't exist yet.
     //
-    RouterInfoPtr get(const Ice::RouterPrx&);
-    RouterInfoPtr erase(const Ice::RouterPrx&);
+    RouterInfoPtr get(const Ice::RouterPrxPtr&);
+    RouterInfoPtr erase(const Ice::RouterPrxPtr&);
 
 private:
 
-    std::map<Ice::RouterPrx, RouterInfoPtr> _table;
-    std::map<Ice::RouterPrx, RouterInfoPtr>::iterator _tableHint;
+#ifdef ICE_CPP11_MAPPING
+    using RouterTableMap = std::map<std::shared_ptr<Ice::RouterPrx>,
+    RouterInfoPtr,
+                                    Ice::TargetLess<std::shared_ptr<::Ice::RouterPrx>>>;
+#else
+    typedef std::map<Ice::RouterPrxPtr, RouterInfoPtr> RouterTableMap;
+#endif
+
+    RouterTableMap _table;
+    RouterTableMap::iterator _tableHint;
 };
 
 class RouterInfo : public IceUtil::Shared, public IceUtil::Mutex
 {
 public:
 
-    class GetClientEndpointsCallback : virtual public Ice::LocalObject
+    class GetClientEndpointsCallback : public virtual Ice::LocalObject
     {
     public:
-        
+
         virtual void setEndpoints(const std::vector<EndpointIPtr>&) = 0;
         virtual void setException(const Ice::LocalException&) = 0;
     };
     typedef IceUtil::Handle<GetClientEndpointsCallback> GetClientEndpointsCallbackPtr;
 
-    class AddProxyCallback : virtual public IceUtil::Shared
+    class AddProxyCallback : public Ice::EnableSharedFromThis<AddProxyCallback>
     {
     public:
-        
+
         virtual void addedProxy() = 0;
         virtual void setException(const Ice::LocalException&) = 0;
     };
-    typedef IceUtil::Handle<AddProxyCallback> AddProxyCallbackPtr; 
+    ICE_DEFINE_PTR(AddProxyCallbackPtr, AddProxyCallback);
 
-    RouterInfo(const Ice::RouterPrx&);
+    RouterInfo(const Ice::RouterPrxPtr&);
 
     void destroy();
 
@@ -76,50 +85,50 @@ public:
     bool operator!=(const RouterInfo&) const;
     bool operator<(const RouterInfo&) const;
 
-    const Ice::RouterPrx& getRouter() const
+    const Ice::RouterPrxPtr& getRouter() const
     {
         //
         // No mutex lock necessary, _router is immutable.
         //
         return _router;
     }
-    void getClientProxyResponse(const Ice::ObjectPrx&, const GetClientEndpointsCallbackPtr&);
+    void getClientProxyResponse(const Ice::ObjectPrxPtr&, const GetClientEndpointsCallbackPtr&);
     void getClientProxyException(const Ice::Exception&, const GetClientEndpointsCallbackPtr&);
     std::vector<EndpointIPtr> getClientEndpoints();
     void getClientEndpoints(const GetClientEndpointsCallbackPtr&);
     std::vector<EndpointIPtr> getServerEndpoints();
-    
+
     class AddProxyCookie : public Ice::LocalObject
     {
     public:
-        
-        AddProxyCookie(const AddProxyCallbackPtr cb, const Ice::ObjectPrx& proxy) :
+
+        AddProxyCookie(const AddProxyCallbackPtr cb, const Ice::ObjectPrxPtr& proxy) :
             _cb(cb),
             _proxy(proxy)
         {
         }
-        
+
         AddProxyCallbackPtr cb() const
         {
             return _cb;
         }
-        
-        Ice::ObjectPrx proxy() const
+
+        Ice::ObjectPrxPtr proxy() const
         {
             return _proxy;
         }
-        
+
     private:
-        
+
         const AddProxyCallbackPtr _cb;
-        const Ice::ObjectPrx _proxy;
+        const Ice::ObjectPrxPtr _proxy;
     };
     typedef IceUtil::Handle<AddProxyCookie> AddProxyCookiePtr;
-    
+
     void addProxyResponse(const Ice::ObjectProxySeq&, const AddProxyCookiePtr&);
     void addProxyException(const Ice::Exception&, const AddProxyCookiePtr&);
-    void addProxy(const Ice::ObjectPrx&);
-    bool addProxy(const Ice::ObjectPrx&, const AddProxyCallbackPtr&);
+    void addProxy(const Ice::ObjectPrxPtr&);
+    bool addProxy(const Ice::ObjectPrxPtr&, const AddProxyCallbackPtr&);
 
     void setAdapter(const Ice::ObjectAdapterPtr&);
     Ice::ObjectAdapterPtr getAdapter() const;
@@ -129,13 +138,13 @@ public:
     //
     // The following methods need to be public for access by AMI callbacks.
     //
-    std::vector<EndpointIPtr> setClientEndpoints(const Ice::ObjectPrx&);
-    std::vector<EndpointIPtr> setServerEndpoints(const Ice::ObjectPrx&);
-    void addAndEvictProxies(const Ice::ObjectPrx&, const Ice::ObjectProxySeq&);
+    std::vector<EndpointIPtr> setClientEndpoints(const Ice::ObjectPrxPtr&);
+    std::vector<EndpointIPtr> setServerEndpoints(const Ice::ObjectPrxPtr&);
+    void addAndEvictProxies(const Ice::ObjectPrxPtr&, const Ice::ObjectProxySeq&);
 
 private:
 
-    const Ice::RouterPrx _router;
+    const Ice::RouterPrxPtr _router;
     std::vector<EndpointIPtr> _clientEndpoints;
     std::vector<EndpointIPtr> _serverEndpoints;
     Ice::ObjectAdapterPtr _adapter;
diff --git a/cpp/src/IceUtil/SHA1.cpp b/cpp/src/Ice/SHA1.cpp
index 4373afa15f8..4373afa15f8 100644
--- a/cpp/src/IceUtil/SHA1.cpp
+++ b/cpp/src/Ice/SHA1.cpp
diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp
index af568dccac7..bc35aff816f 100644
--- a/cpp/src/Ice/Selector.cpp
+++ b/cpp/src/Ice/Selector.cpp
@@ -22,98 +22,13 @@
 using namespace std;
 using namespace IceInternal;
 
-#ifdef ICE_OS_WINRT
-using namespace Windows::Foundation;
+#if defined(ICE_OS_WINRT)
 using namespace Windows::Storage::Streams;
 using namespace Windows::Networking;
 using namespace Windows::Networking::Sockets;
+#endif
 
-Selector::Selector(const InstancePtr& instance) : _instance(instance)
-{
-}
-
-void
-Selector::destroy()
-{
-}
-
-void
-Selector::initialize(IceInternal::EventHandler* handler)
-{
-    EventHandlerPtr h = handler;
-    handler->__incRef();
-    handler->getNativeInfo()->setCompletedHandler(
-        ref new SocketOperationCompletedHandler([=](int operation)
-                                                {
-                                                    //
-                                                    // Use the reference counted handler to ensure it's not
-                                                    // destroyed as long as the callback lambda exists.
-                                                    //
-                                                    completed(h, static_cast<SocketOperation>(operation));
-                                                }));
-}
-
-void
-Selector::update(IceInternal::EventHandler* handler, SocketOperation remove, SocketOperation add)
-{
-    handler->_registered = static_cast<SocketOperation>(handler->_registered & ~remove);
-    handler->_registered = static_cast<SocketOperation>(handler->_registered | add);
-    if(add & SocketOperationRead && !(handler->_pending & SocketOperationRead))
-    {
-        handler->_pending = static_cast<SocketOperation>(handler->_pending | SocketOperationRead);
-        completed(handler, SocketOperationRead); // Start an asynchrnous read
-    }
-    else if(add & SocketOperationWrite && !(handler->_pending & SocketOperationWrite))
-    {
-        handler->_pending = static_cast<SocketOperation>(handler->_pending | SocketOperationWrite);
-        completed(handler, SocketOperationWrite); // Start an asynchrnous write
-    }
-}
-
-void
-Selector::finish(IceInternal::EventHandler* handler)
-{
-    handler->_registered = SocketOperationNone;
-    handler->_finish = false; // Ensures that finished() is only called once on the event handler.
-    handler->__decRef();
-}
-
-IceInternal::EventHandlerPtr
-Selector::getNextHandler(SocketOperation& status, int timeout)
-{
-    Lock lock(*this);
-    while(_events.empty())
-    {
-        if(timeout > 0)
-        {
-            timedWait(IceUtil::Time::seconds(timeout));
-            if(_events.empty())
-            {
-                throw SelectorTimeoutException();
-            }
-        }
-        else
-        {
-            wait();
-        }
-    }
-    assert(!_events.empty());
-    IceInternal::EventHandlerPtr handler = _events.front().handler;
-    const SelectEvent& event = _events.front();
-    status = event.status;
-    _events.pop_front();
-    return handler;
-}
-
-void
-Selector::completed(const IceInternal::EventHandlerPtr& handler, SocketOperation op)
-{
-    Lock lock(*this);
-    _events.push_back(SelectEvent(handler, op));
-    notify();
-}
-
-#elif defined(ICE_USE_IOCP)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
 
 Selector::Selector(const InstancePtr& instance) : _instance(instance)
 {
@@ -123,6 +38,7 @@ Selector::~Selector()
 {
 }
 
+#ifdef ICE_USE_IOCP
 void
 Selector::setup(int sizeIO)
 {
@@ -134,16 +50,24 @@ Selector::setup(int sizeIO)
         throw ex;
     }
 }
+#endif
 
 void
 Selector::destroy()
 {
+#ifdef ICE_USE_IOCP
     CloseHandle(_handle);
+#endif
 }
 
 void
 Selector::initialize(EventHandler* handler)
 {
+    if(!handler->getNativeInfo())
+    {
+        return;
+    }
+#ifdef ICE_USE_IOCP
     HANDLE socket = reinterpret_cast<HANDLE>(handler->getNativeInfo()->fd());
     if(CreateIoCompletionPort(socket, _handle, reinterpret_cast<ULONG_PTR>(handler), 0) == NULL)
     {
@@ -151,8 +75,24 @@ Selector::initialize(EventHandler* handler)
         ex.error = GetLastError();
         throw ex;
     }
-    handler->__incRef();
     handler->getNativeInfo()->initialize(_handle, reinterpret_cast<ULONG_PTR>(handler));
+#else
+#   ifdef ICE_CPP11_MAPPING
+    EventHandlerPtr h = dynamic_pointer_cast<EventHandler>(handler->shared_from_this());
+#   else
+    EventHandlerPtr h = handler;
+#   endif
+    handler->getNativeInfo()->setCompletedHandler(
+        ref new SocketOperationCompletedHandler(
+            [=](int operation)
+            {
+                //
+                // Use the reference counted handler to ensure it's not
+                // destroyed as long as the callback lambda exists.
+                //
+                completed(h.get(), static_cast<SocketOperation>(operation));
+            }));
+#endif
 }
 
 void
@@ -160,26 +100,15 @@ Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation
 {
     handler->_registered = static_cast<SocketOperation>(handler->_registered & ~remove);
     handler->_registered = static_cast<SocketOperation>(handler->_registered | add);
-    AsyncInfo* info = 0;
     if(add & SocketOperationRead && !(handler->_pending & SocketOperationRead))
     {
         handler->_pending = static_cast<SocketOperation>(handler->_pending | SocketOperationRead);
-        info = handler->getNativeInfo()->getAsyncInfo(SocketOperationRead);
+        completed(handler, SocketOperationRead); // Start an asynchrnous read
     }
     else if(add & SocketOperationWrite && !(handler->_pending & SocketOperationWrite))
     {
         handler->_pending = static_cast<SocketOperation>(handler->_pending | SocketOperationWrite);
-        info = handler->getNativeInfo()->getAsyncInfo(SocketOperationWrite);
-    }
-
-    if(info)
-    {
-        if(!PostQueuedCompletionStatus(_handle, 0, reinterpret_cast<ULONG_PTR>(handler), info))
-        {
-            Ice::SocketException ex(__FILE__, __LINE__);
-            ex.error = GetLastError();
-            throw ex;
-        }
+        completed(handler, SocketOperationWrite); // Start an asynchrnous write
     }
 }
 
@@ -187,12 +116,35 @@ void
 Selector::finish(IceInternal::EventHandler* handler)
 {
     handler->_registered = SocketOperationNone;
-    handler->__decRef();
+    handler->_finish = false; // Ensures that finished() is only called once on the event handler.
+}
+
+void
+Selector::ready(EventHandler* handler, SocketOperation status, bool value)
+{
+    if(((handler->_ready & status) != 0) == value)
+    {
+        return; // Nothing to do if ready state already correctly set.
+    }
+
+    if(value)
+    {
+        handler->_ready = static_cast<SocketOperation>(handler->_ready | status);
+    }
+    else
+    {
+        handler->_ready = static_cast<SocketOperation>(handler->_ready & ~status);
+    }
 }
 
 EventHandler*
+#ifdef ICE_USE_IOCP
 Selector::getNextHandler(SocketOperation& status, DWORD& count, int& error, int timeout)
+#else
+Selector::getNextHandler(SocketOperation& status, int timeout)
+#endif
 {
+#ifdef ICE_USE_IOCP
     ULONG_PTR key;
     LPOVERLAPPED ol;
     error = 0;
@@ -217,24 +169,86 @@ Selector::getNextHandler(SocketOperation& status, DWORD& count, int& error, int
             }
         }
         AsyncInfo* info = static_cast<AsyncInfo*>(ol);
-        status = info->status;
+        if(info)
+        {
+            status = info->status;
+        }
         count = SOCKET_ERROR;
         error = WSAGetLastError();
         return reinterpret_cast<EventHandler*>(key);
     }
 
-    assert(ol);
     AsyncInfo* info = static_cast<AsyncInfo*>(ol);
-    status = info->status;
+    if(info)
+    {
+        status = info->status;
+    }
+    else
+    {
+        status = reinterpret_cast<EventHandler*>(key)->_ready;
+    }
     return reinterpret_cast<EventHandler*>(key);
+#else
+    IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+    while(_events.empty())
+    {
+        if(timeout > 0)
+        {
+            _monitor.timedWait(IceUtil::Time::seconds(timeout));
+            if(_events.empty())
+            {
+                throw SelectorTimeoutException();
+            }
+        }
+        else
+        {
+            _monitor.wait();
+        }
+    }
+    assert(!_events.empty());
+    IceInternal::EventHandlerPtr handler = _events.front().handler;
+    const SelectEvent& event = _events.front();
+    status = event.status;
+    _events.pop_front();
+    return handler.get();
+#endif
 }
 
-#elif defined(ICE_USE_KQUEUE) || defined(ICE_USE_EPOLL)
+void
+Selector::completed(EventHandler* handler, SocketOperation op)
+{
+#ifdef ICE_USE_IOCP
+    AsyncInfo* info = 0;
+    NativeInfoPtr nativeInfo = handler->getNativeInfo();
+    if(nativeInfo)
+    {
+        info = nativeInfo->getAsyncInfo(op);
+    }
+    if(!PostQueuedCompletionStatus(_handle, 0, reinterpret_cast<ULONG_PTR>(handler), info))
+    {
+        Ice::SocketException ex(__FILE__, __LINE__);
+        ex.error = GetLastError();
+        throw ex;
+    }
+#else
+    IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+    _events.push_back(SelectEvent(std::dynamic_pointer_cast<EventHandler>(handler->shared_from_this()), op));
+    _monitor.notify();
+#endif
+}
 
-Selector::Selector(const InstancePtr& instance) : _instance(instance)
+#elif defined(ICE_USE_KQUEUE) || defined(ICE_USE_EPOLL) || defined(ICE_USE_SELECT) || defined(ICE_USE_POLL)
+
+Selector::Selector(const InstancePtr& instance) : _instance(instance), _interrupted(false)
 {
-    _events.resize(256);
+    SOCKET fds[2];
+    createPipe(fds);
+    _fdIntrRead = fds[0];
+    _fdIntrWrite = fds[1];
+    _selecting = false;
+
 #if defined(ICE_USE_EPOLL)
+    _events.resize(256);
     _queueFd = epoll_create(1);
     if(_queueFd < 0)
     {
@@ -242,7 +256,18 @@ Selector::Selector(const InstancePtr& instance) : _instance(instance)
         ex.error = IceInternal::getSocketErrno();
         throw ex;
     }
-#else
+
+    epoll_event event;
+    memset(&event, 0, sizeof(epoll_event));
+    event.data.ptr = 0;
+    event.events = EPOLLIN;
+    if(epoll_ctl(_queueFd, EPOLL_CTL_ADD, _fdIntrRead, &event) != 0)
+    {
+        Ice::Error out(_instance->initializationData().logger);
+        out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
+    }
+#elif defined(ICE_USE_KQUEUE)
+    _events.resize(256);
     _queueFd = kqueue();
     if(_queueFd < 0)
     {
@@ -250,7 +275,25 @@ Selector::Selector(const InstancePtr& instance) : _instance(instance)
         ex.error = getSocketErrno();
         throw ex;
     }
-    _selecting = false;
+
+    struct kevent ev;
+    EV_SET(&ev, _fdIntrRead, EVFILT_READ, EV_ADD, 0, 0, 0);
+    int rs = kevent(_queueFd, &ev, 1, 0, 0, 0);
+    if(rs < 0)
+    {
+        Ice::Error out(_instance->initializationData().logger);
+        out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
+    }
+#elif defined(ICE_USE_SELECT)
+    FD_ZERO(&_readFdSet);
+    FD_ZERO(&_writeFdSet);
+    FD_ZERO(&_errorFdSet);
+    FD_SET(_fdIntrRead, &_readFdSet);
+#else
+    struct pollfd pollFd;
+    pollFd.fd = _fdIntrRead;
+    pollFd.events = POLLIN;
+    _pollFdSet.push_back(pollFd);
 #endif
 }
 
@@ -261,6 +304,7 @@ Selector::~Selector()
 void
 Selector::destroy()
 {
+#if defined(ICE_USE_KQUEUE) || defined(ICE_USE_EPOLL)
     try
     {
         closeSocket(_queueFd);
@@ -270,6 +314,27 @@ Selector::destroy()
         Ice::Error out(_instance->initializationData().logger);
         out << "exception in selector while calling closeSocket():\n" << ex;
     }
+#endif
+
+    try
+    {
+        closeSocket(_fdIntrWrite);
+    }
+    catch(const Ice::LocalException& ex)
+    {
+        Ice::Error out(_instance->initializationData().logger);
+        out << "exception in selector while calling closeSocket():\n" << ex;
+    }
+
+    try
+    {
+        closeSocket(_fdIntrRead);
+    }
+    catch(const Ice::LocalException& ex)
+    {
+        Ice::Error out(_instance->initializationData().logger);
+        out << "exception in selector while calling closeSocket():\n" << ex;
+    }
 }
 
 void
@@ -282,9 +347,16 @@ Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation
     {
         return;
     }
+    checkReady(handler);
+
+    NativeInfoPtr nativeInfo = handler->getNativeInfo();
+    if(!nativeInfo || nativeInfo->fd() == INVALID_SOCKET)
+    {
+        return;
+    }
 
-    SOCKET fd = handler->getNativeInfo()->fd();
 #if defined(ICE_USE_EPOLL)
+    SOCKET fd = nativeInfo->fd();
     epoll_event event;
     memset(&event, 0, sizeof(epoll_event));
     event.data.ptr = handler;
@@ -318,7 +390,8 @@ Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation
         Ice::Error out(_instance->initializationData().logger);
         out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
     }
-#else // ICE_USE_KQUEUE
+#elif defined(ICE_USE_KQUEUE)
+    SOCKET fd = nativeInfo->fd();
     if(remove & SocketOperationRead)
     {
         struct kevent ev;
@@ -349,7 +422,11 @@ Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation
     {
         updateSelector();
     }
+#else
+    _changes.push_back(make_pair(handler, static_cast<SocketOperation>(handler->_registered & ~handler->_disabled)));
+    wakeup();
 #endif
+    checkReady(handler);
 }
 
 void
@@ -360,11 +437,18 @@ Selector::enable(EventHandler* handler, SocketOperation status)
         return;
     }
     handler->_disabled = static_cast<SocketOperation>(handler->_disabled & ~status);
+    checkReady(handler);
+
+    NativeInfoPtr nativeInfo = handler->getNativeInfo();
+    if(!nativeInfo || nativeInfo->fd() == INVALID_SOCKET)
+    {
+        return;
+    }
 
     if(handler->_registered & status)
     {
-        SOCKET fd = handler->getNativeInfo()->fd();
 #if defined(ICE_USE_EPOLL)
+        SOCKET fd = nativeInfo->fd();
         SocketOperation previous = static_cast<SocketOperation>(handler->_registered & ~(handler->_disabled | status));
         SocketOperation newStatus = static_cast<SocketOperation>(handler->_registered & ~handler->_disabled);
         epoll_event event;
@@ -377,14 +461,18 @@ Selector::enable(EventHandler* handler, SocketOperation status)
             Ice::Error out(_instance->initializationData().logger);
             out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
         }
-#else // ICE_USE_KQUEUE
+#elif defined(ICE_USE_KQUEUE)
         struct kevent ev;
+        SOCKET fd = handler->getNativeInfo()->fd();
         EV_SET(&ev, fd, status == SocketOperationRead ? EVFILT_READ : EVFILT_WRITE, EV_ENABLE, 0, 0, handler);
         _changes.push_back(ev);
         if(_selecting)
         {
             updateSelector();
         }
+#else
+        _changes.push_back(make_pair(handler, static_cast<SocketOperation>(handler->_registered & ~handler->_disabled)));
+        wakeup();
 #endif
     }
 }
@@ -397,11 +485,18 @@ Selector::disable(EventHandler* handler, SocketOperation status)
         return;
     }
     handler->_disabled = static_cast<SocketOperation>(handler->_disabled | status);
+    checkReady(handler);
+
+    NativeInfoPtr nativeInfo = handler->getNativeInfo();
+    if(!nativeInfo || nativeInfo->fd() == INVALID_SOCKET)
+    {
+        return;
+    }
 
     if(handler->_registered & status)
     {
-        SOCKET fd = handler->getNativeInfo()->fd();
 #if defined(ICE_USE_EPOLL)
+        SOCKET fd = nativeInfo->fd();
         SocketOperation newStatus = static_cast<SocketOperation>(handler->_registered & ~handler->_disabled);
         epoll_event event;
         memset(&event, 0, sizeof(epoll_event));
@@ -413,7 +508,8 @@ Selector::disable(EventHandler* handler, SocketOperation status)
             Ice::Error out(_instance->initializationData().logger);
             out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
         }
-#else // ICE_USE_KQUEUE
+#elif defined(ICE_USE_KQUEUE)
+        SOCKET fd = nativeInfo->fd();
         struct kevent ev;
         EV_SET(&ev, fd, status == SocketOperationRead ? EVFILT_READ : EVFILT_WRITE, EV_DISABLE, 0, 0, handler);
         _changes.push_back(ev);
@@ -421,6 +517,9 @@ Selector::disable(EventHandler* handler, SocketOperation status)
         {
             updateSelector();
         }
+#else
+        _changes.push_back(make_pair(handler, static_cast<SocketOperation>(handler->_registered & ~handler->_disabled)));
+        wakeup();
 #endif
     }
 }
@@ -431,7 +530,11 @@ Selector::finish(EventHandler* handler, bool closeNow)
     if(handler->_registered)
     {
         update(handler, handler->_registered, SocketOperationNone);
+#if !defined(ICE_USE_EPOLL) && !defined(ICE_USE_KQUEUE)
+        return false; // Don't close now if selecting
+#endif
     }
+
 #if defined(ICE_USE_KQUEUE)
     if(closeNow && !_changes.empty())
     {
@@ -442,47 +545,275 @@ Selector::finish(EventHandler* handler, bool closeNow)
         //
         updateSelector();
     }
+#elif !defined(ICE_USE_EPOLL)
+    if(!_changes.empty())
+    {
+        return false;
+    }
 #endif
+
     return closeNow;
 }
 
-#if defined(ICE_USE_KQUEUE)
 void
-Selector::updateSelector()
+Selector::ready(EventHandler* handler, SocketOperation status, bool value)
 {
-    int rs = kevent(_queueFd, &_changes[0], _changes.size(), 0, 0, 0);
-    if(rs < 0)
+    if(((handler->_ready & status) != 0) == value)
     {
-        Ice::Error out(_instance->initializationData().logger);
-        out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
+        return; // Nothing to do if ready state already correctly set.
+    }
+
+    if(value)
+    {
+        handler->_ready = static_cast<SocketOperation>(handler->_ready | status);
+    }
+    else
+    {
+        handler->_ready = static_cast<SocketOperation>(handler->_ready & ~status);
+    }
+    checkReady(handler);
+}
+
+void
+Selector::wakeup()
+{
+    if(_selecting && !_interrupted)
+    {
+        char c = 0;
+        while(true)
+        {
+            if(::write(_fdIntrWrite, &c, 1) == SOCKET_ERROR)
+            {
+                if(interrupted())
+                {
+                    continue;
+                }
+
+                Ice::SocketException ex(__FILE__, __LINE__);
+                ex.error = IceInternal::getSocketErrno();
+                throw ex;
+            }
+            break;
+        }
+        _interrupted = true;
     }
-    _changes.clear();
 }
+
+void
+Selector::startSelect()
+{
+    if(_interrupted)
+    {
+        char c;
+        while(true)
+        {
+            ssize_t ret = ::read(_fdIntrRead, &c, 1);
+            if(ret == SOCKET_ERROR)
+            {
+                if(interrupted())
+                {
+                    continue;
+                }
+                Ice::SocketException ex(__FILE__, __LINE__);
+                ex.error = IceInternal::getSocketErrno();
+                throw ex;
+            }
+            break;
+        }
+        _interrupted = false;
+    }
+
+#if !defined(ICE_USE_EPOLL)
+    if(!_changes.empty())
+    {
+        updateSelector();
+    }
 #endif
+    _selecting = true;
+
+    //
+    // If there are ready handlers, don't block in select, just do a non-blocking
+    // select to retrieve new ready handlers from the Java selector.
+    //
+    _selectNow = !_readyHandlers.empty();
+}
 
 void
-Selector::select(vector<pair<EventHandler*, SocketOperation> >& handlers, int timeout)
+Selector::finishSelect(vector<pair<EventHandler*, SocketOperation> >& handlers)
 {
-    int ret = 0;
-    while(true)
+    _selecting = false;
+
+    assert(handlers.empty());
+
+#if defined(ICE_USE_POLL) || defined(ICE_USE_SELECT)
+    if(_interrupted) // Interrupted, we have to process the interrupt before returning any handlers
     {
+        return;
+    }
+#endif
+
+#if defined(ICE_USE_POLL)
+    for(vector<struct pollfd>::const_iterator r = _pollFdSet.begin(); r != _pollFdSet.end(); ++r)
+#else
+    for(int i = 0; i < _count; ++i)
+#endif
+    {
+        pair<EventHandler*, SocketOperation> p;
+
 #if defined(ICE_USE_EPOLL)
-        ret = epoll_wait(_queueFd, &_events[0], _events.size(), timeout > 0 ? timeout * 1000 : -1);
+        struct epoll_event& ev = _events[i];
+        p.first = reinterpret_cast<EventHandler*>(ev.data.ptr);
+        p.second = static_cast<SocketOperation>(((ev.events & (EPOLLIN | EPOLLERR)) ?
+                                                 SocketOperationRead : SocketOperationNone) |
+                                                ((ev.events & (EPOLLOUT | EPOLLERR)) ?
+                                                 SocketOperationWrite : SocketOperationNone));
+#elif defined(ICE_USE_KQUEUE)
+        struct kevent& ev = _events[i];
+        if(ev.flags & EV_ERROR)
+        {
+            Ice::Error out(_instance->initializationData().logger);
+            out << "selector returned error:\n" << IceUtilInternal::errorToString(ev.data);
+            continue;
+        }
+        p.first = reinterpret_cast<EventHandler*>(ev.udata);
+        p.second = (ev.filter == EVFILT_READ) ? SocketOperationRead : SocketOperationWrite;
+#elif defined(ICE_USE_SELECT)
+        //
+        // Round robin for the filedescriptors.
+        //
+        SOCKET fd;
+        p.second = SocketOperationNone;
+        if(i < _selectedReadFdSet.fd_count)
+        {
+            fd = _selectedReadFdSet.fd_array[i];
+            p.second = static_cast<SocketOperation>(p.second | SocketOperationRead);
+        }
+        else if(i < _selectedWriteFdSet.fd_count + _selectedReadFdSet.fd_count)
+        {
+            fd = _selectedWriteFdSet.fd_array[i - _selectedReadFdSet.fd_count];
+            p.second = static_cast<SocketOperation>(p.second | SocketOperationWrite);
+        }
+        else
+        {
+            fd = _selectedErrorFdSet.fd_array[i - _selectedReadFdSet.fd_count - _selectedWriteFdSet.fd_count];
+            p.second = static_cast<SocketOperation>(p.second | SocketOperationConnect);
+        }
+
+        assert(fd != _fdIntrRead);
+        p.first = _handlers[fd];
+#else
+        if(r->revents == 0)
+        {
+            continue;
+        }
+
+        SOCKET fd = r->fd;
+        assert(_handlers.find(fd) != _handlers.end());
+        p.first = _handlers[fd];
+        p.second = SocketOperationNone;
+        if(r->revents & (POLLIN | POLLERR | POLLHUP))
+        {
+            p.second = static_cast<SocketOperation>(p.second | SocketOperationRead);
+        }
+        if(r->revents & (POLLOUT | POLLERR | POLLHUP))
+        {
+            p.second = static_cast<SocketOperation>(p.second | SocketOperationWrite);
+        }
+        assert(p.second);
+#endif
+        if(!p.first)
+        {
+            continue; // Interrupted
+        }
+
+#ifdef ICE_CPP11_MAPPING
+        map<EventHandlerPtr, SocketOperation>::iterator q = _readyHandlers.find(
+            dynamic_pointer_cast<EventHandler>(p.first->shared_from_this()));
 #else
+        map<EventHandlerPtr, SocketOperation>::iterator q = _readyHandlers.find(p.first);
+#endif
+        if(q != _readyHandlers.end()) // Handler will be added by the loop below
+        {
+            q->second = p.second; // We just remember which operations are ready here.
+        }
+        else
+        {
+            handlers.push_back(p);
+        }
+    }
+
+    for(map<EventHandlerPtr, SocketOperation>::iterator q = _readyHandlers.begin(); q != _readyHandlers.end(); ++q)
+    {
+        pair<EventHandler*, SocketOperation> p;
+        p.first = q->first.get();
+        p.second = static_cast<SocketOperation>(p.first->_ready & ~p.first->_disabled & p.first->_registered);
+        p.second = static_cast<SocketOperation>(p.second | q->second);
+        if(p.second)
+        {
+            handlers.push_back(p);
+        }
+
+        //
+        // Reset the operation, it's only used by this method to temporarly store the socket status
+        // return by the select operation above.
+        //
+        q->second = SocketOperationNone;
+    }
+}
+
+void
+Selector::select(int timeout)
+{
+    if(_selectNow)
+    {
+        timeout = 0;
+    }
+    else if(timeout > 0)
+    {
+        timeout = timeout * 1000;
+    }
+    else
+    {
+        timeout = -1;
+    }
+
+    while(true)
+    {
+#if defined(ICE_USE_EPOLL)
+        _count = epoll_wait(_queueFd, &_events[0], _events.size(), timeout);
+#elif defined(ICE_USE_KQUEUE)
         assert(!_events.empty());
-        if(timeout > 0)
+        if(timeout >= 0)
         {
             struct timespec ts;
             ts.tv_sec = timeout;
             ts.tv_nsec = 0;
-            ret = kevent(_queueFd, 0, 0, &_events[0], _events.size(), &ts);
+            _count = kevent(_queueFd, 0, 0, &_events[0], _events.size(), &ts);
         }
         else
         {
-            ret = kevent(_queueFd, 0, 0, &_events[0], _events.size(), 0);
+            _count = kevent(_queueFd, 0, 0, &_events[0], _events.size(), 0);
         }
+#elif defined(ICE_USE_SELECT)
+        fd_set* rFdSet = fdSetCopy(_selectedReadFdSet, _readFdSet);
+        fd_set* wFdSet = fdSetCopy(_selectedWriteFdSet, _writeFdSet);
+        fd_set* eFdSet = fdSetCopy(_selectedErrorFdSet, _errorFdSet);
+        if(timeout >= 0)
+        {
+            struct timeval tv;
+            tv.tv_sec = timeout;
+            tv.tv_usec = 0;
+            _count = ::select(0, rFdSet, wFdSet, eFdSet, &tv); // The first parameter is ignored on Windows
+        }
+        else
+        {
+            _count = ::select(0, rFdSet, wFdSet, eFdSet, 0); // The first parameter is ignored on Windows
+        }
+#else
+        _count = poll(&_pollFdSet[0], _pollFdSet.size(), timeout);
 #endif
-        if(ret == SOCKET_ERROR)
+
+        if(_count == SOCKET_ERROR)
         {
             if(interrupted())
             {
@@ -499,35 +830,144 @@ Selector::select(vector<pair<EventHandler*, SocketOperation> >& handlers, int ti
         break;
     }
 
-    if(ret == 0)
+    if(_count == 0 && !_selectNow)
     {
         throw SelectorTimeoutException();
     }
+}
 
-    assert(ret > 0);
-    for(int i = 0; i < ret; ++i)
+void
+Selector::checkReady(EventHandler* handler)
+{
+    if(handler->_ready & ~handler->_disabled & handler->_registered)
     {
-        pair<EventHandler*, SocketOperation> p;
-#if defined(ICE_USE_EPOLL)
-        struct epoll_event& ev = _events[i];
-        p.first = reinterpret_cast<EventHandler*>(ev.data.ptr);
-        p.second = static_cast<SocketOperation>(((ev.events & (EPOLLIN | EPOLLERR)) ?
-                                                 SocketOperationRead : SocketOperationNone) |
-                                                ((ev.events & (EPOLLOUT | EPOLLERR)) ?
-                                                 SocketOperationWrite : SocketOperationNone));
+#ifdef ICE_CPP11_MAPPING
+        _readyHandlers.insert(make_pair(dynamic_pointer_cast<EventHandler>(handler->shared_from_this()),
+                                        SocketOperationNone));
 #else
-        struct kevent& ev = _events[i];
-        if(ev.flags & EV_ERROR)
+        _readyHandlers.insert(make_pair(handler, SocketOperationNone));
+#endif
+        wakeup();
+    }
+    else
+    {
+#ifdef ICE_CPP11_MAPPING
+        map<EventHandlerPtr, SocketOperation>::iterator p =
+            _readyHandlers.find(dynamic_pointer_cast<EventHandler>(handler->shared_from_this()));
+#else
+        map<EventHandlerPtr, SocketOperation>::iterator p = _readyHandlers.find(handler);
+#endif
+        if(p != _readyHandlers.end())
         {
-            Ice::Error out(_instance->initializationData().logger);
-            out << "selector returned error:\n" << IceUtilInternal::errorToString(ev.data);
-            continue;
+            _readyHandlers.erase(p);
         }
-        p.first = reinterpret_cast<EventHandler*>(ev.udata);
-        p.second = (ev.filter == EVFILT_READ) ? SocketOperationRead : SocketOperationWrite;
+    }
+}
+
+void
+Selector::updateSelector()
+{
+#if defined(ICE_USE_KQUEUE)
+    int rs = kevent(_queueFd, &_changes[0], _changes.size(), 0, 0, 0);
+    if(rs < 0)
+    {
+        Ice::Error out(_instance->initializationData().logger);
+        out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
+    }
+    _changes.clear();
+#elif !defined(ICE_USE_EPOLL)
+    assert(!_selecting);
+
+    for(vector<pair<EventHandler*, SocketOperation> >::const_iterator p = _changes.begin(); p != _changes.end(); ++p)
+    {
+        EventHandler* handler = p->first;
+        SocketOperation status = p->second;
+
+        SOCKET fd = handler->getNativeInfo()->fd();
+        if(status)
+        {
+#if defined(ICE_USE_SELECT)
+            if(status & SocketOperationRead)
+            {
+                FD_SET(fd, &_readFdSet);
+            }
+            else
+            {
+                FD_CLR(fd, &_readFdSet);
+            }
+            if(status & SocketOperationWrite)
+            {
+                FD_SET(fd, &_writeFdSet);
+            }
+            else
+            {
+                FD_CLR(fd, &_writeFdSet);
+            }
+            if(status & SocketOperationConnect)
+            {
+                FD_SET(fd, &_writeFdSet);
+                FD_SET(fd, &_errorFdSet);
+            }
+            else
+            {
+                FD_CLR(fd, &_writeFdSet);
+                FD_CLR(fd, &_errorFdSet);
+            }
+            _handlers[fd] = handler;
+#else
+            short events = 0;
+            if(status & SocketOperationRead)
+            {
+                events |= POLLIN;
+            }
+            if(status & SocketOperationWrite)
+            {
+                events |= POLLOUT;
+            }
+            map<SOCKET, EventHandler*>::const_iterator q = _handlers.find(fd);
+            if(q == _handlers.end())
+            {
+                struct pollfd pollFd;
+                pollFd.fd = fd;
+                pollFd.events = events;
+                pollFd.revents = 0;
+                _pollFdSet.push_back(pollFd);
+                _handlers.insert(make_pair(fd, handler));
+            }
+            else
+            {
+                for(vector<struct pollfd>::iterator r = _pollFdSet.begin(); r != _pollFdSet.end(); ++r)
+                {
+                    if(r->fd == fd)
+                    {
+                        r->events = events;
+                        break;
+                    }
+                }
+            }
 #endif
-        handlers.push_back(p);
+        }
+        else
+        {
+#if defined(ICE_USE_SELECT)
+            FD_CLR(fd, &_readFdSet);
+            FD_CLR(fd, &_writeFdSet);
+            FD_CLR(fd, &_errorFdSet);
+#else
+            for(vector<struct pollfd>::iterator r = _pollFdSet.begin(); r != _pollFdSet.end(); ++r)
+            {
+                if(r->fd == fd)
+                {
+                    _pollFdSet.erase(r);
+                    break;
+                }
+            }
+#endif
+            _handlers.erase(fd);
+        }
     }
+    _changes.clear();
+#endif
 }
 
 #elif defined(ICE_USE_CFSTREAM)
@@ -596,14 +1036,24 @@ toCFCallbacks(SocketOperation op)
 
 }
 
-EventHandlerWrapper::EventHandlerWrapper(const EventHandlerPtr& handler, Selector& selector) :
+EventHandlerWrapper::EventHandlerWrapper(EventHandler* handler, Selector& selector) :
+#ifdef ICE_CPP11_MAPPING
+    _handler(std::dynamic_pointer_cast<EventHandler>(handler->shared_from_this())),
+#else
     _handler(handler),
-    _nativeInfo(StreamNativeInfoPtr::dynamicCast(handler->getNativeInfo())),
+#endif
+    _streamNativeInfo(StreamNativeInfoPtr::dynamicCast(handler->getNativeInfo())),
     _selector(selector),
     _ready(SocketOperationNone),
-    _finish(false)
+    _finish(false),
+    _socket(0),
+    _source(0)
 {
-    if(!StreamNativeInfoPtr::dynamicCast(handler->getNativeInfo()))
+    if(_streamNativeInfo)
+    {
+        _streamNativeInfo->initStreams(this);
+    }
+    else if(handler->getNativeInfo())
     {
         SOCKET fd = handler->getNativeInfo()->fd();
         CFSocketContext ctx = { 0, this, 0, 0, 0 };
@@ -620,12 +1070,6 @@ EventHandlerWrapper::EventHandlerWrapper(const EventHandlerPtr& handler, Selecto
         CFSocketDisableCallBacks(_socket, kCFSocketReadCallBack | kCFSocketWriteCallBack | kCFSocketConnectCallBack);
         _source = CFSocketCreateRunLoopSource(kCFAllocatorDefault, _socket, 0);
     }
-    else
-    {
-        _socket = 0;
-        _source = 0;
-        _nativeInfo->initStreams(this);
-    }
 }
 
 EventHandlerWrapper::~EventHandlerWrapper()
@@ -667,15 +1111,15 @@ EventHandlerWrapper::updateRunLoop()
     }
     else
     {
-        SocketOperation readyOp = _nativeInfo->registerWithRunLoop(op);
+        SocketOperation readyOp = _streamNativeInfo->registerWithRunLoop(op);
         if(!(op & (SocketOperationWrite | SocketOperationConnect)) || _ready & SocketOperationWrite)
         {
-            _nativeInfo->unregisterFromRunLoop(SocketOperationWrite, false);
+            _streamNativeInfo->unregisterFromRunLoop(SocketOperationWrite, false);
         }
 
         if(!(op & (SocketOperationRead | SocketOperationConnect)) || _ready & SocketOperationRead)
         {
-            _nativeInfo->unregisterFromRunLoop(SocketOperationRead, false);
+            _streamNativeInfo->unregisterFromRunLoop(SocketOperationRead, false);
         }
 
         if(readyOp)
@@ -685,7 +1129,7 @@ EventHandlerWrapper::updateRunLoop()
 
         if(_finish)
         {
-            _nativeInfo->closeStreams();
+            _streamNativeInfo->closeStreams();
         }
     }
 }
@@ -707,7 +1151,7 @@ EventHandlerWrapper::ready(SocketOperation op, int error)
         // stream (which can't be used from another thread than the run loop thread if
         // it's registered with a run loop).
         //
-        op = _nativeInfo->unregisterFromRunLoop(op, error != 0);
+        op = _streamNativeInfo->unregisterFromRunLoop(op, error != 0);
     }
 
     op = static_cast<SocketOperation>(_handler->_registered & op);
@@ -720,23 +1164,25 @@ EventHandlerWrapper::ready(SocketOperation op, int error)
     {
         if(op & SocketOperationConnect)
         {
-            _nativeInfo->setConnectError(error);
+            _streamNativeInfo->setConnectError(error);
         }
     }
 
     _ready = static_cast<SocketOperation>(_ready | op);
-    if(!(_handler->_disabled & op))
-    {
-        _selector.addReadyHandler(this);
-    }
+    checkReady();
 }
 
-void
+bool
 EventHandlerWrapper::checkReady()
 {
-    if(_ready & _handler->_registered)
+    if((_ready | _handler->_ready) & ~_handler->_disabled & _handler->_registered)
     {
         _selector.addReadyHandler(this);
+        return false;
+    }
+    else
+    {
+        return _handler->getNativeInfo() && !_finish;
     }
 }
 
@@ -744,7 +1190,7 @@ SocketOperation
 EventHandlerWrapper::readyOp()
 {
     assert(!(~_handler->_registered & _ready));
-    SocketOperation op = static_cast<SocketOperation>(~_handler->_disabled & _ready);
+    SocketOperation op = static_cast<SocketOperation>(~_handler->_disabled & (_ready | _handler->_ready));
     _ready = static_cast<SocketOperation>(~op & _ready);
     return op;
 }
@@ -762,15 +1208,16 @@ EventHandlerWrapper::update(SocketOperation remove, SocketOperation add)
 
     // Clear ready flags which might not be valid anymore.
     _ready = static_cast<SocketOperation>(_ready & _handler->_registered);
-    return true;
+    return _handler->getNativeInfo();
 }
 
-void
+bool
 EventHandlerWrapper::finish()
 {
     _finish = true;
     _ready = SocketOperationNone;
     _handler->_registered = SocketOperationNone;
+    return _handler->getNativeInfo();
 }
 
 Selector::Selector(const InstancePtr& instance) : _instance(instance), _destroyed(false)
@@ -799,27 +1246,33 @@ Selector::~Selector()
 void
 Selector::destroy()
 {
-    Lock sync(*this);
-
-    //
-    // Make sure any pending changes are processed to ensure remaining
-    // streams/sockets are closed.
-    //
-    _destroyed = true;
-    while(!_changes.empty())
     {
+        Lock sync(*this);
+
+        //
+        // Make sure any pending changes are processed to ensure remaining
+        // streams/sockets are closed.
+        //
+        _destroyed = true;
         CFRunLoopSourceSignal(_source);
         CFRunLoopWakeUp(_runLoop);
 
-        wait();
+        while(!_changes.empty())
+        {
+            CFRunLoopSourceSignal(_source);
+            CFRunLoopWakeUp(_runLoop);
+
+            wait();
+        }
     }
 
     _thread->getThreadControl().join();
     _thread = 0;
 
+    Lock sync(*this);
     CFRelease(_source);
 
-    assert(_wrappers.empty());
+    //assert(_wrappers.empty());
     _readyHandlers.clear();
     _selectedHandlers.clear();
 }
@@ -836,7 +1289,6 @@ Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation
 {
     Lock sync(*this);
     const EventHandlerWrapperPtr& wrapper = _wrappers[handler];
-    assert(wrapper);
     if(wrapper->update(remove, add))
     {
         _changes.insert(wrapper);
@@ -878,39 +1330,82 @@ Selector::finish(EventHandler* handler, bool closeNow)
     std::map<EventHandler*, EventHandlerWrapperPtr>::iterator p = _wrappers.find(handler);
     assert(p != _wrappers.end());
     EventHandlerWrapperPtr wrapper = p->second;
-    wrapper->finish();
+    if(wrapper->finish())
+    {
+        _changes.insert(wrapper);
+        notify();
+    }
     _wrappers.erase(p);
-    _changes.insert(wrapper);
-    notify();
     return closeNow;
 }
 
 void
-Selector::select(std::vector<std::pair<EventHandler*, SocketOperation> >& handlers, int timeout)
+Selector::ready(EventHandler* handler, SocketOperation status, bool value)
+{
+    if(((handler->_ready & status) != 0) == value)
+    {
+        return; // Nothing to do if ready state already correctly set.
+    }
+
+    if(value)
+    {
+        handler->_ready = static_cast<SocketOperation>(handler->_ready | status);
+    }
+    else
+    {
+        handler->_ready = static_cast<SocketOperation>(handler->_ready & ~status);
+    }
+
+    Lock sync(*this);
+    std::map<EventHandler*, EventHandlerWrapperPtr>::iterator p = _wrappers.find(handler);
+    assert(p != _wrappers.end());
+    p->second->checkReady();
+}
+
+void
+Selector::startSelect()
 {
     Lock sync(*this);
 
     //
     // Re-enable callbacks for previously selected handlers.
     //
-    if(!_selectedHandlers.empty())
+    vector<pair<EventHandlerWrapperPtr, SocketOperation> >::const_iterator p;
+    for(p = _selectedHandlers.begin(); p != _selectedHandlers.end(); ++p)
     {
-        vector<pair<EventHandlerWrapperPtr, SocketOperation> >::const_iterator p;
-        for(p = _selectedHandlers.begin(); p != _selectedHandlers.end(); ++p)
+        if(p->first->checkReady())
         {
-            if(!p->first->_finish)
-            {
-                _changes.insert(p->first);
-            }
+            _changes.insert(p->first);
+        }
+    }
+    _selectedHandlers.clear();
+}
+
+void
+Selector::finishSelect(std::vector<std::pair<EventHandler*, SocketOperation> >& handlers)
+{
+    Lock sync(*this);
+    handlers.clear();
+    for(set<EventHandlerWrapperPtr>::const_iterator p = _readyHandlers.begin(); p != _readyHandlers.end(); ++p)
+    {
+        SocketOperation op = (*p)->readyOp();
+        if(op)
+        {
+            _selectedHandlers.push_back(pair<EventHandlerWrapperPtr, SocketOperation>(*p, op));
+            handlers.push_back(pair<EventHandler*, SocketOperation>((*p)->_handler.get(), op));
         }
-        _selectedHandlers.clear();
     }
+    _readyHandlers.clear();
+}
 
+void
+Selector::select(int timeout)
+{
     //
     // Wait for handlers to be ready.
     //
-    handlers.clear();
-    while(_selectedHandlers.empty())
+    Lock sync(*this);
+    while(!_destroyed)
     {
         while(!_changes.empty())
         {
@@ -935,21 +1430,10 @@ Selector::select(std::vector<std::pair<EventHandler*, SocketOperation> >& handle
             }
         }
 
-        if(!_changes.empty())
-        {
-            continue; // Make sure to process the changes first.
-        }
-
-        for(vector<EventHandlerWrapperPtr>::const_iterator p = _readyHandlers.begin(); p != _readyHandlers.end(); ++p)
+        if(_changes.empty())
         {
-            SocketOperation op = (*p)->readyOp();
-            if(op)
-            {
-                _selectedHandlers.push_back(pair<EventHandlerWrapperPtr, SocketOperation>(*p, op));
-                handlers.push_back(pair<EventHandler*, SocketOperation>((*p)->_handler.get(), op));
-            }
+            break;
         }
-        _readyHandlers.clear();
     }
 }
 
@@ -973,24 +1457,6 @@ Selector::processInterrupt()
 }
 
 void
-Selector::ready(EventHandlerWrapper* wrapper, SocketOperation op, int error)
-{
-    Lock sync(*this);
-    wrapper->ready(op, error);
-}
-
-void
-Selector::addReadyHandler(EventHandlerWrapper* wrapper)
-{
-    // Called from ready()
-    _readyHandlers.push_back(wrapper);
-    if(_readyHandlers.size() == 1)
-    {
-        notify();
-    }
-}
-
-void
 Selector::run()
 {
     {
@@ -1004,408 +1470,22 @@ Selector::run()
     CFRunLoopRemoveSource(CFRunLoopGetCurrent(), _source, kCFRunLoopDefaultMode);
 }
 
-#elif defined(ICE_USE_SELECT) || defined(ICE_USE_POLL)
-
-Selector::Selector(const InstancePtr& instance) : _instance(instance), _selecting(false), _interrupted(false)
-{
-    SOCKET fds[2];
-    createPipe(fds);
-    _fdIntrRead = fds[0];
-    _fdIntrWrite = fds[1];
-#if defined(ICE_USE_SELECT)
-    FD_ZERO(&_readFdSet);
-    FD_ZERO(&_writeFdSet);
-    FD_ZERO(&_errorFdSet);
-    FD_SET(_fdIntrRead, &_readFdSet);
-#else
-    struct pollfd pollFd;
-    pollFd.fd = _fdIntrRead;
-    pollFd.events = POLLIN;
-    _pollFdSet.push_back(pollFd);
-#endif
-}
-
-Selector::~Selector()
-{
-    try
-    {
-        closeSocket(_fdIntrWrite);
-    }
-    catch(const Ice::LocalException& ex)
-    {
-        Ice::Error out(_instance->initializationData().logger);
-        out << "exception in selector while calling closeSocket():\n" << ex;
-    }
-
-    try
-    {
-        closeSocket(_fdIntrRead);
-    }
-    catch(const Ice::LocalException& ex)
-    {
-        Ice::Error out(_instance->initializationData().logger);
-        out << "exception in selector while calling closeSocket():\n" << ex;
-    }
-}
-
-void
-Selector::destroy()
-{
-#if !defined(ICE_USE_SELECT) && !defined(ICE_USE_POLL)
-    assert(_events.empty());
-#endif
-}
-
 void
-Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation add)
-{
-    SocketOperation previous = handler->_registered;
-    handler->_registered = static_cast<SocketOperation>(handler->_registered & ~remove);
-    handler->_registered = static_cast<SocketOperation>(handler->_registered | add);
-    if(previous == handler->_registered)
-    {
-        return;
-    }
-
-    updateImpl(handler);
-}
-
-void
-Selector::enable(EventHandler* handler, SocketOperation status)
-{
-    if(!(handler->_disabled & status))
-    {
-        return;
-    }
-    handler->_disabled = static_cast<SocketOperation>(handler->_disabled & ~status);
-
-    if(handler->_registered & status)
-    {
-        updateImpl(handler);
-    }
-}
-
-void
-Selector::disable(EventHandler* handler, SocketOperation status)
-{
-    if(handler->_disabled & status)
-    {
-        return;
-    }
-    handler->_disabled = static_cast<SocketOperation>(handler->_disabled | status);
-
-    if(handler->_registered & status)
-    {
-        updateImpl(handler);
-    }
-}
-
-bool
-Selector::finish(EventHandler* handler, bool closeNow)
-{
-    if(handler->_registered)
-    {
-        update(handler, handler->_registered, SocketOperationNone);
-        return false; // Don't close now if selecting.
-    }
-    return closeNow;
-}
-
-void
-Selector::startSelect()
-{
-    if(_interrupted)
-    {
-        char c;
-        while(true)
-        {
-            ssize_t ret;
-#ifdef _WIN32
-            ret = ::recv(_fdIntrRead, &c, 1, 0);
-#else
-            ret = ::read(_fdIntrRead, &c, 1);
-#endif
-            if(ret == SOCKET_ERROR)
-            {
-                if(interrupted())
-                {
-                    continue;
-                }
-
-                Ice::SocketException ex(__FILE__, __LINE__);
-                ex.error = IceInternal::getSocketErrno();
-                throw ex;
-            }
-            break;
-        }
-        _interrupted = false;
-
-        if(!_changes.empty())
-        {
-            updateSelector();
-        }
-    }
-    _selecting = true;
-}
-
-void
-Selector::finishSelect()
-{
-    _selecting = false;
-}
-
-void
-Selector::select(vector<pair<EventHandler*, SocketOperation> >& handlers, int timeout)
-{
-    int ret = 0;
-    while(true)
-    {
-#if defined(ICE_USE_SELECT)
-        fd_set* rFdSet = fdSetCopy(_selectedReadFdSet, _readFdSet);
-        fd_set* wFdSet = fdSetCopy(_selectedWriteFdSet, _writeFdSet);
-        fd_set* eFdSet = fdSetCopy(_selectedErrorFdSet, _errorFdSet);
-        if(timeout > 0)
-        {
-            struct timeval tv;
-            tv.tv_sec = timeout;
-            tv.tv_usec = 0;
-            ret = ::select(0, rFdSet, wFdSet, eFdSet, &tv); // The first parameter is ignored on Windows
-        }
-        else
-        {
-            ret = ::select(0, rFdSet, wFdSet, eFdSet, 0); // The first parameter is ignored on Windows
-        }
-#else
-        ret = poll(&_pollFdSet[0], _pollFdSet.size(), timeout > 0 ? timeout * 1000 : -1);
-#endif
-        if(ret == SOCKET_ERROR)
-        {
-            if(interrupted())
-            {
-                continue;
-            }
-
-            {
-                Ice::SocketException ex(__FILE__, __LINE__, IceInternal::getSocketErrno());
-                Ice::Error out(_instance->initializationData().logger);
-                out << "fatal error: selector failed:\n" << ex;
-            }
-            abort();
-        }
-        break;
-    }
-
-    if(ret == 0)
-    {
-        throw SelectorTimeoutException();
-    }
-
-    assert(ret > 0);
-
-#if defined(ICE_USE_SELECT)
-    if(_selectedReadFdSet.fd_count == 0 && _selectedWriteFdSet.fd_count == 0 && _selectedErrorFdSet.fd_count == 0)
-    {
-        Ice::Error out(_instance->initializationData().logger);
-        out << "select() in selector returned " << ret << " but no filedescriptor is ready";
-        return;
-    }
-
-    for(unsigned int i = 0; i < static_cast<unsigned int>(ret); ++i)
-    {
-        pair<EventHandler*, SocketOperation> p;
-
-        //
-        // Round robin for the filedescriptors.
-        //
-        SOCKET fd;
-        p.second = SocketOperationNone;
-        if(i < _selectedReadFdSet.fd_count)
-        {
-            fd = _selectedReadFdSet.fd_array[i];
-            p.second = static_cast<SocketOperation>(p.second | SocketOperationRead);
-        }
-        else if(i < _selectedWriteFdSet.fd_count + _selectedReadFdSet.fd_count)
-        {
-            fd = _selectedWriteFdSet.fd_array[i - _selectedReadFdSet.fd_count];
-            p.second = static_cast<SocketOperation>(p.second | SocketOperationWrite);
-        }
-        else
-        {
-            fd = _selectedErrorFdSet.fd_array[i - _selectedReadFdSet.fd_count - _selectedWriteFdSet.fd_count];
-            p.second = static_cast<SocketOperation>(p.second | SocketOperationConnect);
-        }
-
-        if(fd == _fdIntrRead) // Interrupted, we have to process the interrupt before returning any handlers
-        {
-            handlers.clear();
-            return;
-        }
-
-        assert(_handlers.find(fd) != _handlers.end());
-        p.first = _handlers[fd];
-        handlers.push_back(p);
-    }
-#else
-    if(_pollFdSet[0].revents == POLLIN) // Interrupted, we have to process the interrupt before returning any handlers
-    {
-        return;
-    }
-
-    for(vector<struct pollfd>::const_iterator q = _pollFdSet.begin(); q != _pollFdSet.end(); ++q)
-    {
-        pair<EventHandler*, SocketOperation> p;
-        if(q->revents != 0)
-        {
-            SOCKET fd = q->fd;
-            assert(fd != _fdIntrRead);
-            assert(_handlers.find(fd) != _handlers.end());
-            p.first = _handlers[fd];
-            p.second = SocketOperationNone;
-            if(q->revents & (POLLIN | POLLERR | POLLHUP))
-            {
-                p.second = static_cast<SocketOperation>(p.second | SocketOperationRead);
-            }
-            if(q->revents & POLLOUT)
-            {
-                p.second = static_cast<SocketOperation>(p.second | SocketOperationWrite);
-            }
-            assert(p.second);
-            handlers.push_back(p);
-        }
-    }
-#endif
-}
-
-void
-Selector::updateImpl(EventHandler* handler)
+Selector::ready(EventHandlerWrapper* wrapper, SocketOperation op, int error)
 {
-    SocketOperation status = static_cast<SocketOperation>(handler->_registered & ~handler->_disabled);
-    _changes.push_back(make_pair(handler, status));
-    if(_selecting)
-    {
-        if(!_interrupted)
-        {
-            char c = 0;
-            while(true)
-            {
-#ifdef _WIN32
-                if(::send(_fdIntrWrite, &c, 1, 0) == SOCKET_ERROR)
-#else
-                if(::write(_fdIntrWrite, &c, 1) == SOCKET_ERROR)
-#endif
-                {
-                    if(interrupted())
-                    {
-                        continue;
-                    }
-
-                    Ice::SocketException ex(__FILE__, __LINE__);
-                    ex.error = IceInternal::getSocketErrno();
-                    throw ex;
-                }
-                break;
-            }
-            _interrupted = true;
-        }
-    }
-    else
-    {
-        updateSelector();
-    }
+    Lock sync(*this);
+    wrapper->ready(op, error);
 }
 
 void
-Selector::updateSelector()
+Selector::addReadyHandler(EventHandlerWrapper* wrapper)
 {
-    for(vector<pair<EventHandler*, SocketOperation> >::const_iterator p = _changes.begin(); p != _changes.end(); ++p)
+    // Called from ready()
+    _readyHandlers.insert(wrapper);
+    if(_readyHandlers.size() == 1)
     {
-        EventHandler* handler = p->first;
-        SocketOperation status = p->second;
-
-        SOCKET fd = handler->getNativeInfo()->fd();
-        if(status)
-        {
-#if defined(ICE_USE_SELECT)
-            if(status & SocketOperationRead)
-            {
-                FD_SET(fd, &_readFdSet);
-            }
-            else
-            {
-                FD_CLR(fd, &_readFdSet);
-            }
-            if(status & SocketOperationWrite)
-            {
-                FD_SET(fd, &_writeFdSet);
-            }
-            else
-            {
-                FD_CLR(fd, &_writeFdSet);
-            }
-            if(status & SocketOperationConnect)
-            {
-                FD_SET(fd, &_writeFdSet);
-                FD_SET(fd, &_errorFdSet);
-            }
-            else
-            {
-                FD_CLR(fd, &_writeFdSet);
-                FD_CLR(fd, &_errorFdSet);
-            }
-            _handlers[fd] = handler;
-#else
-            short events = 0;
-            if(status & SocketOperationRead)
-            {
-                events |= POLLIN;
-            }
-            if(status & SocketOperationWrite)
-            {
-                events |= POLLOUT;
-            }
-            map<SOCKET, EventHandler*>::const_iterator q = _handlers.find(fd);
-            if(q == _handlers.end())
-            {
-                struct pollfd pollFd;
-                pollFd.fd = fd;
-                pollFd.events = events;
-                pollFd.revents = 0;
-                _pollFdSet.push_back(pollFd);
-                _handlers.insert(make_pair(fd, handler));
-            }
-            else
-            {
-                for(vector<struct pollfd>::iterator r = _pollFdSet.begin(); r != _pollFdSet.end(); ++r)
-                {
-                    if(r->fd == fd)
-                    {
-                        r->events = events;
-                        break;
-                    }
-                }
-            }
-#endif
-        }
-        else
-        {
-#if defined(ICE_USE_SELECT)
-            FD_CLR(fd, &_readFdSet);
-            FD_CLR(fd, &_writeFdSet);
-            FD_CLR(fd, &_errorFdSet);
-#else
-            for(vector<struct pollfd>::iterator r = _pollFdSet.begin(); r != _pollFdSet.end(); ++r)
-            {
-                if(r->fd == fd)
-                {
-                    _pollFdSet.erase(r);
-                    break;
-                }
-            }
-#endif
-            _handlers.erase(fd);
-        }
+        notify();
     }
-    _changes.clear();
 }
 
 #endif
diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h
index 544a9c6292b..4f433c32aa4 100644
--- a/cpp/src/Ice/Selector.h
+++ b/cpp/src/Ice/Selector.h
@@ -57,67 +57,59 @@ class SelectorTimeoutException
 {
 };
 
-#if defined(ICE_OS_WINRT)
-
-struct SelectEvent
-{
-    SelectEvent(const EventHandlerPtr& handler, SocketOperation status) : handler(handler), status(status)
-    {
-    }
 
-    EventHandlerPtr handler;
-    SocketOperation status;
-};
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
 
-class Selector : IceUtil::Monitor<IceUtil::Mutex>
+class Selector
 {
-public:
-
-    Selector(const InstancePtr&);
-
-    void destroy();
-
-    void initialize(EventHandler*);
-    void update(EventHandler*, SocketOperation, SocketOperation);    
-    void finish(EventHandler*);
-
-    EventHandlerPtr getNextHandler(SocketOperation&, int);
-    
-    void completed(const EventHandlerPtr&, SocketOperation);
-
-private:
-
-    const InstancePtr _instance;
-    std::deque<SelectEvent> _events;
-};
+#if defined(ICE_OS_WINRT)
+    struct SelectEvent
+    {
+        SelectEvent(const EventHandlerPtr& handler, SocketOperation status) : handler(handler), status(status)
+        {
+        }
 
-#elif defined(ICE_USE_IOCP)
+        EventHandlerPtr handler;
+        SocketOperation status;
+    };
+#endif
 
-class Selector
-{
 public:
 
     Selector(const InstancePtr&);
     ~Selector();
 
+#ifdef ICE_USE_IOCP
     void setup(int);
-    void destroy();    
+#endif
+    void destroy();
 
     void initialize(EventHandler*);
     void update(EventHandler*, SocketOperation, SocketOperation);
     void finish(EventHandler*);
 
+    void ready(EventHandler*, SocketOperation, bool);
+
+#ifdef ICE_USE_IOCP
     EventHandler* getNextHandler(SocketOperation&, DWORD&, int&, int);
+#else
+    EventHandler* getNextHandler(SocketOperation&, int);
+#endif
+
+    void completed(EventHandler*, SocketOperation);
 
-    HANDLE getIOCPHandle() { return _handle; } 
-    
 private:
 
     const InstancePtr _instance;
+#ifdef ICE_USE_IOCP
     HANDLE _handle;
+#else
+    IceUtil::Monitor<IceUtil::Mutex> _monitor;
+    std::deque<SelectEvent> _events;
+#endif
 };
 
-#elif defined(ICE_USE_KQUEUE) || defined(ICE_USE_EPOLL)
+#elif defined(ICE_USE_KQUEUE) || defined(ICE_USE_EPOLL) || defined(ICE_USE_SELECT) || defined(ICE_USE_POLL)
 
 class Selector
 {
@@ -126,7 +118,7 @@ public:
     Selector(const InstancePtr&);
     ~Selector();
 
-    void destroy();    
+    void destroy();
 
     void initialize(EventHandler*)
     {
@@ -137,43 +129,62 @@ public:
     void disable(EventHandler*, SocketOperation);
     bool finish(EventHandler*, bool);
 
-#if defined(ICE_USE_KQUEUE)
-    void updateSelector();
-#endif
-
-    void
-    startSelect()
-    {
-#ifdef ICE_USE_KQUEUE
-        _selecting = true;
-        if(!_changes.empty())
-        {
-            updateSelector();
-        }
-#endif
-    }
-
-    void
-    finishSelect()
-    {
-#ifdef ICE_USE_KQUEUE
-        _selecting = false;
-#endif
-    }
+    void ready(EventHandler*, SocketOperation, bool);
 
-    void select(std::vector<std::pair<EventHandler*, SocketOperation> >&, int);
+    void startSelect();
+    void finishSelect(std::vector<std::pair<EventHandler*, SocketOperation> >&);
+    void select(int);
 
 private:
 
+    void wakeup();
+    void checkReady(EventHandler*);
+    void updateSelector();
+
     const InstancePtr _instance;
+
+    SOCKET _fdIntrRead;
+    SOCKET _fdIntrWrite;
+    bool _interrupted;
+    bool _selectNow;
+    int _count;
+    bool _selecting;
+    std::map<EventHandlerPtr, SocketOperation> _readyHandlers;
+
 #if defined(ICE_USE_EPOLL)
     std::vector<struct epoll_event> _events;
-#else
+    int _queueFd;
+#elif defined(ICE_USE_KQUEUE)
     std::vector<struct kevent> _events;
     std::vector<struct kevent> _changes;
-    bool _selecting;
-#endif
     int _queueFd;
+#elif defined(ICE_USE_SELECT)
+    std::vector<std::pair<EventHandler*, SocketOperation> > _changes;
+    std::map<SOCKET, EventHandler*> _handlers;
+
+    fd_set _readFdSet;
+    fd_set _writeFdSet;
+    fd_set _errorFdSet;
+    fd_set _selectedReadFdSet;
+    fd_set _selectedWriteFdSet;
+    fd_set _selectedErrorFdSet;
+
+    fd_set*
+    fdSetCopy(fd_set& dest, fd_set& src)
+    {
+        if(src.fd_count > 0)
+        {
+            dest.fd_count = src.fd_count;
+            memcpy(dest.fd_array, src.fd_array, sizeof(SOCKET) * src.fd_count);
+            return &dest;
+        }
+        return 0;
+    }
+#elif defined(ICE_USE_POLL)
+    std::vector<std::pair<EventHandler*, SocketOperation> > _changes;
+    std::map<SOCKET, EventHandler*> _handlers;
+    std::vector<struct pollfd> _pollFdSet;
+#endif
 };
 
 #elif defined(ICE_USE_CFSTREAM)
@@ -182,7 +193,7 @@ class Selector;
 
 class SelectorReadyCallback : public IceUtil::Shared
 {
-public: 
+public:
 
     virtual ~SelectorReadyCallback() { }
     virtual void readyCallback(SocketOperation, int = 0) = 0;
@@ -201,9 +212,9 @@ public:
     virtual SocketOperation unregisterFromRunLoop(SocketOperation, bool) = 0;
     virtual void closeStreams() = 0;
 
-    void setConnectError(int error) 
+    void setConnectError(int error)
     {
-        _connectError = error; 
+        _connectError = error;
     }
 
 private:
@@ -216,20 +227,19 @@ class EventHandlerWrapper : public SelectorReadyCallback
 {
 public:
 
-    EventHandlerWrapper(const EventHandlerPtr&, Selector&);
+    EventHandlerWrapper(EventHandler*, Selector&);
     ~EventHandlerWrapper();
 
     void updateRunLoop();
 
     virtual void readyCallback(SocketOperation, int = 0);
-
     void ready(SocketOperation, int);
 
     SocketOperation readyOp();
-    void checkReady();
+    bool checkReady();
 
     bool update(SocketOperation, SocketOperation);
-    void finish();
+    bool finish();
 
     bool operator<(const EventHandlerWrapper& o)
     {
@@ -241,7 +251,7 @@ private:
     friend class Selector;
 
     EventHandlerPtr _handler;
-    StreamNativeInfoPtr _nativeInfo;
+    StreamNativeInfoPtr _streamNativeInfo;
     Selector& _selector;
     SocketOperation _ready;
     bool _finish;
@@ -266,17 +276,22 @@ public:
     void disable(EventHandler*, SocketOperation);
     bool finish(EventHandler*, bool);
 
-    void startSelect() { }
-    void finishSelect() { }
-    void select(std::vector<std::pair<EventHandler*, SocketOperation> >&, int); 
+    void ready(EventHandler*, SocketOperation, bool);
+
+    void startSelect();
+    void finishSelect(std::vector<std::pair<EventHandler*, SocketOperation> >&);
+    void select(int);
 
     void processInterrupt();
-    void ready(EventHandlerWrapper*, SocketOperation, int = 0);
-    void addReadyHandler(EventHandlerWrapper*);
     void run();
 
 private:
 
+    void ready(EventHandlerWrapper*, SocketOperation, int = 0);
+    void addReadyHandler(EventHandlerWrapper*);
+
+    friend class EventHandlerWrapper;
+
     InstancePtr _instance;
     IceUtil::ThreadPtr _thread;
     CFRunLoopRef _runLoop;
@@ -285,74 +300,11 @@ private:
 
     std::set<EventHandlerWrapperPtr> _changes;
 
-    std::vector<EventHandlerWrapperPtr> _readyHandlers;
+    std::set<EventHandlerWrapperPtr> _readyHandlers;
     std::vector<std::pair<EventHandlerWrapperPtr, SocketOperation> > _selectedHandlers;
     std::map<EventHandler*, EventHandlerWrapperPtr> _wrappers;
 };
 
-#elif defined(ICE_USE_SELECT) || defined(ICE_USE_POLL)
-
-class Selector
-{
-public:
-
-    Selector(const InstancePtr&);
-    ~Selector();
-
-    void destroy();    
-
-    void initialize(EventHandler*)
-    {
-        // Nothing to do
-    }
-    void update(EventHandler*, SocketOperation, SocketOperation);
-    void enable(EventHandler*, SocketOperation);
-    void disable(EventHandler*, SocketOperation);
-    bool finish(EventHandler*, bool);
-
-    void startSelect();
-    void finishSelect();
-    void select(std::vector<std::pair<EventHandler*, SocketOperation> >&, int);
-
-private:
-
-    void updateSelector();
-    void updateImpl(EventHandler*);
-
-    const InstancePtr _instance;
-
-    SOCKET _fdIntrRead;
-    SOCKET _fdIntrWrite;
-    bool _selecting;
-    bool _interrupted;
-
-    std::vector<std::pair<EventHandler*, SocketOperation> > _changes;
-    std::map<SOCKET, EventHandler*> _handlers;
-
-#if defined(ICE_USE_SELECT)
-    fd_set _readFdSet;
-    fd_set _writeFdSet;
-    fd_set _errorFdSet;
-    fd_set _selectedReadFdSet;
-    fd_set _selectedWriteFdSet;
-    fd_set _selectedErrorFdSet;
-
-    fd_set*
-    fdSetCopy(fd_set& dest, fd_set& src)
-    {
-        if(src.fd_count > 0)
-        {
-            dest.fd_count = src.fd_count;
-            memcpy(dest.fd_array, src.fd_array, sizeof(SOCKET) * src.fd_count);
-            return &dest;
-        }
-        return 0;
-    }
-#else
-    std::vector<struct pollfd> _pollFdSet;
-#endif
-};
-
 #endif
 
 }
diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp
index 4db49be6ae2..3d1f51112ae 100644
--- a/cpp/src/Ice/ServantManager.cpp
+++ b/cpp/src/Ice/ServantManager.cpp
@@ -44,7 +44,7 @@ IceInternal::ServantManager::addServant(const ObjectPtr& object, const Identity&
         {
             AlreadyRegisteredException ex(__FILE__, __LINE__);
             ex.kindOfObject = "servant";
-            ex.id = _instance->identityToString(ident);
+            ex.id = Ice::identityToString(ident);
             if(!facet.empty())
             {
                 string fs = nativeToUTF8(facet, _instance->getStringConverter());
@@ -104,7 +104,7 @@ IceInternal::ServantManager::removeServant(const Identity& ident, const string&
     {
         NotRegisteredException ex(__FILE__, __LINE__);
         ex.kindOfObject = "servant";
-        ex.id = _instance->identityToString(ident);
+        ex.id = Ice::identityToString(ident);
         if(!facet.empty())
         {
             string fs = nativeToUTF8(facet, _instance->getStringConverter());
@@ -178,7 +178,7 @@ IceInternal::ServantManager::removeAllFacets(const Identity& ident)
     {
         NotRegisteredException ex(__FILE__, __LINE__);
         ex.kindOfObject = "servant";
-        ex.id = _instance->identityToString(ident);
+        ex.id = Ice::identityToString(ident);
         throw ex;
     }
 
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index 026caef109f..d4a11deacef 100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -196,7 +196,7 @@ public:
     virtual Ice::LoggerPtr
     cloneWithPrefix(const string& prefix)
     {
-        return new SMEventLoggerIWrapper(_logger, prefix);
+        return ICE_MAKE_SHARED(SMEventLoggerIWrapper, _logger, prefix);
     }
 
 private:
@@ -301,7 +301,7 @@ public:
         // to Windows API.
         //
         LONG err = RegDeleteKeyW(HKEY_LOCAL_MACHINE,
-			IceUtil::stringToWstring(createKey(source), stringConverter).c_str());
+            IceUtil::stringToWstring(createKey(source), stringConverter).c_str());
         if(err != ERROR_SUCCESS)
         {
             SyscallException ex(__FILE__, __LINE__);
@@ -585,10 +585,10 @@ Ice::Service::main(int& argc, char* argv[], const InitializationData& initializa
             // our own logger.
             //
             _logger = getProcessLogger();
-            if(LoggerIPtr::dynamicCast(_logger))
+            if(ICE_DYNAMIC_CAST(LoggerI, _logger))
             {
                 string eventLogSource = initData.properties->getPropertyWithDefault("Ice.EventLog.Source", name);
-                _logger = new SMEventLoggerIWrapper(new SMEventLoggerI(eventLogSource, stringConverter), "");
+                _logger = ICE_MAKE_SHARED(SMEventLoggerIWrapper, new SMEventLoggerI(eventLogSource, stringConverter), "");
                 setProcessLogger(_logger);
             }
 
@@ -712,14 +712,14 @@ Ice::Service::main(int& argc, char* argv[], const InitializationData& initializa
     if(!_logger)
     {
         _logger = getProcessLogger();
-        if(LoggerIPtr::dynamicCast(_logger))
+        if(ICE_DYNAMIC_CAST(LoggerI, _logger))
         {
             const bool convert =
                 initData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) > 0 &&
                 initData.properties->getProperty("Ice.StdErr").empty();
 
-            _logger = new LoggerI(initData.properties->getProperty("Ice.ProgramName"), "", convert,
-                                  IceUtil::getProcessStringConverter());
+            _logger = ICE_MAKE_SHARED(LoggerI, initData.properties->getProperty("Ice.ProgramName"), "", convert,
+                                      IceUtil::getProcessStringConverter());
             setProcessLogger(_logger);
         }
     }
@@ -1106,7 +1106,7 @@ Ice::Service::runService(int argc, char* argv[], const InitializationData& initD
     SERVICE_TABLE_ENTRYW ste[] =
     {
         { const_cast<wchar_t*>(
-		    IceUtil::stringToWstring(_name, IceUtil::getProcessStringConverter()).c_str()),
+            IceUtil::stringToWstring(_name, IceUtil::getProcessStringConverter()).c_str()),
             Ice_Service_ServiceMain },
         { 0, 0 },
     };
@@ -1294,7 +1294,7 @@ Ice::Service::serviceMain(int argc, wchar_t* argv[])
     // as argv come from Windows API.
     //
     char** args = new char*[_serviceArgs.size() + argc];
-	args[0] = const_cast<char*>(IceUtil::wstringToString(argv[0], converter).c_str());
+    args[0] = const_cast<char*>(IceUtil::wstringToString(argv[0], converter).c_str());
     int i = 1;
     for(vector<string>::iterator p = _serviceArgs.begin(); p != _serviceArgs.end(); ++p)
     {
@@ -1302,7 +1302,7 @@ Ice::Service::serviceMain(int argc, wchar_t* argv[])
     }
     for(int j = 1; j < argc; ++j)
     {
-		args[i++] = const_cast<char*>(IceUtil::wstringToString(argv[j], converter).c_str());
+        args[i++] = const_cast<char*>(IceUtil::wstringToString(argv[j], converter).c_str());
     }
     argc += static_cast<int>(_serviceArgs.size());
 
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp
index 38cb6f1bc63..ca2b28e5cef 100644
--- a/cpp/src/Ice/SlicedData.cpp
+++ b/cpp/src/Ice/SlicedData.cpp
@@ -8,20 +8,30 @@
 // **********************************************************************
 
 #include <Ice/SlicedData.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 
 using namespace std;
 using namespace Ice;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* Ice::upCast(SliceInfo* p) { return p; }
 IceUtil::Shared* Ice::upCast(SlicedData* p) { return p; }
-IceUtil::Shared* Ice::upCast(UnknownSlicedObject* p) { return p; }
+IceUtil::Shared* Ice::upCast(UnknownSlicedValue* p) { return p; }
+
+Ice::SlicedData::~SlicedData()
+{
+    // Out of line to avoid weak vtable
+}
+#endif
 
 Ice::SlicedData::SlicedData(const SliceInfoSeq& seq) :
     slices(seq)
 {
 }
 
+
+#ifndef ICE_CPP11_MAPPING
 void
 Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor)
 {
@@ -30,7 +40,7 @@ Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor)
     //
     for(SliceInfoSeq::const_iterator p = slices.begin(); p != slices.end(); ++p)
     {
-        for(vector<ObjectPtr>::iterator q = (*p)->objects.begin(); q != (*p)->objects.end(); ++q)
+        for(vector<ObjectPtr>::iterator q = (*p)->instances.begin(); q != (*p)->instances.end(); ++q)
         {
             if(q->get()->__gcVisit(visitor))
             {
@@ -40,41 +50,42 @@ Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor)
     }
 }
 
-Ice::UnknownSlicedObject::UnknownSlicedObject(const string& unknownTypeId) : _unknownTypeId(unknownTypeId)
+void
+Ice::UnknownSlicedValue::__gcVisitMembers(IceInternal::GCVisitor& _v)
+{
+    if(_slicedData)
+    {
+        _slicedData->__gcVisitMembers(_v);
+    }
+}
+#endif
+
+Ice::UnknownSlicedValue::UnknownSlicedValue(const string& unknownTypeId) : _unknownTypeId(unknownTypeId)
 {
 }
 
 const string&
-Ice::UnknownSlicedObject::getUnknownTypeId() const
+Ice::UnknownSlicedValue::getUnknownTypeId() const
 {
     return _unknownTypeId;
 }
 
 SlicedDataPtr
-Ice::UnknownSlicedObject::getSlicedData() const
+Ice::UnknownSlicedValue::getSlicedData() const
 {
     return _slicedData;
 }
 
 void
-Ice::UnknownSlicedObject::__gcVisitMembers(IceInternal::GCVisitor& _v)
-{
-    if(_slicedData)
-    {
-        _slicedData->__gcVisitMembers(_v);
-    }
-}
-
-void
-Ice::UnknownSlicedObject::__write(IceInternal::BasicStream* __os) const
+Ice::UnknownSlicedValue::__write(Ice::OutputStream* __os) const
 {
-    __os->startWriteObject(_slicedData);
-    __os->endWriteObject();
+    __os->startValue(_slicedData);
+    __os->endValue();
 }
 
 void
-Ice::UnknownSlicedObject::__read(IceInternal::BasicStream* __is)
+Ice::UnknownSlicedValue::__read(Ice::InputStream* __is)
 {
-    __is->startReadObject();
-    _slicedData = __is->endReadObject(true);
+    __is->startValue();
+    _slicedData = __is->endValue(true);
 }
diff --git a/cpp/src/Ice/Stream.cpp b/cpp/src/Ice/Stream.cpp
deleted file mode 100644
index fee963960a1..00000000000
--- a/cpp/src/Ice/Stream.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Ice/Stream.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-IceUtil::Shared* Ice::upCast(InputStream* p) { return p; }
-IceUtil::Shared* Ice::upCast(OutputStream* p) { return p; }
-
-void
-Ice::UserExceptionReader::__writeImpl(::IceInternal::BasicStream*) const
-{
-    assert(false); // Should never be called.
-}
-
-void
-Ice::UserExceptionReader::__readImpl(::IceInternal::BasicStream*)
-{
-    assert(false); // Should never be called.
-}
-
-bool
-Ice::UserExceptionReader::__usesClasses() const
-{
-    return usesClasses();
-}
-
-void
-Ice::UserExceptionWriter::__writeImpl(::IceInternal::BasicStream*) const
-{
-    assert(false); // Should never be called.
-}
-
-void
-Ice::UserExceptionWriter::__readImpl(::IceInternal::BasicStream*)
-{
-    assert(false); // Should never be called.
-}
-
-bool
-Ice::UserExceptionWriter::__usesClasses() const
-{
-    return usesClasses();
-}
diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp
deleted file mode 100644
index 5951106da84..00000000000
--- a/cpp/src/Ice/StreamI.cpp
+++ /dev/null
@@ -1,832 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Ice/StreamI.h>
-#include <Ice/Instance.h>
-#include <Ice/DefaultsAndOverrides.h>
-#include <Ice/Initialize.h>
-#include <Ice/LocalException.h>
-#include <Ice/UserExceptionFactory.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-namespace
-{
-
-//
-// This class implements the internal interface UserExceptionFactory and delegates to
-// the user-supplied instance of UserExceptionReaderFactory.
-//
-class UserExceptionFactoryI : public IceInternal::UserExceptionFactory
-{
-public:
-
-    UserExceptionFactoryI(const UserExceptionReaderFactoryPtr& factory) :
-        _factory(factory)
-    {
-    }
-
-    virtual void createAndThrow(const string& id)
-    {
-        _factory->createAndThrow(id);
-    }
-
-private:
-
-    const UserExceptionReaderFactoryPtr _factory;
-};
-
-}
-
-//
-// UserExceptionReader
-//
-UserExceptionReader::UserExceptionReader(const CommunicatorPtr& communicator) :
-    _communicator(communicator)
-{
-}
-
-UserExceptionReader::~UserExceptionReader() throw()
-{
-}
-
-void
-UserExceptionReader::__write(BasicStream*) const
-{
-    assert(false);
-}
-
-void
-UserExceptionReader::__read(BasicStream* is)
-{
-    InputStreamI* stream = reinterpret_cast<InputStreamI*>(is->closure());
-    assert(stream);
-    read(stream);
-}
-
-//
-// InputStreamI
-//
-InputStreamI::InputStreamI(const CommunicatorPtr& communicator, const pair<const Byte*, const Byte*>& data,
-                           bool copyData) :
-    _communicator(communicator),
-    _closure(0)
-{
-    Instance* instance = getInstance(communicator).get();
-    initialize(instance, data, instance->defaultsAndOverrides()->defaultEncoding, copyData);
-}
-
-InputStreamI::InputStreamI(const CommunicatorPtr& communicator, const pair<const Byte*, const Byte*>& data,
-                           const EncodingVersion& v, bool copyData) :
-    _communicator(communicator),
-    _closure(0)
-{
-    initialize(getInstance(communicator).get(), data, v, copyData);
-}
-
-InputStreamI::~InputStreamI()
-{
-    delete _is;
-}
-
-CommunicatorPtr
-InputStreamI::communicator() const
-{
-    return _communicator;
-}
-
-void
-InputStreamI::sliceObjects(bool b)
-{
-    _is->sliceObjects(b);
-}
-
-Int
-InputStreamI::readSize()
-{
-    return _is->readSize();
-}
-
-Int
-InputStreamI::readAndCheckSeqSize(int minSize)
-{
-    return _is->readAndCheckSeqSize(minSize);
-}
-
-ObjectPrx
-InputStreamI::readProxy()
-{
-    ObjectPrx v;
-    _is->read(v);
-    return v;
-}
-
-namespace
-{
-
-void
-patchObject(void* addr, const ObjectPtr& v)
-{
-    ReadObjectCallback* cb = static_cast<ReadObjectCallback*>(addr);
-    assert(cb);
-    cb->invoke(v);
-}
-
-}
-
-void
-InputStreamI::readObject(const ReadObjectCallbackPtr& cb)
-{
-    _callbacks.push_back(cb); // Keep reference to callback.
-    _is->read(patchObject, cb.get());
-}
-
-void
-InputStreamI::read(bool& v)
-{
-    _is->read(v);
-}
-
-void
-InputStreamI::read(Byte& v)
-{
-    _is->read(v);
-}
-
-void
-InputStreamI::read(Short& v)
-{
-    _is->read(v);
-}
-
-void
-InputStreamI::read(Int& v)
-{
-    _is->read(v);
-}
-
-void
-InputStreamI::read(Long& v)
-{
-    _is->read(v);
-}
-
-void
-InputStreamI::read(Float& v)
-{
-    _is->read(v);
-}
-
-void
-InputStreamI::read(Double& v)
-{
-    _is->read(v);
-}
-
-void
-InputStreamI::read(string& v, bool convert)
-{
-    _is->read(v, convert);
-}
-
-void
-InputStreamI::read(const char*& vdata, size_t& vsize)
-{
-    _is->read(vdata, vsize);
-}
-
-void
-InputStreamI::read(const char*& vdata, size_t& vsize, string& holder)
-{
-    _is->read(vdata, vsize, holder);
-}
-
-void
-InputStreamI::read(vector<string>& v, bool convert)
-{
-    _is->read(v, convert);
-}
-
-void
-InputStreamI::read(wstring& v)
-{
-    _is->read(v);
-}
-
-void
-InputStreamI::read(vector<bool>& v)
-{
-    _is->read(v);
-}
-
-void
-InputStreamI::read(pair<const bool*, const bool*>& p, ::IceUtil::ScopedArray<bool>& result)
-{
-    _is->read(p, result);
-}
-
-void
-InputStreamI::read(pair<const Byte*, const Byte*>& p)
-{
-    _is->read(p);
-}
-void
-InputStreamI::read(pair<const Short*, const Short*>& p, ::IceUtil::ScopedArray<Short>& result)
-{
-    _is->read(p, result);
-}
-
-void
-InputStreamI::read(pair<const Int*, const Int*>& p, ::IceUtil::ScopedArray<Int>& result)
-{
-    _is->read(p, result);
-}
-
-void
-InputStreamI::read(pair<const Long*, const Long*>& p, ::IceUtil::ScopedArray<Long>& result)
-{
-    _is->read(p, result);
-}
-
-void
-InputStreamI::read(pair<const Float*, const Float*>& p, ::IceUtil::ScopedArray<Float>& result)
-{
-    _is->read(p, result);
-}
-
-void
-InputStreamI::read(pair<const Double*, const Double*>& p, ::IceUtil::ScopedArray<Double>& result)
-{
-    _is->read(p, result);
-}
-
-bool
-InputStreamI::readOptional(Int tag, OptionalFormat format)
-{
-    return _is->readOpt(tag, format);
-}
-
-void
-InputStreamI::throwException()
-{
-    _is->throwException();
-}
-
-void
-InputStreamI::throwException(const UserExceptionReaderFactoryPtr& factory)
-{
-    UserExceptionFactoryPtr del = new UserExceptionFactoryI(factory);
-    _is->throwException(del);
-}
-
-void
-InputStreamI::startObject()
-{
-    _is->startReadObject();
-}
-
-SlicedDataPtr
-InputStreamI::endObject(bool preserve)
-{
-    return _is->endReadObject(preserve);
-}
-
-void
-InputStreamI::startException()
-{
-    _is->startReadException();
-}
-
-SlicedDataPtr
-InputStreamI::endException(bool preserve)
-{
-    return _is->endReadException(preserve);
-}
-
-string
-InputStreamI::startSlice()
-{
-    return _is->startReadSlice();
-}
-
-void
-InputStreamI::endSlice()
-{
-    _is->endReadSlice();
-}
-
-void
-InputStreamI::skipSlice()
-{
-    _is->skipSlice();
-}
-
-EncodingVersion
-InputStreamI::startEncapsulation()
-{
-    return _is->startReadEncaps();
-}
-
-void
-InputStreamI::endEncapsulation()
-{
-    _is->endReadEncapsChecked();
-}
-
-EncodingVersion
-InputStreamI::skipEncapsulation()
-{
-    return _is->skipEncaps();
-}
-
-EncodingVersion
-InputStreamI::getEncoding() const
-{
-    return _is->getReadEncoding();
-}
-
-void
-InputStreamI::readPendingObjects()
-{
-    _is->readPendingObjects();
-}
-
-InputStream::size_type
-InputStreamI::pos()
-{
-    return _is->i - _is->b.begin();
-}
-
-void
-InputStreamI::rewind()
-{
-    _is->clear();
-    _is->i = _is->b.begin();
-}
-
-void
-InputStreamI::skip(Int sz)
-{
-    _is->skip(sz);
-}
-
-void
-InputStreamI::skipSize()
-{
-    _is->skipSize();
-}
-
-void
-InputStreamI::closure(void* p)
-{
-    _closure = p;
-}
-
-void*
-InputStreamI::closure() const
-{
-    return _closure;
-}
-
-void
-InputStreamI::initialize(Instance* instance, const pair<const Byte*, const Byte*>& buf, const EncodingVersion& v,
-                         bool copyData)
-{
-    if(copyData)
-    {
-        _is = new BasicStream(instance, v);
-        _is->writeBlob(buf.first, buf.second - buf.first);
-        _is->i = _is->b.begin();
-    }
-    else
-    {
-        _is = new BasicStream(instance, v, buf.first, buf.second);
-    }
-    _is->closure(this);
-}
-
-//
-// OutputStreamI
-//
-OutputStreamI::OutputStreamI(const CommunicatorPtr& communicator) :
-    _communicator(communicator), _own(true)
-{
-    Instance* instance = getInstance(communicator).get();
-    _os = new BasicStream(instance, instance->defaultsAndOverrides()->defaultEncoding);
-    _os->closure(this);
-}
-
-OutputStreamI::OutputStreamI(const CommunicatorPtr& communicator, const EncodingVersion& v) :
-    _communicator(communicator), _own(true)
-{
-    Instance* instance = getInstance(communicator).get();
-    _os = new BasicStream(instance, v);
-    _os->closure(this);
-}
-
-OutputStreamI::OutputStreamI(const CommunicatorPtr& communicator, BasicStream* os) :
-    _communicator(communicator), _os(os), _own(false)
-{
-    assert(os);
-    _os->closure(this);
-}
-
-OutputStreamI::~OutputStreamI()
-{
-    if(_own)
-    {
-        delete _os;
-    }
-}
-
-CommunicatorPtr
-OutputStreamI::communicator() const
-{
-    return _communicator;
-}
-
-void
-OutputStreamI::writeObject(const ObjectPtr& v)
-{
-    _os->write(v);
-}
-
-void
-OutputStreamI::writeException(const UserException& v)
-{
-    _os->write(v);
-}
-
-void
-OutputStreamI::writeProxy(const ObjectPrx& v)
-{
-    _os->write(v);
-}
-
-void
-OutputStreamI::writeSize(Int sz)
-{
-    if(sz < 0)
-    {
-        throw MarshalException(__FILE__, __LINE__);
-    }
-
-    _os->writeSize(sz);
-}
-
-void
-OutputStreamI::write(bool v)
-{
-    _os->write(v);
-}
-
-void
-OutputStreamI::write(Byte v)
-{
-    _os->write(v);
-}
-
-void
-OutputStreamI::write(Short v)
-{
-    _os->write(v);
-}
-
-void
-OutputStreamI::write(Int v)
-{
-    _os->write(v);
-}
-
-void
-OutputStreamI::write(Long v)
-{
-    _os->write(v);
-}
-
-void
-OutputStreamI::write(Float v)
-{
-    _os->write(v);
-}
-
-void
-OutputStreamI::write(Double v)
-{
-    _os->write(v);
-}
-
-void
-OutputStreamI::write(const string& v, bool convert)
-{
-    _os->write(v, convert);
-}
-
-void
-OutputStreamI::write(const char* vdata, size_t vsize, bool convert)
-{
-    _os->write(vdata, vsize, convert);
-}
-
-void
-OutputStreamI::write(const char* v, bool convert)
-{
-    _os->write(v, strlen(v), convert);
-}
-
-void
-OutputStreamI::write(const vector<string>& v, bool convert)
-{
-    if(v.size() == 0)
-    {
-        _os->writeSize(0);
-    }
-    else
-    {
-        _os->write(&v[0], &v[0] + v.size(), convert);
-    }
-}
-
-void
-OutputStreamI::write(const wstring& v)
-{
-    _os->write(v);
-}
-
-void
-OutputStreamI::write(const vector<bool>& v)
-{
-    _os->write(v);
-}
-
-void
-OutputStreamI::write(const bool* begin, const bool* end)
-{
-    _os->write(begin, end);
-}
-
-void
-OutputStreamI::write(const Byte* begin, const Byte* end)
-{
-    _os->write(begin, end);
-}
-
-void
-OutputStreamI::write(const Short* begin, const Short* end)
-{
-    _os->write(begin, end);
-}
-
-void
-OutputStreamI::write(const Int* begin, const Int* end)
-{
-    _os->write(begin, end);
-}
-
-void
-OutputStreamI::write(const Long* begin, const Long* end)
-{
-    _os->write(begin, end);
-}
-
-void
-OutputStreamI::write(const Float* begin, const Float* end)
-{
-    _os->write(begin, end);
-}
-
-void
-OutputStreamI::write(const Double* begin, const Double* end)
-{
-    _os->write(begin, end);
-}
-
-bool
-OutputStreamI::writeOptional(Int tag, OptionalFormat format)
-{
-    return _os->writeOpt(tag, format);
-}
-
-void
-OutputStreamI::startObject(const SlicedDataPtr& slicedData)
-{
-    _os->startWriteObject(slicedData);
-}
-
-void
-OutputStreamI::endObject()
-{
-    _os->endWriteObject();
-}
-
-void
-OutputStreamI::startException(const SlicedDataPtr& slicedData)
-{
-    _os->startWriteException(slicedData);
-}
-
-void
-OutputStreamI::endException()
-{
-    _os->endWriteException();
-}
-
-void
-OutputStreamI::startSlice(const string& typeId, int compactId, bool lastSlice)
-{
-    _os->startWriteSlice(typeId, compactId, lastSlice);
-}
-
-void
-OutputStreamI::endSlice()
-{
-    _os->endWriteSlice();
-}
-
-void
-OutputStreamI::startEncapsulation(const EncodingVersion& version, FormatType format)
-{
-    _os->startWriteEncaps(version, format);
-}
-
-void
-OutputStreamI::startEncapsulation()
-{
-    _os->startWriteEncaps();
-}
-
-void
-OutputStreamI::endEncapsulation()
-{
-    _os->endWriteEncapsChecked();
-}
-
-EncodingVersion
-OutputStreamI::getEncoding() const
-{
-    return _os->getWriteEncoding();
-}
-
-void
-OutputStreamI::writePendingObjects()
-{
-    _os->writePendingObjects();
-}
-
-void
-OutputStreamI::finished(vector<Byte>& bytes)
-{
-    vector<Byte>(_os->b.begin(), _os->b.end()).swap(bytes);
-}
-
-pair<const Byte*, const Byte*>
-OutputStreamI::finished()
-{
-    if(_os->b.empty())
-    {
-        return pair<const Byte*, const Byte*>(reinterpret_cast<Ice::Byte*>(0), reinterpret_cast<Ice::Byte*>(0));
-    }
-    else
-    {
-        return pair<const Byte*, const Byte*>(&_os->b[0], &_os->b[0] + _os->b.size());
-    }
-}
-
-void
-OutputStreamI::reset(bool clearBuffer)
-{
-    _os->clear();
-
-    if(clearBuffer)
-    {
-        _os->b.clear();
-    }
-    else
-    {
-        _os->b.reset();
-    }
-
-    _os->i = _os->b.begin();
-}
-
-OutputStream::size_type
-OutputStreamI::pos()
-{
-    return _os->b.size();
-}
-
-void
-OutputStreamI::rewrite(Int sz, size_type p)
-{
-    _os->rewrite(sz, p);
-}
-
-OutputStream::size_type
-OutputStreamI::startSize()
-{
-    return _os->startSize();
-}
-
-void
-OutputStreamI::endSize(OutputStream::size_type pos)
-{
-    _os->endSize(pos);
-}
-
-//
-// ObjectReader
-//
-void
-ObjectReader::__write(BasicStream*) const
-{
-    assert(false);
-}
-
-void
-ObjectReader::__read(BasicStream* is)
-{
-    InputStreamI* stream = reinterpret_cast<InputStreamI*>(is->closure());
-    assert(stream);
-    read(stream);
-}
-
-void
-ObjectReader::__write(const OutputStreamPtr&) const
-{
-    assert(false);
-}
-
-void
-ObjectReader::__read(const InputStreamPtr&)
-{
-    assert(false);
-}
-
-//
-// ObjectWriter
-//
-void
-ObjectWriter::__write(BasicStream* os) const
-{
-    OutputStreamI* stream = reinterpret_cast<OutputStreamI*>(os->closure());
-    assert(stream);
-    write(stream);
-}
-
-void
-ObjectWriter::__read(BasicStream*)
-{
-    assert(false);
-}
-
-void
-ObjectWriter::__write(const OutputStreamPtr&) const
-{
-    assert(false);
-}
-
-void
-ObjectWriter::__read(const InputStreamPtr&)
-{
-    assert(false);
-}
-
-//
-// UserExceptionWriter
-//
-UserExceptionWriter::UserExceptionWriter(const CommunicatorPtr& communicator) :
-    _communicator(communicator)
-{
-}
-
-UserExceptionWriter::~UserExceptionWriter() throw()
-{
-}
-
-void
-UserExceptionWriter::__write(BasicStream* os) const
-{
-    OutputStreamI* stream = reinterpret_cast<OutputStreamI*>(os->closure());
-    if(!stream)
-    {
-        //
-        // Required for IcePy usage
-        //
-        stream = new OutputStreamI(_communicator, os);
-    }
-    write(stream);
-}
-
-void
-UserExceptionWriter::__read(BasicStream*)
-{
-    assert(false);
-}
diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h
deleted file mode 100644
index acb99b2b258..00000000000
--- a/cpp/src/Ice/StreamI.h
+++ /dev/null
@@ -1,198 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef ICE_STREAM_I_H
-#define ICE_STREAM_I_H
-
-#include <Ice/Stream.h>
-
-namespace IceInternal
-{
-
-// Forward declaration.
-class BasicStream;
-
-};
-
-namespace Ice
-{
-
-//
-// Implement InputStream as a wrapper around BasicStream.
-//
-class InputStreamI : public InputStream
-{
-public:
-
-    InputStreamI(const CommunicatorPtr&, const std::pair<const Byte*, const Byte*>&, bool);
-    InputStreamI(const CommunicatorPtr&, const std::pair<const Byte*, const Byte*>&, const EncodingVersion&, bool);
-    virtual ~InputStreamI();
-
-    virtual CommunicatorPtr communicator() const;
-
-    virtual void sliceObjects(bool);
-
-    virtual Int readSize();
-    virtual Int readAndCheckSeqSize(int);
-
-    virtual ObjectPrx readProxy();
-    virtual void readObject(const ReadObjectCallbackPtr&);
-
-    virtual void throwException();
-    virtual void throwException(const UserExceptionReaderFactoryPtr&);
-
-    virtual void startObject();
-    virtual SlicedDataPtr endObject(bool);
-
-    virtual void startException();
-    virtual SlicedDataPtr endException(bool);
-
-    virtual std::string startSlice();
-    virtual void endSlice();
-    virtual void skipSlice();
-
-    virtual EncodingVersion startEncapsulation();
-    virtual void endEncapsulation();
-    virtual EncodingVersion skipEncapsulation();
-
-    virtual EncodingVersion getEncoding() const;
-
-    virtual void readPendingObjects();
-
-    virtual size_type pos();
-    virtual void rewind();
-
-    virtual void skip(Int);
-    virtual void skipSize();
-
-    virtual void read(bool&);
-    virtual void read(Byte&);
-    virtual void read(Short&);
-    virtual void read(Int&);
-    virtual void read(Long&);
-    virtual void read(Float&);
-    virtual void read(Double&);
-    virtual void read(std::string&, bool = true);
-    virtual void read(const char*&, size_t&);
-    virtual void read(const char*&, size_t&, std::string&);
-    virtual void read(std::vector<std::string>&, bool);
-    virtual void read(std::wstring&);
-    virtual void read(std::vector<bool>&);
-    virtual void read(std::pair<const bool*, const bool*>&, ::IceUtil::ScopedArray<bool>&);
-    virtual void read(std::pair<const Byte*, const Byte*>&);
-    virtual void read(std::pair<const Short*, const Short*>&, ::IceUtil::ScopedArray<Short>&);
-    virtual void read(std::pair<const Int*, const Int*>&, ::IceUtil::ScopedArray<Int>&);
-    virtual void read(std::pair<const Long*, const Long*>&, ::IceUtil::ScopedArray<Long>&);
-    virtual void read(std::pair<const Float*, const Float*>&, ::IceUtil::ScopedArray<Float>&);
-    virtual void read(std::pair<const Double*, const Double*>&, ::IceUtil::ScopedArray<Double>&);
-
-#ifdef __SUNPRO_CC
-    using InputStream::read;
-#endif
-
-    virtual bool readOptional(Int, OptionalFormat);
-
-    virtual void closure(void*);
-    virtual void* closure() const;
-
-private:
-
-    void initialize(IceInternal::Instance*, const std::pair<const Byte*, const Byte*>&, const EncodingVersion&, bool);
-
-    const CommunicatorPtr _communicator;
-    IceInternal::BasicStream* _is;
-    std::vector< ReadObjectCallbackPtr > _callbacks;
-    void* _closure;
-};
-
-//
-// Implement OutputStream as a wrapper around BasicStream.
-//
-class OutputStreamI : public OutputStream
-{
-public:
-
-    OutputStreamI(const CommunicatorPtr&);
-    OutputStreamI(const CommunicatorPtr&, const EncodingVersion&);
-    OutputStreamI(const CommunicatorPtr&, IceInternal::BasicStream*);
-    virtual ~OutputStreamI();
-
-    virtual CommunicatorPtr communicator() const;
-
-    virtual void writeObject(const ObjectPtr&);
-    virtual void writeException(const UserException&);
-    virtual void writeProxy(const ObjectPrx&);
-
-    virtual void writeSize(Int);
-
-    virtual void write(bool);
-    virtual void write(Byte);
-    virtual void write(Short);
-    virtual void write(Int);
-    virtual void write(Long);
-    virtual void write(Float);
-    virtual void write(Double);
-    virtual void write(const std::string&, bool = true);
-    virtual void write(const char*, size_t, bool = true);
-    virtual void write(const std::vector<std::string>&, bool);
-    virtual void write(const char*, bool = true);
-    virtual void write(const std::wstring&);
-    virtual void write(const std::vector<bool>&);
-    virtual void write(const bool*, const bool*);
-    virtual void write(const Byte*, const Byte*);
-    virtual void write(const Short*, const Short*);
-    virtual void write(const Int*, const Int*);
-    virtual void write(const Long*, const Long*);
-    virtual void write(const Float*, const Float*);
-    virtual void write(const Double*, const Double*);
-
-#ifdef __SUNPRO_CC
-    using OutputStream::write;
-#endif
-
-    virtual bool writeOptional(Int, OptionalFormat);
-
-    virtual void startObject(const SlicedDataPtr&);
-    virtual void endObject();
-
-    virtual void startException(const SlicedDataPtr&);
-    virtual void endException();
-
-    virtual void startSlice(const std::string&, int, bool);
-    virtual void endSlice();
-
-    virtual void startEncapsulation(const EncodingVersion&, FormatType);
-    virtual void startEncapsulation();
-    virtual void endEncapsulation();
-
-    virtual EncodingVersion getEncoding() const;
-
-    virtual void writePendingObjects();
-
-    virtual void finished(std::vector< Byte >&);
-    virtual std::pair<const Byte*, const Byte*> finished();
-
-    virtual void reset(bool);
-
-    virtual size_type pos();
-    virtual void rewrite(Int, size_type);
-
-    virtual size_type startSize();
-    virtual void endSize(size_type pos);
-
-private:
-
-    const CommunicatorPtr _communicator;
-    IceInternal::BasicStream* _os;
-    const bool _own;
-};
-
-}
-
-#endif
diff --git a/cpp/src/Ice/StreamSocket.cpp b/cpp/src/Ice/StreamSocket.cpp
index fa3761f5fa0..b0964507277 100644..100755
--- a/cpp/src/Ice/StreamSocket.cpp
+++ b/cpp/src/Ice/StreamSocket.cpp
@@ -13,6 +13,14 @@
 
 using namespace IceInternal;
 
+#if defined(ICE_OS_WINRT)
+
+#include <Ice/Properties.h>
+using namespace Platform;
+using namespace Windows::Foundation;
+
+#endif
+
 StreamSocket::StreamSocket(const ProtocolInstancePtr& instance,
                            const NetworkProxyPtr& proxy,
                            const Address& addr,
@@ -23,13 +31,12 @@ StreamSocket::StreamSocket(const ProtocolInstancePtr& instance,
     _addr(addr),
     _sourceAddr(sourceAddr),
     _state(StateNeedConnect)
-#ifdef ICE_USE_IOCP
-    , _read(SocketOperationRead),
-    _write(SocketOperationWrite)
+#if defined(ICE_USE_IOCP)
+    , _read(SocketOperationRead), _write(SocketOperationWrite)
 #endif
 {
     init();
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
     if(doConnect(_fd, _proxy ? _proxy->getAddress() : _addr, sourceAddr))
     {
         _state = _proxy ? StateProxyWrite : StateConnected;
@@ -49,10 +56,11 @@ StreamSocket::StreamSocket(const ProtocolInstancePtr& instance,
 StreamSocket::StreamSocket(const ProtocolInstancePtr& instance, SOCKET fd) :
     NativeInfo(fd),
     _instance(instance),
+    _addr(),
+    _sourceAddr(),
     _state(StateConnected)
-#ifdef ICE_USE_IOCP
-    , _read(SocketOperationRead),
-    _write(SocketOperationWrite)
+#if defined(ICE_USE_IOCP)
+    , _read(SocketOperationRead), _write(SocketOperationWrite)
 #endif
 {
     init();
@@ -82,8 +90,26 @@ StreamSocket::connect(Buffer& readBuffer, Buffer& writeBuffer)
     }
     else if(_state <= StateConnectPending)
     {
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP)
         doFinishConnectAsync(_fd, _write);
+#elif defined(ICE_OS_WINRT)
+        if(_write.count == SOCKET_ERROR)
+        {
+            try
+            {
+                checkConnectErrorCode(__FILE__, __LINE__, _write.error);
+            }
+            catch(Ice::DNSException& ex)
+            {
+                //
+                // Don't need to pass a wide string converter as the wide string come from
+                // Windows API.
+                //
+                const Address& addr = _proxy ? _proxy->getAddress() : _addr;
+                ex.host = IceUtil::wstringToString(addr.host->RawName->Data(), IceUtil::getProcessStringConverter());
+                throw;
+            }
+        }
 #else
         doFinishConnect(_fd);
 #endif
@@ -127,7 +153,7 @@ StreamSocket::isConnected()
 size_t
 StreamSocket::getSendPacketSize(size_t length)
 {
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     return _maxSendPacketSize > 0 ? std::min(length, _maxSendPacketSize) : length;
 #else
     return length;
@@ -137,7 +163,7 @@ StreamSocket::getSendPacketSize(size_t length)
 size_t
 StreamSocket::getRecvPacketSize(size_t length)
 {
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     return _maxRecvPacketSize > 0 ? std::min(length, _maxRecvPacketSize) : length;
 #else
     return length;
@@ -153,6 +179,7 @@ StreamSocket::setBufferSize(int rcvSize, int sndSize)
 SocketOperation
 StreamSocket::read(Buffer& buf)
 {
+#if !defined(ICE_OS_WINRT)
     if(_state == StateProxyRead)
     {
         while(true)
@@ -171,12 +198,14 @@ StreamSocket::read(Buffer& buf)
         }
     }
     buf.i += read(reinterpret_cast<char*>(&*buf.i), buf.b.end() - buf.i);
+#endif
     return buf.i != buf.b.end() ? SocketOperationRead : SocketOperationNone;
 }
 
 SocketOperation
 StreamSocket::write(Buffer& buf)
 {
+#if !defined(ICE_OS_WINRT)
     if(_state == StateProxyWrite)
     {
         while(true)
@@ -195,9 +224,11 @@ StreamSocket::write(Buffer& buf)
         }
     }
     buf.i += write(reinterpret_cast<const char*>(&*buf.i), buf.b.end() - buf.i);
+#endif
     return buf.i != buf.b.end() ? SocketOperationWrite : SocketOperationNone;
 }
 
+#if !defined(ICE_OS_WINRT)
 ssize_t
 StreamSocket::read(char* buf, size_t length)
 {
@@ -278,7 +309,6 @@ StreamSocket::write(const char* buf, size_t length)
 #else
     size_t packetSize = length;
 #endif
-
     ssize_t sent = 0;
     while(length > 0)
     {
@@ -336,8 +366,9 @@ StreamSocket::write(const char* buf, size_t length)
     }
     return sent;
 }
+#endif
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
 AsyncInfo*
 StreamSocket::getAsyncInfo(SocketOperation op)
 {
@@ -352,6 +383,9 @@ StreamSocket::getAsyncInfo(SocketOperation op)
         return 0;
     }
 }
+#endif
+
+#if defined(ICE_USE_IOCP)
 
 bool
 StreamSocket::startWrite(Buffer& buf)
@@ -489,7 +523,122 @@ StreamSocket::finishRead(Buffer& buf)
     {
         _state = toState(_proxy->endRead(buf));
     }
+
+}
+
+#elif defined(ICE_OS_WINRT)
+
+bool
+StreamSocket::startWrite(Buffer& buf)
+{
+    if(_state == StateConnectPending)
+    {
+        const Address& addr = _proxy ? _proxy->getAddress() : _addr;
+        try
+        {
+            try
+            {
+                queueAction(SocketOperationConnect,
+                    safe_cast<Windows::Networking::Sockets::StreamSocket^>(_fd)->ConnectAsync(addr.host, addr.port,
+                                      Windows::Networking::Sockets::SocketProtectionLevel::PlainSocket), true);
+            }
+            catch(Platform::Exception^ ex)
+            {
+                checkConnectErrorCode(__FILE__, __LINE__, ex->HResult);
+            }
+        }
+        catch(Ice::DNSException& ex)
+        {
+            //
+            // Don't need to pass a wide string converter as the wide string come from
+            // Windows API.
+            //
+            ex.host = IceUtil::wstringToString(addr.host->RawName->Data(), IceUtil::getProcessStringConverter());
+            throw;
+        }
+        return false;
+    }
+
+    assert(!buf.b.empty());
+    assert(buf.i != buf.b.end());
+
+    size_t packetSize = getSendPacketSize(buf.b.end() - buf.i);
+    _writer->WriteBytes(ref new Array<unsigned char>(&*buf.i, static_cast<unsigned int>(packetSize)));
+    try
+    {
+        queueOperation(SocketOperationWrite, _writer->StoreAsync());
+    }
+    catch(Platform::Exception^ ex)
+    {
+        checkErrorCode(__FILE__, __LINE__, ex->HResult);
+    }
+    return packetSize == static_cast<int>(buf.b.end() - buf.i);
+}
+
+void
+StreamSocket::finishWrite(Buffer& buf)
+{
+    if(_fd == INVALID_SOCKET || (_state < StateConnected && _state != StateProxyWrite))
+    {
+        return;
+    }
+
+    if(_write.count == SOCKET_ERROR)
+    {
+        checkErrorCode(__FILE__, __LINE__, _write.error);
+    }
+
+    buf.i += _write.count;
+}
+
+void
+StreamSocket::startRead(Buffer& buf)
+{
+    assert(!buf.b.empty() && buf.i != buf.b.end());
+    size_t packetSize = getRecvPacketSize(buf.b.end() - buf.i);
+    try
+    {
+        queueOperation(SocketOperationRead, _reader->LoadAsync(static_cast<unsigned int>(packetSize)));
+    }
+    catch(Platform::Exception^ ex)
+    {
+        checkErrorCode(__FILE__, __LINE__, ex->HResult);
+    }
 }
+
+void
+StreamSocket::finishRead(Buffer& buf)
+{
+    if(_fd == INVALID_SOCKET)
+    {
+        return;
+    }
+
+    if(_read.count == SOCKET_ERROR)
+    {
+        checkErrorCode(__FILE__, __LINE__, _read.error);
+    }
+    else if(_read.count == 0)
+    {
+        Ice::ConnectionLostException ex(__FILE__, __LINE__);
+        ex.error = 0;
+        throw ex;
+    }
+
+    try
+    {
+        auto data = ref new Platform::Array<unsigned char>(_read.count);
+        _reader->ReadBytes(data);
+        memcpy(&*buf.i, data->Data, _read.count);
+    }
+    catch(Platform::Exception^ ex)
+    {
+        checkErrorCode(__FILE__, __LINE__, ex->HResult);
+    }
+
+    buf.i += _read.count;
+}
+
 #endif
 
 void
@@ -520,7 +669,7 @@ StreamSocket::init()
     setBlock(_fd, false);
     setTcpBufSize(_fd, _instance);
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP)
     //
     // For timeouts to work properly, we need to receive or send the
     // data in several chunks when using IOCP WSARecv or WSASend.
@@ -530,6 +679,14 @@ StreamSocket::init()
     //
     _maxSendPacketSize = std::max(512, IceInternal::getSendBufferSize(_fd));
     _maxRecvPacketSize = std::max(512, IceInternal::getRecvBufferSize(_fd));
+#elif defined(ICE_OS_WINRT)
+    Windows::Networking::Sockets::StreamSocket^ s = safe_cast<Windows::Networking::Sockets::StreamSocket^>(_fd);
+    _writer = ref new Windows::Storage::Streams::DataWriter(s->OutputStream);
+    _reader = ref new Windows::Storage::Streams::DataReader(s->InputStream);
+    _reader->InputStreamOptions = Windows::Storage::Streams::InputStreamOptions::Partial;
+
+    _maxSendPacketSize = std::max(static_cast<unsigned int>(512), s->Control->OutboundBufferSizeInBytes / 2);
+    _maxRecvPacketSize = _instance->properties()->getPropertyAsIntWithDefault("Ice.TCP.RcvSize", 128 * 1024);
 #endif
 }
 
@@ -546,5 +703,3 @@ StreamSocket::toState(SocketOperation operation) const
         return StateProxyConnected;
     }
 }
-
-
diff --git a/cpp/src/Ice/StreamSocket.h b/cpp/src/Ice/StreamSocket.h
index 15d82a1d54e..3d092d20ba2 100644
--- a/cpp/src/Ice/StreamSocket.h
+++ b/cpp/src/Ice/StreamSocket.h
@@ -36,11 +36,16 @@ public:
     SocketOperation read(Buffer&);
     SocketOperation write(Buffer&);
 
+#if !defined(ICE_OS_WINRT)
     ssize_t read(char*, size_t);
     ssize_t write(const char*, size_t);
+#endif
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     AsyncInfo* getAsyncInfo(SocketOperation);
+#endif
+
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     bool startWrite(Buffer&);
     void finishWrite(Buffer&);
     void startRead(Buffer&);
@@ -73,16 +78,20 @@ private:
     State _state;
     std::string _desc;
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     size_t _maxSendPacketSize;
     size_t _maxRecvPacketSize;
     AsyncInfo _read;
     AsyncInfo _write;
 #endif
+
+#if defined(ICE_OS_WINRT)
+    Windows::Storage::Streams::DataReader^ _reader;
+    Windows::Storage::Streams::DataWriter^ _writer;
+#endif
 };
 typedef IceUtil::Handle<StreamSocket> StreamSocketPtr;
 
 }
 
 #endif
-
diff --git a/cpp/src/Ice/StringConverterPlugin.cpp b/cpp/src/Ice/StringConverterPlugin.cpp
deleted file mode 100644
index 53ba16da334..00000000000
--- a/cpp/src/Ice/StringConverterPlugin.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Ice/Config.h>
-
-// For deprecated StringConverterPlugin
-#include <IceUtil/DisableWarnings.h>
-#include <Ice/DeprecatedStringConverter.h>
-
-#include <IceUtil/IceUtil.h>
-#include <IceUtil/StringUtil.h>
-
-#include <Ice/Communicator.h>
-#include <Ice/Initialize.h>
-#include <Ice/LocalException.h>
-#include <Ice/LoggerUtil.h>
-
-using namespace IceUtilInternal;
-using namespace Ice;
-using namespace std;
-
-//
-// The entry point for the string converter plugin built-in the Ice library
-//
-extern "C"
-{
-
-ICE_API Plugin*
-createStringConverter(const CommunicatorPtr& communicator, const string& name, const StringSeq& args)
-{
-    StringConverterPtr stringConverter;
-    WstringConverterPtr wstringConverter;
-
-    if(args.size() > 2)
-    {
-        Error out(communicator->getLogger());
-        out << "Plugin " << name << ": too many arguments";
-        return 0;
-    }
-
-    try
-    {
-
-#ifdef _WIN32
-        int cp = -1;
-
-        for(size_t i = 0; i < args.size(); ++i)
-        {
-            if(args[i].find("windows=") == 0)
-            {
-                cp = atoi(args[i].substr(strlen("windows=")).c_str());
-            }
-            else if(args[i].find("iconv=") != 0)
-            {
-                Error out(communicator->getLogger());
-                out << "Plugin " << name << ": invalid \"" << args[i] << "\" argument";
-                return 0;
-            }
-        }
-
-        if(cp == -1)
-        {
-            Error out(communicator->getLogger());
-            out << "Plugin " << name << ": missing windows=<code page> argument";
-            return 0;
-        }
-
-        if(cp == 0 || cp == INT_MAX || cp < 0)
-        {
-            Error out(communicator->getLogger());
-            out << "Plugin " << name << ": invalid Windows code page";
-            return 0;
-        }
-
-        stringConverter = new IceUtil::WindowsStringConverter(static_cast<unsigned int>(cp));
-#else
-        StringSeq iconvArgs;
-
-        for(size_t i = 0; i < args.size(); ++i)
-        {
-            if(args[i].find("iconv=") == 0)
-            {
-                if(!IceUtilInternal::splitString(args[i].substr(strlen("iconv=")), ", \t\r\n", iconvArgs))
-                {
-                    Error out(communicator->getLogger());
-                    out << "Plugin " << name << ": invalid iconv argument";
-                    return 0;
-                }
-            }
-            else if(args[i].find("windows=") != 0)
-            {
-                Error out(communicator->getLogger());
-                out << "Plugin " << name << ": invalid \"" << args[i] << "\" argument";
-                return 0;
-            }
-        }
-
-        switch(iconvArgs.size())
-        {
-            case 0:
-            {
-                stringConverter = new IceUtil::IconvStringConverter<char>;
-                break;
-            }
-            case 1:
-            {
-                stringConverter = new IceUtil::IconvStringConverter<char>(iconvArgs[0].c_str());
-                break;
-            }
-            case 2:
-            {
-                stringConverter = new IceUtil::IconvStringConverter<char>(iconvArgs[0].c_str());
-                wstringConverter = new IceUtil::IconvStringConverter<wchar_t>(iconvArgs[1].c_str());
-                break;
-            }
-            default:
-            {
-                assert(0);
-            }
-        }
-
-#endif
-
-        return new StringConverterPlugin(communicator, stringConverter, wstringConverter);
-    }
-    catch(const std::exception& ex)
-    {
-        Error out(communicator->getLogger());
-        out << "Plugin " << name << ": creation failed with " << ex.what();
-        return 0;
-    }
-    catch(...)
-    {
-        Error out(communicator->getLogger());
-        out << "Plugin " << name << ": creation failed with unknown exception";
-        return 0;
-    }
-}
-
-}
-
-namespace Ice
-{
-
-ICE_API void
-registerIceStringConverter(bool loadOnInitialize)
-{
-    Ice::registerPluginFactory("IceStringConverter", createStringConverter, loadOnInitialize);
-}
-
-}
diff --git a/cpp/src/Ice/SysLoggerI.cpp b/cpp/src/Ice/SysLoggerI.cpp
index c0c52b83583..663ee64b7e9 100644
--- a/cpp/src/Ice/SysLoggerI.cpp
+++ b/cpp/src/Ice/SysLoggerI.cpp
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+#ifndef _WIN32
+
 #include <Ice/SysLoggerI.h>
 #include <Ice/LocalException.h>
 #include <syslog.h>
@@ -163,5 +165,7 @@ Ice::SysLoggerI::getPrefix()
 Ice::LoggerPtr
 Ice::SysLoggerI::cloneWithPrefix(const string& prefix)
 {
-    return new SysLoggerI(prefix, _facility);
+    return ICE_MAKE_SHARED(SysLoggerI, prefix, _facility);
 }
+
+#endif
diff --git a/cpp/src/Ice/SysLoggerI.h b/cpp/src/Ice/SysLoggerI.h
index 16c2b2edab2..8e4d4c0f48d 100644
--- a/cpp/src/Ice/SysLoggerI.h
+++ b/cpp/src/Ice/SysLoggerI.h
@@ -21,6 +21,7 @@ class SysLoggerI : public Logger, public ::IceUtil::Mutex
 public:
 
     SysLoggerI(const std::string&, const std::string&);
+    SysLoggerI(const std::string&, int);
     ~SysLoggerI();
 
     virtual void print(const std::string&);
@@ -32,8 +33,6 @@ public:
 
 private:
 
-    SysLoggerI(const std::string&, int);
-
     int _facility;
     const std::string _prefix;
 };
diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp
index 8ca874cc218..bf1fd17e410 100644..100755
--- a/cpp/src/Ice/TcpAcceptor.cpp
+++ b/cpp/src/Ice/TcpAcceptor.cpp
@@ -17,8 +17,21 @@
 #include <Ice/StreamSocket.h>
 #include <IceUtil/StringUtil.h>
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP)
 #  include <Mswsock.h>
+#elif defined(ICE_OS_WINRT)
+using namespace Platform;
+using namespace Windows::Foundation;
+using namespace Windows::Storage::Streams;
+using namespace Windows::Networking;
+using namespace Windows::Networking::Sockets;
+#endif
+
+//
+// Use the system default for the listen() backlog or 511 if not defined.
+//
+#ifndef SOMAXCONN
+#  define SOMAXCONN 511
 #endif
 
 using namespace std;
@@ -33,22 +46,28 @@ IceInternal::TcpAcceptor::getNativeInfo()
     return this;
 }
 
-#ifdef ICE_USE_IOCP
-AsyncInfo*
-#  ifndef NDEBUG
-IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation op)
-#  else
-IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation)
-#  endif
-{
-    assert(op == SocketOperationRead);
-    return &_info;
-}
-#endif
-
 void
 IceInternal::TcpAcceptor::close()
 {
+#if defined(ICE_OS_WINRT)
+    IceUtil::Mutex::Lock lock(_mutex);
+    if(_acceptPending)
+    {
+        assert(_accepted.empty());
+        completed(SocketOperationRead);
+        _acceptPending = false;
+    }
+    else if(!_accepted.empty())
+    {
+        for(deque<Windows::Networking::Sockets::StreamSocket^>::const_iterator p = _accepted.begin();
+            p != _accepted.end(); ++p)
+        {
+            closeSocket(*p);
+        }
+        _accepted.clear();
+    }
+#endif
+
     if(_fd != INVALID_SOCKET)
     {
         closeSocketNoThrow(_fd);
@@ -62,7 +81,9 @@ IceInternal::TcpAcceptor::listen()
     try
     {
         const_cast<Address&>(_addr) = doBind(_fd, _addr);
+#if !defined(ICE_OS_WINRT)
         doListen(_fd, _backlog);
+#endif
     }
     catch(...)
     {
@@ -73,7 +94,14 @@ IceInternal::TcpAcceptor::listen()
     return _endpoint;
 }
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP)
+
+AsyncInfo*
+IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation)
+{
+    return &_info;
+}
+
 void
 IceInternal::TcpAcceptor::startAccept()
 {
@@ -120,12 +148,9 @@ IceInternal::TcpAcceptor::finishAccept()
     }
 }
 
-#endif
-
 TransceiverPtr
 IceInternal::TcpAcceptor::accept()
 {
-#ifdef ICE_USE_IOCP
     if(_acceptFd == INVALID_SOCKET)
     {
         SocketException ex(__FILE__, __LINE__);
@@ -144,13 +169,82 @@ IceInternal::TcpAcceptor::accept()
 
     SOCKET fd = _acceptFd;
     _acceptFd = INVALID_SOCKET;
-#else
-    SOCKET fd = doAccept(_fd);
-#endif
+    return new TcpTransceiver(_instance, new StreamSocket(_instance, fd));
+}
+
+#elif defined(ICE_OS_WINRT)
+
+AsyncInfo*
+IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation)
+{
+    return 0; // Not used
+}
+
+void
+IceInternal::TcpAcceptor::startAccept()
+{
+    assert(_fd != INVALID_SOCKET);
+
+    //
+    // If there are already sockets waiting to be accepted, we just
+    // notify the selector that the acceptor is ready for acceting the
+    // new socket. Otherwise, we set the _acceptPending flag, when a
+    // new socket connection event is received, the message handler
+    // will notify the selector.
+    //
+    IceUtil::Mutex::Lock lock(_mutex);
+    assert(!_acceptPending);
+    if(!_accepted.empty())
+    {
+        completed(SocketOperationRead);
+    }
+    else
+    {
+        _acceptPending = true;
+    }
+}
+
+void
+IceInternal::TcpAcceptor::finishAccept()
+{
+    //
+    // Nothing to do, we just check there's at least one accepted
+    // socket or the acceptor was closed.
+    //
+    IceUtil::Mutex::Lock lock(_mutex);
+    assert(!_acceptPending && (!_accepted.empty() || _fd == INVALID_SOCKET));
+}
+
+TransceiverPtr
+IceInternal::TcpAcceptor::accept()
+{
+    if(_fd == INVALID_SOCKET) // Acceptor closed.
+    {
+        assert(_accepted.empty());
+        throw SocketException(__FILE__, __LINE__);
+    }
+
+    Windows::Networking::Sockets::StreamSocket^ fd;
+    {
+        IceUtil::Mutex::Lock lock(_mutex);
+        assert(!_accepted.empty());
+        fd = _accepted.front();
+        _accepted.pop_front();
+    }
 
     return new TcpTransceiver(_instance, new StreamSocket(_instance, fd));
 }
 
+#else
+
+TransceiverPtr
+IceInternal::TcpAcceptor::accept()
+{
+    return new TcpTransceiver(_instance, new StreamSocket(_instance, doAccept(_fd)));
+}
+
+#endif
+
 string
 IceInternal::TcpAcceptor::protocol() const
 {
@@ -191,23 +285,49 @@ IceInternal::TcpAcceptor::TcpAcceptor(const TcpEndpointIPtr& endpoint,
     _instance(instance),
     _addr(getAddressForServer(host, port, _instance->protocolSupport(), instance->preferIPv6()))
 #ifdef ICE_USE_IOCP
-    , _acceptFd(INVALID_SOCKET),
-    _info(SocketOperationRead)
+    , _acceptFd(INVALID_SOCKET), _info(SocketOperationRead)
 #endif
 {
-#ifdef SOMAXCONN
     _backlog = instance->properties()->getPropertyAsIntWithDefault("Ice.TCP.Backlog", SOMAXCONN);
+
+#if defined(ICE_OS_WINRT)
+    _fd = ref new StreamSocketListener();
+    safe_cast<StreamSocketListener^>(_fd)->ConnectionReceived +=
+        ref new TypedEventHandler<StreamSocketListener^, StreamSocketListenerConnectionReceivedEventArgs^>(
+            [=](StreamSocketListener^, StreamSocketListenerConnectionReceivedEventArgs^ args)
+                {
+                    IceUtil::Mutex::Lock lock(_mutex);
+                    if(_fd == INVALID_SOCKET) // Acceptor was closed.
+                    {
+                        closeSocket(args->Socket);
+                        return;
+                    }
+                    _accepted.push_back(args->Socket);
+
+                    //
+                    // If the acceptor is waiting for a socket to be accepted, notify
+                    // the selector that the acceptor is ready for "read". This will
+                    // in turn caused finishAccept() and accept() to be called by the
+                    // thread pool. If the acceptor isn't ready to accept the socket,
+                    // it is just queued, when startAccept is called it will be dequed.
+                    //
+                    if(_acceptPending)
+                    {
+                        completed(SocketOperationRead);
+                        _acceptPending = false;
+                    }
+                });
 #else
-    _backlog = instance->properties()->getPropertyAsIntWithDefault("Ice.TCP.Backlog", 511);
+    _fd = createServerSocket(false, _addr, instance->protocolSupport());
 #endif
 
-    _fd = createServerSocket(false, _addr, instance->protocolSupport());
 #ifdef ICE_USE_IOCP
     _acceptBuf.resize((sizeof(sockaddr_storage) + 16) * 2);
 #endif
 
     setBlock(_fd, false);
     setTcpBufSize(_fd, _instance);
+
 #ifndef _WIN32
     //
     // Enable SO_REUSEADDR on Unix platforms to allow re-using the
diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h
index c5e23428895..2d9fc24d72f 100644
--- a/cpp/src/Ice/TcpAcceptor.h
+++ b/cpp/src/Ice/TcpAcceptor.h
@@ -15,6 +15,10 @@
 #include <Ice/Acceptor.h>
 #include <Ice/Network.h>
 
+#if defined(ICE_OS_WINRT)
+#include <deque>
+#endif
+
 namespace IceInternal
 {
 
@@ -25,13 +29,13 @@ class TcpAcceptor : public Acceptor, public NativeInfo
 public:
 
     virtual NativeInfoPtr getNativeInfo();
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual AsyncInfo* getAsyncInfo(SocketOperation);
 #endif
 
     virtual void close();
     virtual EndpointIPtr listen();
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual void startAccept();
     virtual void finishAccept();
 #endif
@@ -54,11 +58,15 @@ private:
     const Address _addr;
 
     int _backlog;
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP)
     SOCKET _acceptFd;
     int _acceptError;
     std::vector<char> _acceptBuf;
     AsyncInfo _info;
+#elif defined(ICE_OS_WINRT)
+    IceUtil::Mutex _mutex;
+    bool _acceptPending;
+    std::deque<Windows::Networking::Sockets::StreamSocket^> _accepted;
 #endif
 };
 
diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp
index 29d6a9fcd47..2b2e26e924e 100644
--- a/cpp/src/Ice/TcpEndpointI.cpp
+++ b/cpp/src/Ice/TcpEndpointI.cpp
@@ -12,7 +12,8 @@
 #include <Ice/TcpAcceptor.h>
 #include <Ice/TcpConnector.h>
 #include <Ice/TcpTransceiver.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/LocalException.h>
 #include <Ice/ProtocolInstance.h>
 #include <Ice/HashUtil.h>
@@ -21,7 +22,9 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(TcpEndpointI* p) { return p; }
+#endif
 
 extern "C"
 {
@@ -50,7 +53,7 @@ IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance) :
 {
 }
 
-IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance, BasicStream* s) :
+IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance, InputStream* s) :
     IPEndpointI(instance, s),
     _timeout(-1),
     _compress(false)
@@ -59,20 +62,19 @@ IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance, Bas
     s->read(const_cast<bool&>(_compress));
 }
 
-EndpointInfoPtr
-IceInternal::TcpEndpointI::getInfo() const
+void
+IceInternal::TcpEndpointI::streamWriteImpl(OutputStream* s) const
 {
-    TCPEndpointInfoPtr info = new InfoI<Ice::TCPEndpointInfo>(const_cast<TcpEndpointI*>(this));
-    fillEndpointInfo(info.get());
-    return info;
+    IPEndpointI::streamWriteImpl(s);
+    s->write(_timeout);
+    s->write(_compress);
 }
 
 EndpointInfoPtr
-IceInternal::TcpEndpointI::getWSInfo(const string& resource) const
+IceInternal::TcpEndpointI::getInfo() const
 {
-    WSEndpointInfoPtr info = new InfoI<Ice::WSEndpointInfo>(const_cast<TcpEndpointI*>(this));
+    TCPEndpointInfoPtr info = ICE_MAKE_SHARED(InfoI<Ice::TCPEndpointInfo>, shared_from_this());
     fillEndpointInfo(info.get());
-    info->resource = resource;
     return info;
 }
 
@@ -87,11 +89,11 @@ IceInternal::TcpEndpointI::timeout(Int timeout) const
 {
     if(timeout == _timeout)
     {
-        return const_cast<TcpEndpointI*>(this);
+        return shared_from_this();
     }
     else
     {
-        return new TcpEndpointI(_instance, _host, _port, _sourceAddr, timeout, _connectionId, _compress);
+        return ICE_MAKE_SHARED(TcpEndpointI, _instance, _host, _port, _sourceAddr, timeout, _connectionId, _compress);
     }
 }
 
@@ -106,11 +108,11 @@ IceInternal::TcpEndpointI::compress(bool compress) const
 {
     if(compress == _compress)
     {
-        return const_cast<TcpEndpointI*>(this);
+        return shared_from_this();
     }
     else
     {
-        return new TcpEndpointI(_instance, _host, _port, _sourceAddr, _timeout, _connectionId, compress);
+        return ICE_MAKE_SHARED(TcpEndpointI, _instance, _host, _port, _sourceAddr, _timeout, _connectionId, compress);
     }
 }
 
@@ -123,19 +125,19 @@ IceInternal::TcpEndpointI::datagram() const
 TransceiverPtr
 IceInternal::TcpEndpointI::transceiver() const
 {
-    return 0;
+    return ICE_NULLPTR;
 }
 
 AcceptorPtr
 IceInternal::TcpEndpointI::acceptor(const string&) const
 {
-    return new TcpAcceptor(const_cast<TcpEndpointI*>(this), _instance, _host, _port);
+    return new TcpAcceptor(ICE_DYNAMIC_CAST(TcpEndpointI, shared_from_this()), _instance, _host, _port);
 }
 
 TcpEndpointIPtr
 IceInternal::TcpEndpointI::endpoint(const TcpAcceptorPtr& acceptor) const
 {
-    return new TcpEndpointI(_instance, _host, acceptor->effectivePort(), _sourceAddr, _timeout, _connectionId,
+    return ICE_MAKE_SHARED(TcpEndpointI, _instance, _host, acceptor->effectivePort(), _sourceAddr, _timeout, _connectionId,
                             _compress);
 }
 
@@ -171,7 +173,11 @@ IceInternal::TcpEndpointI::options() const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::TcpEndpointI::operator==(const Endpoint& r) const
+#else
 IceInternal::TcpEndpointI::operator==(const LocalObject& r) const
+#endif
 {
     if(!IPEndpointI::operator==(r))
     {
@@ -198,12 +204,15 @@ IceInternal::TcpEndpointI::operator==(const LocalObject& r) const
     {
         return false;
     }
-
     return true;
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::TcpEndpointI::operator<(const Endpoint& r) const
+#else
 IceInternal::TcpEndpointI::operator<(const LocalObject& r) const
+#endif
 {
     const TcpEndpointI* p = dynamic_cast<const TcpEndpointI*>(&r);
     if(!p)
@@ -243,14 +252,6 @@ IceInternal::TcpEndpointI::operator<(const LocalObject& r) const
 }
 
 void
-IceInternal::TcpEndpointI::streamWriteImpl(BasicStream* s) const
-{
-    IPEndpointI::streamWriteImpl(s);
-    s->write(_timeout);
-    s->write(_compress);
-}
-
-void
 IceInternal::TcpEndpointI::hashInit(Ice::Int& h) const
 {
     IPEndpointI::hashInit(h);
@@ -330,7 +331,7 @@ IceInternal::TcpEndpointI::createConnector(const Address& address, const Network
 IPEndpointIPtr
 IceInternal::TcpEndpointI::createEndpoint(const string& host, int port, const string& connectionId) const
 {
-    return new TcpEndpointI(_instance, host, port, _sourceAddr, _timeout, connectionId, _compress);
+    return ICE_MAKE_SHARED(TcpEndpointI, _instance, host, port, _sourceAddr, _timeout, connectionId, _compress);
 }
 
 IceInternal::TcpEndpointFactory::TcpEndpointFactory(const ProtocolInstancePtr& instance) : _instance(instance)
@@ -356,15 +357,15 @@ IceInternal::TcpEndpointFactory::protocol() const
 EndpointIPtr
 IceInternal::TcpEndpointFactory::create(vector<string>& args, bool oaEndpoint) const
 {
-    IPEndpointIPtr endpt = new TcpEndpointI(_instance);
+    IPEndpointIPtr endpt = ICE_MAKE_SHARED(TcpEndpointI, _instance);
     endpt->initWithOptions(args, oaEndpoint);
     return endpt;
 }
 
 EndpointIPtr
-IceInternal::TcpEndpointFactory::read(BasicStream* s) const
+IceInternal::TcpEndpointFactory::read(InputStream* s) const
 {
-    return new TcpEndpointI(_instance, s);
+    return ICE_MAKE_SHARED(TcpEndpointI, _instance, s);
 }
 
 void
@@ -374,7 +375,7 @@ IceInternal::TcpEndpointFactory::destroy()
 }
 
 EndpointFactoryPtr
-IceInternal::TcpEndpointFactory::clone(const ProtocolInstancePtr& instance) const
+IceInternal::TcpEndpointFactory::clone(const ProtocolInstancePtr& instance, const EndpointFactoryPtr&) const
 {
     return new TcpEndpointFactory(instance);
 }
diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h
index c43832bb3d9..f40c5c14713 100644
--- a/cpp/src/Ice/TcpEndpointI.h
+++ b/cpp/src/Ice/TcpEndpointI.h
@@ -14,22 +14,22 @@
 #include <Ice/IPEndpointI.h>
 #include <Ice/EndpointFactory.h>
 #include <Ice/Network.h> // for IceIternal::Address
-#include <Ice/WSEndpoint.h>
 
 namespace IceInternal
 {
 
-class TcpEndpointI : public IPEndpointI, public WSEndpointDelegate
+class TcpEndpointI : public IPEndpointI, public Ice::EnableSharedFromThis<TcpEndpointI>
 {
 public:
 
     TcpEndpointI(const ProtocolInstancePtr&, const std::string&, Ice::Int, const Address&, Ice::Int, const std::string&,
                  bool);
     TcpEndpointI(const ProtocolInstancePtr&);
-    TcpEndpointI(const ProtocolInstancePtr&, BasicStream*);
+    TcpEndpointI(const ProtocolInstancePtr&, Ice::InputStream*);
+
+    virtual void streamWriteImpl(Ice::OutputStream*) const;
 
     virtual Ice::EndpointInfoPtr getInfo() const;
-    virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const;
 
     virtual Ice::Int timeout() const;
     virtual EndpointIPtr timeout(Ice::Int) const;
@@ -41,16 +41,20 @@ public:
     virtual AcceptorPtr acceptor(const std::string&) const;
     virtual std::string options() const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const Ice::Endpoint&) const;
+    virtual bool operator<(const Ice::Endpoint&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
-
+#endif
     TcpEndpointIPtr endpoint(const TcpAcceptorPtr&) const;
 
     using IPEndpointI::connectionId;
+    using Ice::EnableSharedFromThis<TcpEndpointI>::shared_from_this;
 
 protected:
 
-    virtual void streamWriteImpl(BasicStream*) const;
     virtual void hashInit(Ice::Int&) const;
     virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const;
     virtual bool checkOption(const std::string&, const std::string&, const std::string&);
@@ -77,10 +81,10 @@ public:
     virtual Ice::Short type() const;
     virtual std::string protocol() const;
     virtual EndpointIPtr create(std::vector<std::string>&, bool) const;
-    virtual EndpointIPtr read(BasicStream*) const;
+    virtual EndpointIPtr read(Ice::InputStream*) const;
     virtual void destroy();
 
-    virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const;
+    virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&, const EndpointFactoryPtr&) const;
 
 private:
 
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index 4be06f31b72..be280be0476 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -25,13 +25,17 @@ IceInternal::TcpTransceiver::getNativeInfo()
 }
 
 SocketOperation
-IceInternal::TcpTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer, bool&)
+IceInternal::TcpTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer)
 {
     return _stream->connect(readBuffer, writeBuffer);
 }
 
 SocketOperation
+#ifdef ICE_CPP11_MAPPING
+IceInternal::TcpTransceiver::closing(bool initiator, exception_ptr)
+#else
 IceInternal::TcpTransceiver::closing(bool initiator, const Ice::LocalException&)
+#endif
 {
     // If we are initiating the connection closure, wait for the peer
     // to close the TCP/IP connection. Otherwise, close immediately.
@@ -51,12 +55,12 @@ IceInternal::TcpTransceiver::write(Buffer& buf)
 }
 
 SocketOperation
-IceInternal::TcpTransceiver::read(Buffer& buf, bool&)
+IceInternal::TcpTransceiver::read(Buffer& buf)
 {
     return _stream->read(buf);
 }
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
 bool
 IceInternal::TcpTransceiver::startWrite(Buffer& buf)
 {
@@ -76,7 +80,7 @@ IceInternal::TcpTransceiver::startRead(Buffer& buf)
 }
 
 void
-IceInternal::TcpTransceiver::finishRead(Buffer& buf, bool&)
+IceInternal::TcpTransceiver::finishRead(Buffer& buf)
 {
     _stream->finishRead(buf);
 }
@@ -103,17 +107,13 @@ IceInternal::TcpTransceiver::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceInternal::TcpTransceiver::getInfo() const
 {
-    TCPConnectionInfoPtr info = new TCPConnectionInfo();
-    fillConnectionInfo(info);
-    return info;
-}
-
-Ice::ConnectionInfoPtr
-IceInternal::TcpTransceiver::getWSInfo(const Ice::HeaderDict& headers) const
-{
-    WSConnectionInfoPtr info = new WSConnectionInfo();
-    fillConnectionInfo(info);
-    info->headers = headers;
+    TCPConnectionInfoPtr info = ICE_MAKE_SHARED(TCPConnectionInfo);
+    fdToAddressAndPort(_stream->fd(), info->localAddress, info->localPort, info->remoteAddress, info->remotePort);
+    if(_stream->fd() != INVALID_SOCKET)
+    {
+        info->rcvSize = getRecvBufferSize(_stream->fd());
+        info->sndSize = getSendBufferSize(_stream->fd());
+    }
     return info;
 }
 
@@ -137,14 +137,3 @@ IceInternal::TcpTransceiver::TcpTransceiver(const ProtocolInstancePtr& instance,
 IceInternal::TcpTransceiver::~TcpTransceiver()
 {
 }
-
-void
-IceInternal::TcpTransceiver::fillConnectionInfo(const TCPConnectionInfoPtr& info) const
-{
-    fdToAddressAndPort(_stream->fd(), info->localAddress, info->localPort, info->remoteAddress, info->remotePort);
-    if(_stream->fd() != INVALID_SOCKET)
-    {
-        info->rcvSize = getRecvBufferSize(_stream->fd());
-        info->sndSize = getSendBufferSize(_stream->fd());
-    }
-}
diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h
index 6a02b99593c..198b4aeab77 100644
--- a/cpp/src/Ice/TcpTransceiver.h
+++ b/cpp/src/Ice/TcpTransceiver.h
@@ -14,7 +14,6 @@
 #include <Ice/Transceiver.h>
 #include <Ice/Network.h>
 #include <Ice/StreamSocket.h>
-#include <Ice/WSTransceiver.h>
 
 namespace IceInternal
 {
@@ -22,28 +21,31 @@ namespace IceInternal
 class TcpConnector;
 class TcpAcceptor;
 
-class TcpTransceiver : public Transceiver, public WSTransceiverDelegate
+class TcpTransceiver : public Transceiver
 {
 public:
 
     virtual NativeInfoPtr getNativeInfo();
 
-    virtual SocketOperation initialize(Buffer&, Buffer&, bool&);
+    virtual SocketOperation initialize(Buffer&, Buffer&);
+#ifdef ICE_CPP11_MAPPING
+    virtual SocketOperation closing(bool, std::exception_ptr);
+#else
     virtual SocketOperation closing(bool, const Ice::LocalException&);
+#endif
     virtual void close();
     virtual SocketOperation write(Buffer&);
-    virtual SocketOperation read(Buffer&, bool&);
-#ifdef ICE_USE_IOCP
+    virtual SocketOperation read(Buffer&);
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual bool startWrite(Buffer&);
     virtual void finishWrite(Buffer&);
     virtual void startRead(Buffer&);
-    virtual void finishRead(Buffer&, bool&);
+    virtual void finishRead(Buffer&);
 #endif
     virtual std::string protocol() const;
     virtual std::string toString() const;
     virtual std::string toDetailedString() const;
     virtual Ice::ConnectionInfoPtr getInfo() const;
-    virtual Ice::ConnectionInfoPtr getWSInfo(const Ice::HeaderDict&) const;
     virtual void checkSendSize(const Buffer&);
     virtual void setBufferSize(int rcvSize, int sndSize);
 
@@ -52,8 +54,6 @@ private:
     TcpTransceiver(const ProtocolInstancePtr&, const StreamSocketPtr&);
     virtual ~TcpTransceiver();
 
-    void fillConnectionInfo(const Ice::TCPConnectionInfoPtr&) const;
-
     friend class TcpConnector;
     friend class TcpAcceptor;
 
diff --git a/cpp/src/IceUtil/Thread.cpp b/cpp/src/Ice/Thread.cpp
index 12c5fc1738c..12c5fc1738c 100644
--- a/cpp/src/IceUtil/Thread.cpp
+++ b/cpp/src/Ice/Thread.cpp
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 79e3ce00dc5..ea2e18d99c3 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -99,29 +99,6 @@ private:
     IceUtil::ThreadPtr _thread;
 };
 
-class InterruptWorkItem : public ThreadPoolWorkItem
-{
-public:
-
-    virtual void
-    execute(ThreadPoolCurrent& current)
-    {
-        // Nothing to do, this is just used to interrupt the thread pool selector.
-    }
-};
-ThreadPoolWorkItemPtr interruptWorkItem;
-
-class InterruptWorkItemInit
-{
-public:
-
-    InterruptWorkItemInit()
-    {
-        interruptWorkItem = new InterruptWorkItem;
-    }
-};
-InterruptWorkItemInit init;
-
 //
 // Exception raised by the thread pool work queue when the thread pool
 // is destroyed.
@@ -132,6 +109,16 @@ class ThreadPoolDestroyedException
 
 }
 
+Ice::DispatcherCall::~DispatcherCall()
+{
+    // Out of line to avoid weak vtable
+}
+
+Ice::Dispatcher::~Dispatcher()
+{
+    // Out of line to avoid weak vtable
+}
+
 IceInternal::DispatchWorkItem::DispatchWorkItem()
 {
 }
@@ -147,77 +134,38 @@ IceInternal::DispatchWorkItem::execute(ThreadPoolCurrent& current)
     current.dispatchFromThisThread(this);
 }
 
-IceInternal::ThreadPoolWorkQueue::ThreadPoolWorkQueue(const InstancePtr& instance, Selector& selector) :
-    _instance(instance),
-    _selector(selector),
+IceInternal::ThreadPoolWorkQueue::ThreadPoolWorkQueue(ThreadPool& threadPool) :
+    _threadPool(threadPool),
     _destroyed(false)
-#ifdef ICE_USE_IOCP
-    , _info(SocketOperationRead)
-#endif
 {
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
-    SOCKET fds[2];
-    createPipe(fds);
-    _fdIntrRead = fds[0];
-    _fdIntrWrite = fds[1];
-
-    _selector.initialize(this);
-    _selector.update(this, SocketOperationNone, SocketOperationRead);
-#endif
-}
-
-IceInternal::ThreadPoolWorkQueue::~ThreadPoolWorkQueue()
-{
-    assert(_destroyed);
-
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
-    try
-    {
-        closeSocket(_fdIntrRead);
-    }
-    catch(const LocalException& ex)
-    {
-        Error out(_instance->initializationData().logger);
-        out << "exception in selector while calling closeSocket():\n" << ex;
-    }
-
-    try
-    {
-        closeSocket(_fdIntrWrite);
-    }
-    catch(const LocalException& ex)
-    {
-        Error out(_instance->initializationData().logger);
-        out << "exception in selector while calling closeSocket():\n" << ex;
-    }
-#endif
+    _registered = SocketOperationRead;
 }
 
 void
 IceInternal::ThreadPoolWorkQueue::destroy()
 {
-    Lock sync(*this);
+    //Lock sync(*this); Called with the thread pool locked
     assert(!_destroyed);
     _destroyed = true;
-    postMessage();
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+    _threadPool._selector.completed(this, SocketOperationRead);
+#else
+    _threadPool._selector.ready(this, SocketOperationRead, true);
+#endif
 }
 
 void
 IceInternal::ThreadPoolWorkQueue::queue(const ThreadPoolWorkItemPtr& item)
 {
-    Lock sync(*this);
-    if(_destroyed)
-    {
-        throw CommunicatorDestroyedException(__FILE__, __LINE__);
-    }
+    //Lock sync(*this); Called with the thread pool locked
     _workItems.push_back(item);
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+    _threadPool._selector.completed(this, SocketOperationRead);
+#else
     if(_workItems.size() == 1)
     {
-        postMessage();
+        _threadPool._selector.ready(this, SocketOperationRead, true);
     }
-#else
-    postMessage();
 #endif
 }
 
@@ -242,47 +190,24 @@ IceInternal::ThreadPoolWorkQueue::message(ThreadPoolCurrent& current)
 {
     ThreadPoolWorkItemPtr workItem;
     {
-        Lock sync(*this);
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_threadPool);
         if(!_workItems.empty())
         {
             workItem = _workItems.front();
             _workItems.pop_front();
-
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
-            if(_workItems.empty())
-            {
-                char c;
-                while(true)
-                {
-                    ssize_t ret;
-#   ifdef _WIN32
-                    ret = ::recv(_fdIntrRead, &c, 1, 0);
-#   else
-                    ret = ::read(_fdIntrRead, &c, 1);
-#   endif
-                    if(ret == SOCKET_ERROR)
-                    {
-                        if(interrupted())
-                        {
-                            continue;
-                        }
-
-                        SocketException ex(__FILE__, __LINE__);
-                        ex.error = getSocketErrno();
-                        throw ex;
-                    }
-                    break;
-                }
-            }
-#endif
         }
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
         else
         {
             assert(_destroyed);
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
-            postMessage();
-#endif
+            _threadPool._selector.completed(this, SocketOperationRead);
         }
+#else
+        if(_workItems.empty() && !_destroyed)
+        {
+            _threadPool._selector.ready(this, SocketOperationRead, false);
+        }
+#endif
     }
 
     if(workItem)
@@ -291,6 +216,7 @@ IceInternal::ThreadPoolWorkQueue::message(ThreadPoolCurrent& current)
     }
     else
     {
+        assert(_destroyed);
         current.ioCompleted();
         throw ThreadPoolDestroyedException();
     }
@@ -311,47 +237,7 @@ IceInternal::ThreadPoolWorkQueue::toString() const
 NativeInfoPtr
 IceInternal::ThreadPoolWorkQueue::getNativeInfo()
 {
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
-    return new NativeInfo(_fdIntrRead);
-#else
     return 0;
-#endif
-}
-
-void
-IceInternal::ThreadPoolWorkQueue::postMessage()
-{
-#if defined(ICE_USE_IOCP)
-    if(!PostQueuedCompletionStatus(_selector.getIOCPHandle(), 0, reinterpret_cast<ULONG_PTR>(this), &_info))
-    {
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = GetLastError();
-        throw ex;
-    }
-#elif defined(ICE_OS_WINRT)
-    _selector.completed(this, SocketOperationRead);
-#else
-    char c = 0;
-    while(true)
-    {
-#   ifdef _WIN32
-        if(::send(_fdIntrWrite, &c, 1, 0) == SOCKET_ERROR)
-#   else
-        if(::write(_fdIntrWrite, &c, 1) == SOCKET_ERROR)
-#   endif
-        {
-            if(interrupted())
-            {
-                continue;
-            }
-
-            SocketException ex(__FILE__, __LINE__);
-            ex.error = getSocketErrno();
-            throw ex;
-        }
-        break;
-    }
-#endif
 }
 
 IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& prefix, int timeout) :
@@ -469,7 +355,8 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
         const_cast<int&>(_priority) = properties->getPropertyAsInt("Ice.ThreadPriority");
     }
 
-    _workQueue = new ThreadPoolWorkQueue(_instance, _selector);
+    _workQueue = ICE_MAKE_SHARED(ThreadPoolWorkQueue, *this);
+    _selector.initialize(_workQueue.get());
 
     if(_instance->traceLevels()->threadPool >= 1)
     {
@@ -528,7 +415,6 @@ IceInternal::ThreadPool::destroy()
     {
         return;
     }
-
     _destroyed = true;
     _workQueue->destroy();
 }
@@ -549,6 +435,28 @@ IceInternal::ThreadPool::initialize(const EventHandlerPtr& handler)
     Lock sync(*this);
     assert(!_destroyed);
     _selector.initialize(handler.get());
+
+    class ReadyCallbackI : public ReadyCallback
+    {
+    public:
+
+        ReadyCallbackI(const ThreadPoolPtr& threadPool, const EventHandlerPtr& handler) :
+            _threadPool(threadPool), _handler(handler)
+        {
+        }
+
+        virtual void
+        ready(SocketOperation op, bool value)
+        {
+            _threadPool->ready(_handler, op, value);
+        }
+
+    private:
+
+        const ThreadPoolPtr _threadPool;
+        const EventHandlerPtr _handler;
+    };
+    handler->getNativeInfo()->setReadyCallback(new ReadyCallbackI(this, handler));
 }
 
 void
@@ -569,20 +477,6 @@ IceInternal::ThreadPool::update(const EventHandlerPtr& handler, SocketOperation
     }
 
     _selector.update(handler.get(), remove, add);
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
-    if(add & SocketOperationRead && handler->_hasMoreData && !(handler->_disabled & SocketOperationRead))
-    {
-        if(_pendingHandlers.empty())
-        {
-            _workQueue->queue(interruptWorkItem); // Interrupt select()
-        }
-       _pendingHandlers.insert(handler.get());
-    }
-    else if(remove & SocketOperationRead)
-    {
-        _pendingHandlers.erase(handler.get());
-    }
-#endif
 }
 
 bool
@@ -592,7 +486,6 @@ IceInternal::ThreadPool::finish(const EventHandlerPtr& handler, bool closeNow)
     assert(!_destroyed);
 #if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
     closeNow = _selector.finish(handler.get(), closeNow); // This must be called before!
-    _pendingHandlers.erase(handler.get());
     _workQueue->queue(new FinishedWorkItem(handler, !closeNow));
     return closeNow;
 #else
@@ -611,13 +504,32 @@ IceInternal::ThreadPool::finish(const EventHandlerPtr& handler, bool closeNow)
 }
 
 void
+IceInternal::ThreadPool::ready(const EventHandlerPtr& handler, SocketOperation op, bool value)
+{
+    Lock sync(*this);
+    if(_destroyed)
+    {
+        return;
+    }
+    _selector.ready(handler.get(), op, value);
+}
+
+void
 IceInternal::ThreadPool::dispatchFromThisThread(const DispatchWorkItemPtr& workItem)
 {
     if(_dispatcher)
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            _dispatcher([workItem]()
+                        {
+                            workItem->run();
+                        },
+                        workItem->getConnection());
+#else
             _dispatcher->dispatch(workItem, workItem->getConnection());
+#endif
         }
         catch(const std::exception& ex)
         {
@@ -645,6 +557,11 @@ IceInternal::ThreadPool::dispatchFromThisThread(const DispatchWorkItemPtr& workI
 void
 IceInternal::ThreadPool::dispatch(const DispatchWorkItemPtr& workItem)
 {
+    Lock sync(*this);
+    if(_destroyed)
+    {
+        throw CommunicatorDestroyedException(__FILE__, __LINE__);
+    }
     _workQueue->queue(workItem);
 }
 
@@ -663,10 +580,6 @@ IceInternal::ThreadPool::joinWithAllThreads()
     {
         (*p)->getThreadControl().join();
     }
-
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
-    _selector.finish(_workQueue.get(), true);
-#endif
     _selector.destroy();
 }
 
@@ -682,7 +595,6 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
 #if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
     ThreadPoolCurrent current(_instance, this, thread);
     bool select = false;
-    vector<pair<EventHandler*, SocketOperation> > handlers;
     while(true)
     {
         if(current._handler)
@@ -711,7 +623,7 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
         {
             try
             {
-                _selector.select(handlers, _serverIdleTime);
+                _selector.select(_serverIdleTime);
             }
             catch(const SelectorTimeoutException&)
             {
@@ -730,22 +642,8 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
             {
                 if(select)
                 {
-                    _handlers.swap(handlers);
-                    if(!_pendingHandlers.empty())
-                    {
-                        for(_nextHandler = _handlers.begin(); _nextHandler != _handlers.end(); ++_nextHandler)
-                        {
-                            _pendingHandlers.erase(_nextHandler->first);
-                        }
-                        set<EventHandler*>::const_iterator p;
-                        for(p = _pendingHandlers.begin(); p != _pendingHandlers.end(); ++p)
-                        {
-                            _handlers.push_back(make_pair(*p, SocketOperationRead));
-                        }
-                        _pendingHandlers.clear();
-                    }
+                    _selector.finishSelect(_handlers);
                     _nextHandler = _handlers.begin();
-                    _selector.finishSelect();
                     select = false;
                 }
                 else if(!current._leader && followerWait(current))
@@ -762,14 +660,6 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
                     // the IO thread count now.
                     //
                     --_inUseIO;
-                    if(current._handler->_hasMoreData && current._handler->_registered & SocketOperationRead)
-                    {
-                        if(_pendingHandlers.empty())
-                        {
-                            _workQueue->queue(interruptWorkItem); // Interrupt select()
-                        }
-                        _pendingHandlers.insert(current._handler.get());
-                    }
                 }
                 else
                 {
@@ -780,14 +670,6 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
                     if(_serialize && current._handler.get() != _workQueue.get())
                     {
                         _selector.enable(current._handler.get(), current.operation);
-                        if(current._handler->_hasMoreData && current._handler->_registered & SocketOperationRead)
-                        {
-                            if(_pendingHandlers.empty())
-                            {
-                                _workQueue->queue(interruptWorkItem); // Interrupt select()
-                            }
-                            _pendingHandlers.insert(current._handler.get());
-                        }
                     }
                     assert(_inUse > 0);
                     --_inUse;
@@ -798,26 +680,23 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
                     return; // Wait timed-out.
                 }
             }
-            else if(current._handler->_hasMoreData && current._handler->_registered & SocketOperationRead)
-            {
-                if(_pendingHandlers.empty())
-                {
-                    _workQueue->queue(interruptWorkItem); // Interrupt select()
-                }
-                _pendingHandlers.insert(current._handler.get());
-            }
 
             //
             // Get the next ready handler.
             //
-            while(_nextHandler != _handlers.end() && !(_nextHandler->second & _nextHandler->first->_registered))
+            while(_nextHandler != _handlers.end() &&
+                  !(_nextHandler->second & ~_nextHandler->first->_disabled & _nextHandler->first->_registered))
             {
                 ++_nextHandler;
             }
             if(_nextHandler != _handlers.end())
             {
                 current._ioCompleted = false;
+#ifdef ICE_CPP11_MAPPING
+                current._handler = dynamic_pointer_cast<EventHandler>(_nextHandler->first->shared_from_this());
+#else
                 current._handler = _nextHandler->first;
+#endif
                 current.operation = _nextHandler->second;
                 ++_nextHandler;
                 thread->setState(ThreadStateInUseForIO);
@@ -869,10 +748,20 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
         {
             current._ioCompleted = false;
 #ifdef ICE_OS_WINRT
+#   ifdef ICE_CPP11_MAPPING
+            current._handler = dynamic_pointer_cast<EventHandler>(
+                _selector.getNextHandler(current.operation, _threadIdleTime)->shared_from_this());
+#   else
             current._handler = _selector.getNextHandler(current.operation, _threadIdleTime);
+#   endif
 #else
+#   ifdef ICE_CPP11_MAPPING
+            current._handler = dynamic_pointer_cast<EventHandler>(_selector.getNextHandler(current.operation,
+                                                current._count, current._error, _threadIdleTime)->shared_from_this());
+#   else
             current._handler = _selector.getNextHandler(current.operation, current._count, current._error,
                                                         _threadIdleTime);
+#   endif
 #endif
         }
         catch(const SelectorTimeoutException&)
@@ -919,10 +808,20 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
             try
             {
 #ifdef ICE_OS_WINRT
+#   ifdef ICE_CPP11_MAPPING
+                current._handler = dynamic_pointer_cast<EventHandler>(_selector.getNextHandler(
+                                                            current.operation, _serverIdleTime)->shared_from_this());
+#   else
                 current._handler = _selector.getNextHandler(current.operation, _serverIdleTime);
+#   endif
 #else
+#   ifdef ICE_CPP11_MAPPING
+                current._handler = dynamic_pointer_cast<EventHandler>(_selector.getNextHandler(current.operation,
+                                                current._count, current._error, _serverIdleTime)->shared_from_this());
+#   else
                 current._handler = _selector.getNextHandler(current.operation, current._count, current._error,
-                                                            _serverIdleTime);
+                                            _serverIdleTime);
+#   endif
 #endif
             }
             catch(const SelectorTimeoutException&)
@@ -1007,19 +906,6 @@ IceInternal::ThreadPool::ioCompleted(ThreadPoolCurrent& current)
             if(_serialize && current._handler.get() != _workQueue.get())
             {
                 _selector.disable(current._handler.get(), current.operation);
-
-                // Make sure the handler isn't in the set of pending handlers (this can
-                // for example occur if the handler is has more data and its added by
-                // ThreadPool::update while we were processing IO).
-                _pendingHandlers.erase(current._handler.get());
-            }
-            else if(current._handler->_hasMoreData && current._handler->_registered & SocketOperationRead)
-            {
-                if(_pendingHandlers.empty())
-                {
-                    _workQueue->queue(interruptWorkItem); // Interrupt select()
-                }
-                _pendingHandlers.insert(current._handler.get());
             }
         }
 
@@ -1090,8 +976,8 @@ IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current)
 
     if(current._handler->_started & current.operation)
     {
-        assert(!(current._handler->_ready & current.operation));
-        current._handler->_ready = static_cast<SocketOperation>(current._handler->_ready | current.operation);
+        assert(!(current._handler->_completed & current.operation));
+        current._handler->_completed = static_cast<SocketOperation>(current._handler->_completed | current.operation);
         current._handler->_started = static_cast<SocketOperation>(current._handler->_started & ~current.operation);
 
 #ifndef ICE_OS_WINRT
@@ -1105,20 +991,26 @@ IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current)
             current._handler->_pending = static_cast<SocketOperation>(current._handler->_pending & ~current.operation);
             if(!(current._handler->_pending & SocketOperationWaitForClose) && current._handler->_finish)
             {
+                Lock sync(*this);
                 _workQueue->queue(new FinishedWorkItem(current._handler, false));
                 _selector.finish(current._handler.get());
             }
             return false;
         }
     }
-    else if(!(current._handler->_ready & current.operation) && (current._handler->_registered & current.operation))
+    else if(!(current._handler->_completed & current.operation) && (current._handler->_registered & current.operation))
     {
         assert(!(current._handler->_started & current.operation));
-        if(!current._handler->startAsync(current.operation))
+        if(current._handler->_ready & current.operation)
+        {
+            return true;
+        }
+        else if(!current._handler->startAsync(current.operation))
         {
             current._handler->_pending = static_cast<SocketOperation>(current._handler->_pending & ~current.operation);
             if(!(current._handler->_pending & SocketOperationWaitForClose) && current._handler->_finish)
             {
+                Lock sync(*this);
                 _workQueue->queue(new FinishedWorkItem(current._handler, false));
                 _selector.finish(current._handler.get());
             }
@@ -1133,8 +1025,8 @@ IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current)
 
     if(current._handler->_registered & current.operation)
     {
-        assert(current._handler->_ready & current.operation);
-        current._handler->_ready = static_cast<SocketOperation>(current._handler->_ready & ~current.operation);
+        assert(current._handler->_completed & current.operation);
+        current._handler->_completed = static_cast<SocketOperation>(current._handler->_completed & ~current.operation);
         return true;
     }
     else
@@ -1142,6 +1034,7 @@ IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current)
         current._handler->_pending = static_cast<SocketOperation>(current._handler->_pending & ~current.operation);
         if(!(current._handler->_pending & SocketOperationWaitForClose) && current._handler->_finish)
         {
+            Lock sync(*this);
             _workQueue->queue(new FinishedWorkItem(current._handler, false));
             _selector.finish(current._handler.get());
         }
@@ -1152,10 +1045,14 @@ IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current)
 void
 IceInternal::ThreadPool::finishMessage(ThreadPoolCurrent& current)
 {
-    if(current._handler->_registered & current.operation)
+    if(current._handler->_registered & current.operation && !current._handler->_finish)
     {
-        assert(!(current._handler->_ready & current.operation));
-        if(!current._handler->startAsync(current.operation))
+        assert(!(current._handler->_completed & current.operation));
+        if(current._handler->_ready & current.operation)
+        {
+            _selector.completed(current._handler.get(), current.operation);
+        }
+        else if(!current._handler->startAsync(current.operation))
         {
             current._handler->_pending = static_cast<SocketOperation>(current._handler->_pending & ~current.operation);
         }
@@ -1173,6 +1070,7 @@ IceInternal::ThreadPool::finishMessage(ThreadPoolCurrent& current)
     if(!(current._handler->_pending & SocketOperationWaitForClose) && current._handler->_finish)
     {
         // There are no more pending async operations, it's time to call finish.
+        Lock sync(*this);
         _workQueue->queue(new FinishedWorkItem(current._handler, false));
         _selector.finish(current._handler.get());
     }
@@ -1285,11 +1183,19 @@ IceInternal::ThreadPool::EventHandlerThread::setState(Ice::Instrumentation::Thre
 void
 IceInternal::ThreadPool::EventHandlerThread::run()
 {
+#ifdef ICE_CPP11_MAPPING
+    if(_pool->_instance->initializationData().threadStart)
+#else
     if(_pool->_instance->initializationData().threadHook)
+#endif
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            _pool->_instance->initializationData().threadStart();
+#else
             _pool->_instance->initializationData().threadHook->start();
+#endif
         }
         catch(const exception& ex)
         {
@@ -1320,11 +1226,19 @@ IceInternal::ThreadPool::EventHandlerThread::run()
 
     _observer.detach();
 
+#ifdef ICE_CPP11_MAPPING
+    if(_pool->_instance->initializationData().threadStop)
+#else
     if(_pool->_instance->initializationData().threadHook)
+#endif
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            _pool->_instance->initializationData().threadStop();
+#else
             _pool->_instance->initializationData().threadHook->stop();
+#endif
         }
         catch(const exception& ex)
         {
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index 0fc1bcd2617..6ff21fb606d 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -23,7 +23,7 @@
 #include <Ice/PropertiesF.h>
 #include <Ice/EventHandler.h>
 #include <Ice/Selector.h>
-#include <Ice/BasicStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/ObserverHelper.h>
 
 #include <set>
@@ -35,12 +35,12 @@ namespace IceInternal
 class ThreadPoolCurrent;
 
 class ThreadPoolWorkQueue;
-typedef IceUtil::Handle<ThreadPoolWorkQueue> ThreadPoolWorkQueuePtr;
+ICE_DEFINE_PTR(ThreadPoolWorkQueuePtr, ThreadPoolWorkQueue);
 
-class ThreadPoolWorkItem : virtual public IceUtil::Shared
+class ThreadPoolWorkItem : public virtual IceUtil::Shared
 {
 public:
-    
+
     virtual void execute(ThreadPoolCurrent&) = 0;
 };
 typedef IceUtil::Handle<ThreadPoolWorkItem> ThreadPoolWorkItemPtr;
@@ -51,8 +51,8 @@ public:
 
     DispatchWorkItem();
     DispatchWorkItem(const Ice::ConnectionPtr& connection);
- 
-    const Ice::ConnectionPtr& 
+
+    const Ice::ConnectionPtr&
     getConnection()
     {
         return _connection;
@@ -66,18 +66,18 @@ private:
 };
 typedef IceUtil::Handle<DispatchWorkItem> DispatchWorkItemPtr;
 
-class ThreadPool : public IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
+class ThreadPool : public IceUtil::Shared, private IceUtil::Monitor<IceUtil::Mutex>
 {
     class EventHandlerThread : public IceUtil::Thread
     {
     public:
-        
+
         EventHandlerThread(const ThreadPoolPtr&, const std::string&);
         virtual void run();
 
         void updateObserver();
         void setState(Ice::Instrumentation::ThreadState);
-        
+
     private:
 
         ThreadPoolPtr _pool;
@@ -106,6 +106,7 @@ public:
         update(handler, status, SocketOperationNone);
     }
     bool finish(const EventHandlerPtr&, bool);
+    void ready(const EventHandlerPtr&, SocketOperation, bool);
 
     void dispatchFromThisThread(const DispatchWorkItemPtr&);
     void dispatch(const DispatchWorkItemPtr&);
@@ -131,7 +132,11 @@ private:
     std::string nextThreadId();
 
     const InstancePtr _instance;
+#ifdef ICE_CPP11_MAPPING
+    std::function<void(std::function<void()>, const std::shared_ptr<Ice::Connection>&)> _dispatcher;
+#else
     const Ice::DispatcherPtr _dispatcher;
+#endif
     ThreadPoolWorkQueuePtr _workQueue;
     bool _destroyed;
     const std::string _prefix;
@@ -140,6 +145,7 @@ private:
 
     friend class EventHandlerThread;
     friend class ThreadPoolCurrent;
+    friend class ThreadPoolWorkQueue;
 
     const int _size; // Number of threads that are pre-created.
     const int _sizeIO; // Maximum number of threads that can concurrently perform IO.
@@ -158,7 +164,6 @@ private:
     int _inUseIO; // Number of threads that are currently performing IO.
     std::vector<std::pair<EventHandler*, SocketOperation> > _handlers;
     std::vector<std::pair<EventHandler*, SocketOperation> >::const_iterator _nextHandler;
-    std::set<EventHandler*> _pendingHandlers;
 #endif
 
     bool _promote;
@@ -171,7 +176,7 @@ public:
     ThreadPoolCurrent(const InstancePtr&, const ThreadPoolPtr&, const ThreadPool::EventHandlerThreadPtr&);
 
     SocketOperation operation;
-    BasicStream stream; // A per-thread stream to be used by event handlers for optimization.
+    Ice::InputStream stream; // A per-thread stream to be used by event handlers for optimization.
 
     bool ioCompleted() const
     {
@@ -215,12 +220,11 @@ private:
     friend class ThreadPool;
 };
 
-class ThreadPoolWorkQueue : public EventHandler, public IceUtil::Mutex
+class ThreadPoolWorkQueue : public EventHandler
 {
 public:
 
-    ThreadPoolWorkQueue(const InstancePtr&, Selector&);
-    ~ThreadPoolWorkQueue();
+    ThreadPoolWorkQueue(ThreadPool&);
 
     void destroy();
     void queue(const ThreadPoolWorkItemPtr&);
@@ -234,19 +238,11 @@ public:
     virtual void finished(ThreadPoolCurrent&, bool);
     virtual std::string toString() const;
     virtual NativeInfoPtr getNativeInfo();
-    virtual void postMessage();
 
 private:
 
-    const InstancePtr _instance;
-    Selector& _selector;
+    ThreadPool& _threadPool;
     bool _destroyed;
-#ifdef ICE_USE_IOCP
-    AsyncInfo _info;
-#elif !defined(ICE_OS_WINRT)
-    SOCKET _fdIntrRead;
-    SOCKET _fdIntrWrite;
-#endif
     std::list<ThreadPoolWorkItemPtr> _workItems;
 };
 
@@ -257,7 +253,7 @@ private:
 //
 // An instance of the IOScope subclass must be created within the synchronization
 // of the event handler. It takes care of calling startMessage/finishMessage for
-// the IOCP implementation and ensures that finishMessage isn't called multiple 
+// the IOCP implementation and ensures that finishMessage isn't called multiple
 // times.
 //
 #if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
@@ -290,7 +286,7 @@ public:
         }
 
     private:
-        
+
         ThreadPoolMessage<T>& _message;
     };
     friend class IOScope;
@@ -309,7 +305,7 @@ private:
     ThreadPoolCurrent& _current;
 };
 
-#else 
+#else
 
 template<class T> class ThreadPoolMessage
 {
@@ -321,7 +317,7 @@ public:
 
         IOScope(ThreadPoolMessage& message) : _message(message)
         {
-            // This must be called with the handler locked. 
+            // This must be called with the handler locked.
             _finish = _message._current.startMessage();
         }
 
@@ -329,7 +325,7 @@ public:
         {
             if(_finish)
             {
-                // This must be called with the handler locked. 
+                // This must be called with the handler locked.
                 _message._current.finishMessage();
             }
         }
@@ -344,7 +340,7 @@ public:
         {
             //
             // Call finishMessage once IO is completed only if serialization is not enabled.
-            // Otherwise, finishMessage will be called when the event handler is done with 
+            // Otherwise, finishMessage will be called when the event handler is done with
             // the message (it will be called from ~ThreadPoolMessage below).
             //
             assert(_finish);
@@ -358,22 +354,22 @@ public:
     private:
 
         ThreadPoolMessage& _message;
-        bool _finish;        
+        bool _finish;
     };
     friend class IOScope;
-    
-    ThreadPoolMessage(ThreadPoolCurrent& current, const T& mutex) : 
+
+    ThreadPoolMessage(ThreadPoolCurrent& current, const T& mutex) :
         _current(current), _mutex(mutex), _finish(false)
     {
     }
-            
+
     ~ThreadPoolMessage()
     {
         if(_finish)
         {
             //
             // A ThreadPoolMessage instance must be created outside the synchronization
-            // of the event handler. We need to lock the event handler here to call 
+            // of the event handler. We need to lock the event handler here to call
             // finishMessage.
             //
 #if defined(__MINGW32__)
@@ -386,7 +382,7 @@ public:
     }
 
 private:
-    
+
     ThreadPoolCurrent& _current;
     const T& _mutex;
     bool _finish;
diff --git a/cpp/src/IceUtil/Timer.cpp b/cpp/src/Ice/Timer.cpp
index 2f4d88f7680..c19ba12a92b 100644
--- a/cpp/src/IceUtil/Timer.cpp
+++ b/cpp/src/Ice/Timer.cpp
@@ -13,6 +13,11 @@
 using namespace std;
 using namespace IceUtil;
 
+TimerTask::~TimerTask()
+{
+    // Out of line to avoid weak vtable
+}
+
 Timer::Timer() :
     Thread("IceUtil timer thread"),
     _destroyed(false)
diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index ec69e5b00f1..5e92c6c05d5 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -16,7 +16,8 @@
 #include <Ice/Proxy.h>
 #include <Ice/TraceLevels.h>
 #include <Ice/Logger.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/Protocol.h>
 #include <Ice/ReplyStatus.h>
 #include <set>
@@ -26,11 +27,11 @@ using namespace Ice;
 using namespace IceInternal;
 
 static void
-printIdentityFacetOperation(ostream& s, BasicStream& stream)
+printIdentityFacetOperation(ostream& s, InputStream& stream)
 {
     Identity identity;
     stream.read(identity);
-    s << "\nidentity = " << stream.instance()->identityToString(identity);
+    s << "\nidentity = " << Ice::identityToString(identity);
 
     vector<string> facet;
     stream.read(facet);
@@ -66,28 +67,28 @@ getMessageTypeAsString(Byte type)
 }
 
 static void
-printRequestHeader(ostream& s, BasicStream& stream)
+printRequestHeader(ostream& s, InputStream& stream)
 {
     printIdentityFacetOperation(s, stream);
 
     Byte mode;
     stream.read(mode);
     s << "\nmode = " << static_cast<int>(mode) << ' ';
-    switch(mode)
+    switch(static_cast<OperationMode>(mode))
     {
-        case Normal:
+        case ICE_ENUM(OperationMode, Normal):
         {
             s << "(normal)";
             break;
         }
 
-        case Nonmutating:
+        case ICE_ENUM(OperationMode, Nonmutating):
         {
             s << "(nonmutating)";
             break;
         }
 
-        case Idempotent:
+        case ICE_ENUM(OperationMode, Idempotent):
         {
             s << "(idempotent)";
             break;
@@ -114,7 +115,7 @@ printRequestHeader(ostream& s, BasicStream& stream)
         }
     }
 
-    Ice::EncodingVersion v = stream.skipEncaps();
+    Ice::EncodingVersion v = stream.skipEncapsulation();
     if(v > Ice::Encoding_1_0)
     {
         s << "\nencoding = " << v;
@@ -122,7 +123,7 @@ printRequestHeader(ostream& s, BasicStream& stream)
 }
 
 static Byte
-printHeader(ostream& s, BasicStream& stream)
+printHeader(ostream& s, InputStream& stream)
 {
     Byte magicNumber;
     stream.read(magicNumber);   // Don't bother printing the magic number
@@ -187,7 +188,7 @@ printHeader(ostream& s, BasicStream& stream)
 }
 
 static void
-printRequest(ostream& s, BasicStream& stream)
+printRequest(ostream& s, InputStream& stream)
 {
     Int requestId;
     stream.read(requestId);
@@ -201,7 +202,7 @@ printRequest(ostream& s, BasicStream& stream)
 }
 
 static void
-printBatchRequest(ostream& s, BasicStream& stream)
+printBatchRequest(ostream& s, InputStream& stream)
 {
     int batchRequestNum;
     stream.read(batchRequestNum);
@@ -215,7 +216,7 @@ printBatchRequest(ostream& s, BasicStream& stream)
 }
 
 static void
-printReply(ostream& s, BasicStream& stream)
+printReply(ostream& s, InputStream& stream)
 {
     Int requestId;
     stream.read(requestId);
@@ -319,7 +320,7 @@ printReply(ostream& s, BasicStream& stream)
 
     if(replyStatus == replyOK || replyStatus == replyUserException)
     {
-        Ice::EncodingVersion v = stream.skipEncaps();
+        Ice::EncodingVersion v = stream.skipEncapsulation();
         if(v > Ice::Encoding_1_0)
         {
             s << "\nencoding = " << v;
@@ -328,7 +329,7 @@ printReply(ostream& s, BasicStream& stream)
 }
 
 static Byte
-printMessage(ostream& s, BasicStream& stream)
+printMessage(ostream& s, InputStream& stream)
 {
     Byte type = printHeader(s, stream);
 
@@ -408,29 +409,28 @@ IceInternal::traceSlicing(const char* kind, const string& typeId, const char* sl
 }
 
 void
-IceInternal::traceSend(const BasicStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl)
+IceInternal::traceSend(const OutputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl)
 {
     if(tl->protocol >= 1)
     {
-        BasicStream& stream = const_cast<BasicStream&>(str);
-        BasicStream::Container::iterator p = stream.i;
-        stream.i = stream.b.begin();
+        OutputStream& stream = const_cast<OutputStream&>(str);
+        InputStream is(stream.instance(), stream.getEncoding(), stream);
+        is.i = is.b.begin();
 
         ostringstream s;
-        Byte type = printMessage(s, stream);
+        Byte type = printMessage(s, is);
 
         logger->trace(tl->protocolCat, "sending " + getMessageTypeAsString(type) + " " + s.str());
-        stream.i = p;
     }
 }
 
 void
-IceInternal::traceRecv(const BasicStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl)
+IceInternal::traceRecv(const InputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl)
 {
     if(tl->protocol >= 1)
     {
-        BasicStream& stream = const_cast<BasicStream&>(str);
-        BasicStream::Container::iterator p = stream.i;
+        InputStream& stream = const_cast<InputStream&>(str);
+        InputStream::Container::iterator p = stream.i;
         stream.i = stream.b.begin();
 
         ostringstream s;
@@ -442,12 +442,29 @@ IceInternal::traceRecv(const BasicStream& str, const LoggerPtr& logger, const Tr
 }
 
 void
-IceInternal::trace(const char* heading, const BasicStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl)
+IceInternal::trace(const char* heading, const OutputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl)
+{
+    if(tl->protocol >= 1)
+    {
+        OutputStream& stream = const_cast<OutputStream&>(str);
+        InputStream is(stream.instance(), stream.getEncoding(), stream);
+        is.i = is.b.begin();
+
+        ostringstream s;
+        s << heading;
+        printMessage(s, is);
+
+        logger->trace(tl->protocolCat, s.str());
+    }
+}
+
+void
+IceInternal::trace(const char* heading, const InputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl)
 {
     if(tl->protocol >= 1)
     {
-        BasicStream& stream = const_cast<BasicStream&>(str);
-        BasicStream::Container::iterator p = stream.i;
+        InputStream& stream = const_cast<InputStream&>(str);
+        InputStream::Container::iterator p = stream.i;
         stream.i = stream.b.begin();
 
         ostringstream s;
@@ -458,4 +475,3 @@ IceInternal::trace(const char* heading, const BasicStream& str, const LoggerPtr&
         stream.i = p;
     }
 }
-
diff --git a/cpp/src/Ice/TraceUtil.h b/cpp/src/Ice/TraceUtil.h
index 97b7509d0b6..f271e043081 100644
--- a/cpp/src/Ice/TraceUtil.h
+++ b/cpp/src/Ice/TraceUtil.h
@@ -13,14 +13,21 @@
 #include <Ice/LoggerF.h>
 #include <Ice/TraceLevelsF.h>
 
-namespace IceInternal
+namespace Ice
 {
 
-class BasicStream;
+class OutputStream;
+class InputStream;
+
+}
+
+namespace IceInternal
+{
 
-void traceSend(const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
-void traceRecv(const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
-void trace(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
+void traceSend(const ::Ice::OutputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
+void traceRecv(const ::Ice::InputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
+void trace(const char*, const ::Ice::OutputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
+void trace(const char*, const ::Ice::InputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
 void traceSlicing(const char*, const ::std::string&, const char *, const ::Ice::LoggerPtr&);
 
 }
diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index 0536ad8e1f5..a0f14ce7ad7 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -21,23 +21,27 @@ namespace IceInternal
 
 class Buffer;
 
-class ICE_API Transceiver : virtual public ::IceUtil::Shared
+class ICE_API Transceiver : public virtual ::IceUtil::Shared
 {
 public:
 
     virtual NativeInfoPtr getNativeInfo() = 0;
 
-    virtual SocketOperation initialize(Buffer&, Buffer&, bool&) = 0;
+    virtual SocketOperation initialize(Buffer&, Buffer&) = 0;
+#ifdef ICE_CPP11_MAPPING
+    virtual SocketOperation closing(bool, std::exception_ptr) = 0;
+#else
     virtual SocketOperation closing(bool, const Ice::LocalException&) = 0;
+#endif
     virtual void close() = 0;
     virtual EndpointIPtr bind();
     virtual SocketOperation write(Buffer&) = 0;
-    virtual SocketOperation read(Buffer&, bool&) = 0;
+    virtual SocketOperation read(Buffer&) = 0;
 #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual bool startWrite(Buffer&) = 0;
     virtual void finishWrite(Buffer&) = 0;
     virtual void startRead(Buffer&) = 0;
-    virtual void finishRead(Buffer&, bool&) = 0;
+    virtual void finishRead(Buffer&) = 0;
 #endif
 
     virtual std::string protocol() const = 0;
@@ -45,7 +49,7 @@ public:
     virtual std::string toDetailedString() const = 0;
     virtual Ice::ConnectionInfoPtr getInfo() const = 0;
     virtual void checkSendSize(const Buffer&) = 0;
-    virtual void setBufferSize(int rcvSize, int sndSize) = 0;
+    virtual void setBufferSize(int, int) = 0;
 };
 
 }
diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp
index 6b6d9c6b4f9..2adf5dc32cc 100644
--- a/cpp/src/Ice/UdpEndpointI.cpp
+++ b/cpp/src/Ice/UdpEndpointI.cpp
@@ -11,7 +11,8 @@
 #include <Ice/Network.h>
 #include <Ice/UdpConnector.h>
 #include <Ice/UdpTransceiver.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/LocalException.h>
 #include <Ice/Protocol.h>
 #include <Ice/ProtocolInstance.h>
@@ -22,7 +23,9 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(UdpEndpointI* p) { return p; }
+#endif
 
 extern "C"
 {
@@ -54,13 +57,13 @@ IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance) :
 {
 }
 
-IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, BasicStream* s) :
+IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, InputStream* s) :
     IPEndpointI(instance, s),
     _mcastTtl(-1),
     _connect(false),
     _compress(false)
 {
-    if(s->getReadEncoding() == Ice::Encoding_1_0)
+    if(s->getEncoding() == Ice::Encoding_1_0)
     {
         Ice::Byte b;
         s->read(b);
@@ -73,10 +76,25 @@ IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, Bas
     s->read(const_cast<bool&>(_compress));
 }
 
+void
+IceInternal::UdpEndpointI::streamWriteImpl(OutputStream* s) const
+{
+    IPEndpointI::streamWriteImpl(s);
+    if(s->getEncoding() == Ice::Encoding_1_0)
+    {
+        s->write(Ice::Protocol_1_0);
+        s->write(Ice::Encoding_1_0);
+    }
+    // Not transmitted.
+    //s->write(_connect);
+    s->write(_compress);
+}
+
 EndpointInfoPtr
 IceInternal::UdpEndpointI::getInfo() const
 {
-    Ice::UDPEndpointInfoPtr info = new InfoI<Ice::UDPEndpointInfo>(const_cast<UdpEndpointI*>(this));
+    Ice::UDPEndpointInfoPtr info = ICE_MAKE_SHARED(InfoI<Ice::UDPEndpointInfo>,
+                                                   ICE_DYNAMIC_CAST(UdpEndpointI, shared_from_this()));
     fillEndpointInfo(info.get());
     return info;
 }
@@ -90,7 +108,7 @@ IceInternal::UdpEndpointI::timeout() const
 EndpointIPtr
 IceInternal::UdpEndpointI::timeout(Int) const
 {
-    return const_cast<UdpEndpointI*>(this);
+    return shared_from_this();
 }
 
 bool
@@ -104,12 +122,12 @@ IceInternal::UdpEndpointI::compress(bool compress) const
 {
     if(compress == _compress)
     {
-        return const_cast<UdpEndpointI*>(this);
+        return shared_from_this();
     }
     else
     {
-        return new UdpEndpointI(_instance, _host, _port, _sourceAddr, _mcastInterface, _mcastTtl, _connect,
-                                _connectionId, compress);
+        return ICE_MAKE_SHARED(UdpEndpointI, _instance, _host, _port, _sourceAddr, _mcastInterface, _mcastTtl,
+                               _connect, _connectionId, compress);
     }
 }
 
@@ -122,7 +140,7 @@ IceInternal::UdpEndpointI::datagram() const
 TransceiverPtr
 IceInternal::UdpEndpointI::transceiver() const
 {
-    return new UdpTransceiver(const_cast<UdpEndpointI*>(this), _instance, _host, _port, _mcastInterface, _connect);
+    return new UdpTransceiver(ICE_DYNAMIC_CAST(UdpEndpointI, shared_from_this()), _instance, _host, _port, _mcastInterface, _connect);
 }
 
 AcceptorPtr
@@ -134,8 +152,8 @@ IceInternal::UdpEndpointI::acceptor(const string&) const
 UdpEndpointIPtr
 IceInternal::UdpEndpointI::endpoint(const UdpTransceiverPtr& transceiver) const
 {
-    return new UdpEndpointI(_instance, _host, transceiver->effectivePort(), _sourceAddr, _mcastInterface, _mcastTtl,
-                            _connect, _connectionId, _compress);
+    return ICE_MAKE_SHARED(UdpEndpointI, _instance, _host, transceiver->effectivePort(), _sourceAddr, _mcastInterface,
+                           _mcastTtl, _connect, _connectionId, _compress);
 }
 
 string
@@ -175,7 +193,11 @@ IceInternal::UdpEndpointI::options() const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::UdpEndpointI::operator==(const Endpoint& r) const
+#else
 IceInternal::UdpEndpointI::operator==(const LocalObject& r) const
+#endif
 {
     if(!IPEndpointI::operator==(r))
     {
@@ -217,7 +239,11 @@ IceInternal::UdpEndpointI::operator==(const LocalObject& r) const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::UdpEndpointI::operator<(const Endpoint& r) const
+#else
 IceInternal::UdpEndpointI::operator<(const LocalObject& r) const
+#endif
 {
     const UdpEndpointI* p = dynamic_cast<const UdpEndpointI*>(&r);
     if(!p)
@@ -275,20 +301,6 @@ IceInternal::UdpEndpointI::operator<(const LocalObject& r) const
 }
 
 void
-IceInternal::UdpEndpointI::streamWriteImpl(BasicStream* s) const
-{
-    IPEndpointI::streamWriteImpl(s);
-    if(s->getWriteEncoding() == Ice::Encoding_1_0)
-    {
-        s->write(Ice::Protocol_1_0);
-        s->write(Ice::Encoding_1_0);
-    }
-    // Not transmitted.
-    //s->write(_connect);
-    s->write(_compress);
-}
-
-void
 IceInternal::UdpEndpointI::hashInit(Ice::Int& h) const
 {
     IPEndpointI::hashInit(h);
@@ -406,8 +418,8 @@ IceInternal::UdpEndpointI::createConnector(const Address& address, const Network
 IPEndpointIPtr
 IceInternal::UdpEndpointI::createEndpoint(const string& host, int port, const string& connectionId) const
 {
-    return new UdpEndpointI(_instance, host, port, _sourceAddr, _mcastInterface, _mcastTtl, _connect, connectionId,
-                            _compress);
+    return ICE_MAKE_SHARED(UdpEndpointI, _instance, host, port, _sourceAddr, _mcastInterface, _mcastTtl, _connect,
+                           connectionId, _compress);
 }
 
 IceInternal::UdpEndpointFactory::UdpEndpointFactory(const ProtocolInstancePtr& instance) : _instance(instance)
@@ -433,15 +445,15 @@ IceInternal::UdpEndpointFactory::protocol() const
 EndpointIPtr
 IceInternal::UdpEndpointFactory::create(vector<string>& args, bool oaEndpoint) const
 {
-    IPEndpointIPtr endpt = new UdpEndpointI(_instance);
+    IPEndpointIPtr endpt = ICE_MAKE_SHARED(UdpEndpointI, _instance);
     endpt->initWithOptions(args, oaEndpoint);
     return endpt;
 }
 
 EndpointIPtr
-IceInternal::UdpEndpointFactory::read(BasicStream* s) const
+IceInternal::UdpEndpointFactory::read(InputStream* s) const
 {
-    return new UdpEndpointI(_instance, s);
+    return ICE_MAKE_SHARED(UdpEndpointI, _instance, s);
 }
 
 void
@@ -451,7 +463,7 @@ IceInternal::UdpEndpointFactory::destroy()
 }
 
 EndpointFactoryPtr
-IceInternal::UdpEndpointFactory::clone(const ProtocolInstancePtr& instance) const
+IceInternal::UdpEndpointFactory::clone(const ProtocolInstancePtr& instance, const EndpointFactoryPtr&) const
 {
     return new UdpEndpointFactory(instance);
 }
diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h
index fd405a8bfce..883b725e688 100644
--- a/cpp/src/Ice/UdpEndpointI.h
+++ b/cpp/src/Ice/UdpEndpointI.h
@@ -25,7 +25,9 @@ public:
     UdpEndpointI(const ProtocolInstancePtr&, const std::string&, Ice::Int, const Address&, const std::string&,
                  Ice::Int, bool, const std::string&, bool);
     UdpEndpointI(const ProtocolInstancePtr&);
-    UdpEndpointI(const ProtocolInstancePtr&, BasicStream*);
+    UdpEndpointI(const ProtocolInstancePtr&, Ice::InputStream*);
+
+    virtual void streamWriteImpl(Ice::OutputStream*) const;
 
     virtual Ice::EndpointInfoPtr getInfo() const;
 
@@ -39,8 +41,13 @@ public:
     virtual AcceptorPtr acceptor(const std::string&) const;
     virtual std::string options() const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const Ice::Endpoint&) const;
+    virtual bool operator<(const Ice::Endpoint&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
+#endif
 
     UdpEndpointIPtr endpoint(const UdpTransceiverPtr&) const;
 
@@ -48,7 +55,6 @@ public:
 
 protected:
 
-    virtual void streamWriteImpl(BasicStream*) const;
     virtual void hashInit(Ice::Int&) const;
     virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const;
     virtual bool checkOption(const std::string&, const std::string&, const std::string&);
@@ -77,10 +83,10 @@ public:
     virtual Ice::Short type() const;
     virtual std::string protocol() const;
     virtual EndpointIPtr create(std::vector<std::string>&, bool) const;
-    virtual EndpointIPtr read(BasicStream*) const;
+    virtual EndpointIPtr read(Ice::InputStream*) const;
     virtual void destroy();
 
-    virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const;
+    virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&, const EndpointFactoryPtr&) const;
 
 private:
 
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 8d5e6249b59..3ec0db137e2 100644..100755
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -40,11 +40,11 @@ IceInternal::UdpTransceiver::getNativeInfo()
     return this;
 }
 
-
-#if defined(ICE_USE_IOCP)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
 AsyncInfo*
 IceInternal::UdpTransceiver::getAsyncInfo(SocketOperation status)
 {
+#if defined(ICE_USE_IOCP)
     switch(status)
     {
     case SocketOperationRead:
@@ -55,31 +55,14 @@ IceInternal::UdpTransceiver::getAsyncInfo(SocketOperation status)
         assert(false);
         return 0;
     }
-}
 #elif defined(ICE_OS_WINRT)
-void
-IceInternal::UdpTransceiver::setCompletedHandler(SocketOperationCompletedHandler^ handler)
-{
-    _completedHandler = handler;
-    _writeOperationCompletedHandler = ref new AsyncOperationCompletedHandler<unsigned int>(
-        [=] (IAsyncOperation<unsigned int>^ operation, Windows::Foundation::AsyncStatus status)
-        {
-            if(status != Windows::Foundation::AsyncStatus::Completed)
-            {
-                _write.count = SOCKET_ERROR;
-                _write.error = operation->ErrorCode.Value;
-            }
-            else
-            {
-                _write.count = static_cast<int>(operation->GetResults());
-            }
-            _completedHandler(SocketOperationWrite);
-        });
+    return &_write;
+#endif
 }
 #endif
 
 SocketOperation
-IceInternal::UdpTransceiver::initialize(Buffer& /*readBuffer*/, Buffer& /*writeBuffer*/, bool& /*hasMoreData*/)
+IceInternal::UdpTransceiver::initialize(Buffer& /*readBuffer*/, Buffer& /*writeBuffer*/)
 {
     if(_state == StateNeedConnect)
     {
@@ -93,7 +76,15 @@ IceInternal::UdpTransceiver::initialize(Buffer& /*readBuffer*/, Buffer& /*writeB
 #elif defined(ICE_OS_WINRT)
         if(_write.count == SOCKET_ERROR)
         {
-            checkConnectErrorCode(__FILE__, __LINE__, _write.error, _addr.host);
+            try
+            {
+                checkConnectErrorCode(__FILE__, __LINE__, _write.error);
+            }
+            catch(Ice::DNSException& ex)
+            {
+                ex.host = IceUtil::wstringToString(_addr.host->RawName->Data(), IceUtil::getProcessStringConverter());
+                throw;
+            }
         }
 #else
         doFinishConnect(_fd);
@@ -106,7 +97,11 @@ IceInternal::UdpTransceiver::initialize(Buffer& /*readBuffer*/, Buffer& /*writeB
 }
 
 SocketOperation
+#ifdef ICE_CPP11_MAPPING
+IceInternal::UdpTransceiver::closing(bool, exception_ptr)
+#else
 IceInternal::UdpTransceiver::closing(bool, const Ice::LocalException&)
+#endif
 {
     // Nothing to do.
     return SocketOperationNone;
@@ -120,11 +115,10 @@ IceInternal::UdpTransceiver::close()
     if(_readPending)
     {
         assert(_received.empty());
-        _completedHandler(SocketOperationRead);
+        completed(SocketOperationRead);
         _readPending = false;
     }
     _received.clear();
-    _completedHandler = nullptr;
 #endif
 
     assert(_fd != INVALID_SOCKET);
@@ -264,7 +258,7 @@ repeat:
 }
 
 SocketOperation
-IceInternal::UdpTransceiver::read(Buffer& buf, bool&)
+IceInternal::UdpTransceiver::read(Buffer& buf)
 {
     if(buf.i == buf.b.end())
     {
@@ -390,7 +384,6 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                 auto operation = safe_cast<DatagramSocket^>(_fd)->ConnectAsync(_addr.host, _addr.port);
                 if(!checkIfErrorOrCompleted(SocketOperationConnect, operation))
                 {
-                    SocketOperationCompletedHandler^ completed = _completedHandler;
                     operation->Completed = ref new AsyncActionCompletedHandler(
                         [=] (IAsyncAction^ info, Windows::Foundation::AsyncStatus status)
                         {
@@ -418,7 +411,6 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                 auto operation = safe_cast<DatagramSocket^>(_fd)->GetOutputStreamAsync(_addr.host, _addr.port);
                 if(!checkIfErrorOrCompleted(SocketOperationConnect, operation))
                 {
-                    SocketOperationCompletedHandler^ completed = _completedHandler;
                     operation->Completed = ref new AsyncOperationCompletedHandler<IOutputStream^>(
                         [=] (IAsyncOperation<IOutputStream^>^ info, Windows::Foundation::AsyncStatus status)
                         {
@@ -452,7 +444,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
         }
         catch(Platform::Exception^ ex)
         {
-            checkConnectErrorCode(__FILE__, __LINE__, ex->HResult, _addr.host);
+            checkConnectErrorCode(__FILE__, __LINE__, ex->HResult);
         }
         return false;
     }
@@ -460,7 +452,6 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
     {
         try
         {
-            SocketOperationCompletedHandler^ completed = _completedHandler;
             DatagramSocket^ fd = safe_cast<DatagramSocket^>(_fd);
             concurrency::create_task(fd->GetOutputStreamAsync(_peerAddr.host, _peerAddr.port)).then(
                 [=,&buf](concurrency::task<IOutputStream^> task)
@@ -470,9 +461,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                         DataWriter^ writer = ref new DataWriter(task.get());
                         writer->WriteBytes(ref new Array<unsigned char>(&*buf.i, static_cast<int>(buf.b.size())));
                         DataWriterStoreOperation^ operation = writer->StoreAsync();
-
-                        Windows::Foundation::AsyncStatus status = operation->Status;
-                        if(status == Windows::Foundation::AsyncStatus::Completed)
+                        if(operation->Status == Windows::Foundation::AsyncStatus::Completed)
                         {
                             //
                             // NOTE: unlike other methods, it's important to modify _write.count
@@ -482,23 +471,8 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                             // completed callback.
                             //
                             _write.count = operation->GetResults();
-                            completed(SocketOperationWrite);
-                        }
-                        else if(status == Windows::Foundation::AsyncStatus::Started)
-                        {
-                            operation->Completed = _writeOperationCompletedHandler;
-                        }
-                        else
-                        {
-                            if(_state < StateConnected)
-                            {
-                                checkConnectErrorCode(__FILE__, __LINE__, operation->ErrorCode.Value, _addr.host);
-                            }
-                            else
-                            {
-                                checkErrorCode(__FILE__, __LINE__, operation->ErrorCode.Value);
-                            }
                         }
+                        queueOperation(SocketOperationWrite, operation);
                     }
                     catch(Platform::Exception^ pex)
                     {
@@ -519,15 +493,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
         try
         {
             _writer->WriteBytes(ref new Array<unsigned char>(&*buf.i, static_cast<int>(buf.b.size())));
-            DataWriterStoreOperation^ operation = _writer->StoreAsync();
-            if(checkIfErrorOrCompleted(SocketOperationWrite, operation))
-            {
-                _write.count = operation->GetResults();
-            }
-            else
-            {
-                operation->Completed = _writeOperationCompletedHandler;
-            }
+            queueOperation(SocketOperationWrite, _writer->StoreAsync());
         }
         catch(Platform::Exception^ ex)
         {
@@ -671,7 +637,7 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf)
     assert(!_readPending);
     if(!_received.empty())
     {
-        _completedHandler(SocketOperationRead);
+        completed(SocketOperationRead);
     }
     else
     {
@@ -681,7 +647,7 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf)
 }
 
 void
-IceInternal::UdpTransceiver::finishRead(Buffer& buf, bool&)
+IceInternal::UdpTransceiver::finishRead(Buffer& buf)
 {
 #ifdef ICE_OS_WINRT
     IceUtil::Mutex::Lock lock(_mutex);
@@ -821,7 +787,7 @@ IceInternal::UdpTransceiver::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceInternal::UdpTransceiver::getInfo() const
 {
-    Ice::UDPConnectionInfoPtr info = new Ice::UDPConnectionInfo();
+    Ice::UDPConnectionInfoPtr info = ICE_MAKE_SHARED(Ice::UDPConnectionInfo);
 #if defined(ICE_OS_WINRT)
     if(isMulticast(_addr) || isAddressValid(_mcastAddr))
     {
@@ -1143,42 +1109,6 @@ IceInternal::UdpTransceiver::setBufSize(int rcvSize, int sndSize)
 }
 
 #ifdef ICE_OS_WINRT
-bool
-IceInternal::UdpTransceiver::checkIfErrorOrCompleted(SocketOperation op, IAsyncInfo^ info)
-{
-    //
-    // NOTE: It's important to only check for info->Status once as it
-    // might change during the checks below (the Status can be changed
-    // by the Windows thread pool concurrently).
-    //
-    // We consider that a canceled async status is the same as an
-    // error. A canceled async status can occur if there's a timeout
-    // and the socket is closed.
-    //
-    Windows::Foundation::AsyncStatus status = info->Status;
-    if(status == Windows::Foundation::AsyncStatus::Completed)
-    {
-        _completedHandler(op);
-        return true;
-    }
-    else if(status == Windows::Foundation::AsyncStatus::Started)
-    {
-        return false;
-    }
-    else
-    {
-        if(_state < StateConnected)
-        {
-            checkConnectErrorCode(__FILE__, __LINE__, info->ErrorCode.Value, _addr.host);
-        }
-        else
-        {
-            checkErrorCode(__FILE__, __LINE__, info->ErrorCode.Value);
-        }
-        return true; // Prevent compiler warning.
-    }
-}
-
 void
 IceInternal::UdpTransceiver::appendMessage(DatagramSocketMessageReceivedEventArgs^ args)
 {
@@ -1198,7 +1128,7 @@ IceInternal::UdpTransceiver::appendMessage(DatagramSocketMessageReceivedEventArg
     //
     if(_readPending)
     {
-        _completedHandler(SocketOperationRead);
+        completed(SocketOperationRead);
         _readPending = false;
     }
 }
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index 6a207feeea8..84b600d68c2 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -38,23 +38,25 @@ class UdpTransceiver : public Transceiver, public NativeInfo
 public:
 
     virtual NativeInfoPtr getNativeInfo();
-#if defined(ICE_USE_IOCP)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual AsyncInfo* getAsyncInfo(SocketOperation);
-#elif defined(ICE_OS_WINRT)
-    virtual void setCompletedHandler(SocketOperationCompletedHandler^);
 #endif
 
-    virtual SocketOperation initialize(Buffer&, Buffer&, bool&);
+    virtual SocketOperation initialize(Buffer&, Buffer&);
+#ifdef ICE_CPP11_MAPPING
+    virtual SocketOperation closing(bool, std::exception_ptr);
+#else
     virtual SocketOperation closing(bool, const Ice::LocalException&);
+#endif
     virtual void close();
     virtual EndpointIPtr bind();
     virtual SocketOperation write(Buffer&);
-    virtual SocketOperation read(Buffer&, bool&);
+    virtual SocketOperation read(Buffer&);
 #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual bool startWrite(Buffer&);
     virtual void finishWrite(Buffer&);
     virtual void startRead(Buffer&);
-    virtual void finishRead(Buffer&, bool&);
+    virtual void finishRead(Buffer&);
 #endif
     virtual std::string protocol() const;
     virtual std::string toString() const;
@@ -76,7 +78,6 @@ private:
     void setBufSize(int, int);
 
 #ifdef ICE_OS_WINRT
-    bool checkIfErrorOrCompleted(SocketOperation, Windows::Foundation::IAsyncInfo^);
     void appendMessage(Windows::Networking::Sockets::DatagramSocketMessageReceivedEventArgs^);
     Windows::Networking::Sockets::DatagramSocketMessageReceivedEventArgs^ readMessage();
 #endif
@@ -108,12 +109,7 @@ private:
     socklen_t _readAddrLen;
 #elif defined(ICE_OS_WINRT)
     AsyncInfo _write;
-
     Windows::Storage::Streams::DataWriter^ _writer;
-
-    SocketOperationCompletedHandler^ _completedHandler;
-    Windows::Foundation::AsyncOperationCompletedHandler<unsigned int>^ _writeOperationCompletedHandler;
-
     IceUtil::Mutex _mutex;
     bool _readPending;
     std::deque<Windows::Networking::Sockets::DatagramSocketMessageReceivedEventArgs^> _received;
diff --git a/cpp/src/Ice/Value.cpp b/cpp/src/Ice/Value.cpp
new file mode 100644
index 00000000000..f5a7f6b1bbf
--- /dev/null
+++ b/cpp/src/Ice/Value.cpp
@@ -0,0 +1,75 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/Value.h>
+#include <Ice/LocalException.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
+
+#ifdef ICE_CPP11_MAPPING
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+void
+Ice::Value::ice_preMarshal()
+{
+}
+
+void
+Ice::Value::ice_postUnmarshal()
+{
+}
+
+void
+Ice::Value::__write(Ice::OutputStream* os) const
+{
+    os->startValue(0);
+    __writeImpl(os);
+    os->endValue();
+}
+
+void
+Ice::Value::__read(Ice::InputStream* is)
+{
+   is->startValue();
+   __readImpl(is);
+   is->endValue(false);
+}
+
+namespace
+{
+
+const string __Ice__Object_ids[] =
+{
+    "::Ice::Object"
+};
+
+}
+
+string
+Ice::Value::ice_id() const
+{
+    return __Ice__Object_ids[0];
+}
+
+const string&
+Ice::Value::ice_staticId()
+{
+    return __Ice__Object_ids[0];
+}
+
+ValuePtr
+Ice::Value::ice_clone() const
+{
+    return cloneImpl();
+}
+
+#endif
diff --git a/cpp/src/Ice/ValueFactoryManagerI.cpp b/cpp/src/Ice/ValueFactoryManagerI.cpp
new file mode 100644
index 00000000000..f5347c06f04
--- /dev/null
+++ b/cpp/src/Ice/ValueFactoryManagerI.cpp
@@ -0,0 +1,70 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceUtil/DisableWarnings.h>
+#include <Ice/ValueFactoryManagerI.h>
+#include <Ice/LocalException.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+void
+IceInternal::ValueFactoryManagerI::add(ICE_IN(ICE_VALUE_FACTORY) factory, const string& id)
+{
+    IceUtil::Mutex::Lock sync(*this);
+
+    if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id)
+       || _factoryMap.find(id) != _factoryMap.end())
+    {
+        AlreadyRegisteredException ex(__FILE__, __LINE__);
+        ex.kindOfObject = "value factory";
+        ex.id = id;
+        throw ex;
+    }
+
+    _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ICE_VALUE_FACTORY>(id, factory));
+}
+
+ICE_VALUE_FACTORY
+IceInternal::ValueFactoryManagerI::find(const string& id) const
+{
+    IceUtil::Mutex::Lock sync(*this);
+
+    FactoryMap& factoryMap = const_cast<FactoryMap&>(_factoryMap);
+
+    FactoryMap::iterator p = factoryMap.end();
+    if(_factoryMapHint != factoryMap.end())
+    {
+        if(_factoryMapHint->first == id)
+        {
+            p = _factoryMapHint;
+        }
+    }
+
+    if(p == factoryMap.end())
+    {
+        p = factoryMap.find(id);
+    }
+
+    if(p != factoryMap.end())
+    {
+        _factoryMapHint = p;
+        return p->second;
+    }
+    else
+    {
+        return ICE_NULLPTR;
+    }
+}
+
+IceInternal::ValueFactoryManagerI::ValueFactoryManagerI() :
+    _factoryMapHint(_factoryMap.end())
+{
+}
diff --git a/cpp/src/Ice/ValueFactoryManagerI.h b/cpp/src/Ice/ValueFactoryManagerI.h
new file mode 100644
index 00000000000..d69ffcfba57
--- /dev/null
+++ b/cpp/src/Ice/ValueFactoryManagerI.h
@@ -0,0 +1,44 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_VALUE_FACTORY_MANAGER_I_H
+#define ICE_VALUE_FACTORY_MANAGER_I_H
+
+#include <Ice/ValueFactory.h>
+#include <Ice/VirtualShared.h>
+#include <IceUtil/Mutex.h>
+
+namespace IceInternal
+{
+
+class ValueFactoryManagerI;
+ICE_DEFINE_PTR(ValueFactoryManagerIPtr, ValueFactoryManagerI);
+
+class ValueFactoryManagerI : public Ice::EnableSharedFromThis<ValueFactoryManagerI>,
+                             public Ice::ValueFactoryManager,
+                             public IceUtil::Mutex
+{
+public:
+
+    ValueFactoryManagerI();
+
+    virtual void add(ICE_IN(ICE_VALUE_FACTORY), const std::string&);
+    virtual ICE_VALUE_FACTORY find(const std::string&) const;
+
+private:
+
+    typedef std::map<std::string, ICE_VALUE_FACTORY> FactoryMap;
+
+    FactoryMap _factoryMap;
+    mutable FactoryMap::iterator _factoryMapHint;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Ice/WSAcceptor.cpp b/cpp/src/Ice/WSAcceptor.cpp
index 2237d6807d7..d72414dae60 100644
--- a/cpp/src/Ice/WSAcceptor.cpp
+++ b/cpp/src/Ice/WSAcceptor.cpp
@@ -21,18 +21,12 @@ IceInternal::WSAcceptor::getNativeInfo()
     return _delegate->getNativeInfo();
 }
 
-#if defined(ICE_USE_IOCP)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
 IceInternal::AsyncInfo*
 IceInternal::WSAcceptor::getAsyncInfo(IceInternal::SocketOperation status)
 {
     return _delegate->getNativeInfo()->getAsyncInfo(status);
 }
-#elif defined(ICE_OS_WINRT)
-void
-IceInternal::WSAcceptor::setCompletedHandler(IceInternal::SocketOperationCompletedHandler^ handler)
-{
-    _delegate->getNativeInfo()->setCompletedHandler(handler);
-}
 #endif
 
 void
diff --git a/cpp/src/Ice/WSAcceptor.h b/cpp/src/Ice/WSAcceptor.h
index 8aef5a8ddff..0b389f6a210 100644
--- a/cpp/src/Ice/WSAcceptor.h
+++ b/cpp/src/Ice/WSAcceptor.h
@@ -26,10 +26,8 @@ class WSAcceptor : public Acceptor, public NativeInfo
 public:
 
     virtual NativeInfoPtr getNativeInfo();
-#if defined(ICE_USE_IOCP)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual AsyncInfo* getAsyncInfo(SocketOperation);
-#elif defined(ICE_OS_WINRT)
-    virtual void setCompletedHandler(SocketOperationCompletedHandler^);
 #endif
 
     virtual void close();
@@ -43,8 +41,6 @@ public:
     virtual std::string toString() const;
     virtual std::string toDetailedString() const;
 
-    virtual AcceptorPtr delegate() const { return _delegate; }
-
 private:
 
     WSAcceptor(const WSEndpointPtr&, const ProtocolInstancePtr&, const AcceptorPtr&);
diff --git a/cpp/src/Ice/WSConnector.cpp b/cpp/src/Ice/WSConnector.cpp
index 91e6a9a7eed..beec5f0ab70 100644
--- a/cpp/src/Ice/WSConnector.cpp
+++ b/cpp/src/Ice/WSConnector.cpp
@@ -19,7 +19,7 @@ using namespace IceInternal;
 TransceiverPtr
 IceInternal::WSConnector::connect()
 {
-    return new WSTransceiver(_instance, _delegate->connect(), _host, _port, _resource);
+    return new WSTransceiver(_instance, _delegate->connect(), _host, _resource);
 }
 
 Short
@@ -102,9 +102,9 @@ IceInternal::WSConnector::operator<(const Connector& r) const
     return false;
 }
 
-IceInternal::WSConnector::WSConnector(const ProtocolInstancePtr& instance, const ConnectorPtr& del, const string& host, 
-                                        int port, const string& resource) :
-    _instance(instance), _delegate(del), _host(host), _port(port), _resource(resource)
+IceInternal::WSConnector::WSConnector(const ProtocolInstancePtr& instance, const ConnectorPtr& del, const string& host,
+                                      const string& resource) :
+    _instance(instance), _delegate(del), _host(host), _resource(resource)
 {
 }
 
diff --git a/cpp/src/Ice/WSConnector.h b/cpp/src/Ice/WSConnector.h
index 3c26a06ab45..176ec9d770c 100644
--- a/cpp/src/Ice/WSConnector.h
+++ b/cpp/src/Ice/WSConnector.h
@@ -34,15 +34,14 @@ public:
     virtual bool operator<(const Connector&) const;
 
 
-    WSConnector(const ProtocolInstancePtr&, const ConnectorPtr&, const std::string&, int, const std::string&);
+    WSConnector(const ProtocolInstancePtr&, const ConnectorPtr&, const std::string&, const std::string&);
     virtual ~WSConnector();
 
 private:
-    
+
     const ProtocolInstancePtr _instance;
     const ConnectorPtr _delegate;
     const std::string _host;
-    const int _port;
     const std::string _resource;
 };
 
diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp
index 91479378f86..48a9ede3c37 100644
--- a/cpp/src/Ice/WSEndpoint.cpp
+++ b/cpp/src/Ice/WSEndpoint.cpp
@@ -10,25 +10,48 @@
 #include <Ice/WSEndpoint.h>
 #include <Ice/WSAcceptor.h>
 #include <Ice/WSConnector.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/LocalException.h>
 #include <Ice/IPEndpointI.h>
 #include <Ice/HashUtil.h>
 #include <Ice/EndpointFactoryManager.h>
+#include <Ice/Comparable.h>
 
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+namespace
+{
+
+Ice::IPEndpointInfoPtr
+getIPEndpointInfo(const Ice::EndpointInfoPtr& info)
+{
+    for(Ice::EndpointInfoPtr p = info; p; p = p->underlying)
+    {
+        Ice::IPEndpointInfoPtr ipInfo = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, p);
+        if(ipInfo)
+        {
+            return ipInfo;
+        }
+    }
+    return ICE_NULLPTR;
+}
+
+}
+
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(WSEndpoint* p) { return p; }
+#endif
 
 IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, const string& res) :
-    _instance(instance), _delegate(IPEndpointIPtr::dynamicCast(del)), _resource(res)
+    _instance(instance), _delegate(del), _resource(res)
 {
 }
 
 IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& inst, const EndpointIPtr& del, vector<string>& args) :
-    _instance(inst), _delegate(IPEndpointIPtr::dynamicCast(del))
+    _instance(inst), _delegate(del)
 {
     initWithOptions(args);
 
@@ -38,8 +61,8 @@ IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& inst, const Endpo
     }
 }
 
-IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, BasicStream* s) :
-    _instance(instance), _delegate(IPEndpointIPtr::dynamicCast(del))
+IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, InputStream* s) :
+    _instance(instance), _delegate(del)
 {
     s->read(const_cast<string&>(_resource), false);
 }
@@ -47,8 +70,12 @@ IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const E
 Ice::EndpointInfoPtr
 IceInternal::WSEndpoint::getInfo() const
 {
-    assert(dynamic_cast<WSEndpointDelegate*>(_delegate.get()));
-    return dynamic_cast<WSEndpointDelegate*>(_delegate.get())->getWSInfo(_resource);
+    WSEndpointInfoPtr info = ICE_MAKE_SHARED(InfoI<Ice::WSEndpointInfo>, shared_from_this());
+    info->underlying = _delegate->getInfo();
+    info->compress = info->underlying->compress;
+    info->timeout = info->underlying->timeout;
+    info->resource = _resource;
+    return info;
 }
 
 Ice::Short
@@ -64,12 +91,10 @@ IceInternal::WSEndpoint::protocol() const
 }
 
 void
-IceInternal::WSEndpoint::streamWrite(BasicStream* s) const
+IceInternal::WSEndpoint::streamWriteImpl(OutputStream* s) const
 {
-    s->startWriteEncaps();
     _delegate->streamWriteImpl(s);
     s->write(_resource, false);
-    s->endWriteEncaps();
 }
 
 Int
@@ -83,11 +108,11 @@ IceInternal::WSEndpoint::timeout(Int timeout) const
 {
     if(timeout == _delegate->timeout())
     {
-        return const_cast<WSEndpoint*>(this);
+        return shared_from_this();
     }
     else
     {
-        return new WSEndpoint(_instance, _delegate->timeout(timeout), _resource);
+        return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->timeout(timeout), _resource);
     }
 }
 
@@ -102,11 +127,11 @@ IceInternal::WSEndpoint::connectionId(const string& connectionId) const
 {
     if(connectionId == _delegate->connectionId())
     {
-        return const_cast<WSEndpoint*>(this);
+        return shared_from_this();
     }
     else
     {
-        return new WSEndpoint(_instance, _delegate->connectionId(connectionId), _resource);
+        return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->connectionId(connectionId), _resource);
     }
 }
 
@@ -121,11 +146,11 @@ IceInternal::WSEndpoint::compress(bool compress) const
 {
     if(compress == _delegate->compress())
     {
-        return const_cast<WSEndpoint*>(this);
+        return shared_from_this();
     }
     else
     {
-        return new WSEndpoint(_instance, _delegate->compress(compress), _resource);
+        return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->compress(compress), _resource);
     }
 }
 
@@ -156,8 +181,8 @@ IceInternal::WSEndpoint::connectors_async(Ice::EndpointSelectionType selType,
     public:
 
         CallbackI(const EndpointI_connectorsPtr& callback, const ProtocolInstancePtr& instance,
-                  const string& host, int port, const string& resource) :
-            _callback(callback), _instance(instance), _host(host), _port(port), _resource(resource)
+                  const string& host, const string& resource) :
+            _callback(callback), _instance(instance), _host(host), _resource(resource)
         {
         }
 
@@ -166,7 +191,7 @@ IceInternal::WSEndpoint::connectors_async(Ice::EndpointSelectionType selType,
             vector<ConnectorPtr> connectors = c;
             for(vector<ConnectorPtr>::iterator p = connectors.begin(); p != connectors.end(); ++p)
             {
-                *p = new WSConnector(_instance, *p, _host, _port, _resource);
+                *p = new WSConnector(_instance, *p, _host, _resource);
             }
             _callback->connectors(connectors);
         }
@@ -181,24 +206,29 @@ IceInternal::WSEndpoint::connectors_async(Ice::EndpointSelectionType selType,
         const EndpointI_connectorsPtr _callback;
         const ProtocolInstancePtr _instance;
         const string _host;
-        const int _port;
         const string _resource;
     };
-    _delegate->connectors_async(selType, new CallbackI(callback, _instance, _delegate->host(), _delegate->port(),
-                                                       _resource));
+
+    ostringstream host;
+    IPEndpointInfoPtr info = getIPEndpointInfo(_delegate->getInfo());
+    if(info)
+    {
+        host << info->host << ":" << info->port;
+    }
+    _delegate->connectors_async(selType, ICE_MAKE_SHARED(CallbackI, callback, _instance, host.str(), _resource));
 }
 
 AcceptorPtr
 IceInternal::WSEndpoint::acceptor(const string& adapterName) const
 {
     AcceptorPtr delAcc = _delegate->acceptor(adapterName);
-    return new WSAcceptor(const_cast<WSEndpoint*>(this), _instance, delAcc);
+    return new WSAcceptor(shared_from_this(), _instance, delAcc);
 }
 
 WSEndpointPtr
 IceInternal::WSEndpoint::endpoint(const EndpointIPtr& delEndp) const
 {
-    return new WSEndpoint(_instance, delEndp, _resource);
+    return ICE_MAKE_SHARED(WSEndpoint, _instance, delEndp, _resource);
 }
 
 vector<EndpointIPtr>
@@ -207,7 +237,7 @@ IceInternal::WSEndpoint::expand() const
     vector<EndpointIPtr> endps = _delegate->expand();
     for(vector<EndpointIPtr>::iterator p = endps.begin(); p != endps.end(); ++p)
     {
-        *p = p->get() == _delegate.get() ? const_cast<WSEndpoint*>(this) : new WSEndpoint(_instance, *p, _resource);
+        *p = p->get() == _delegate.get() ? shared_from_this() : ICE_MAKE_SHARED(WSEndpoint, _instance, *p, _resource);
     }
     return endps;
 }
@@ -262,14 +292,12 @@ IceInternal::WSEndpoint::options() const
     return s.str();
 }
 
-EndpointIPtr
-IceInternal::WSEndpoint::delegate() const
-{
-    return EndpointIPtr::dynamicCast(_delegate);
-}
-
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::WSEndpoint::operator==(const Endpoint& r) const
+#else
 IceInternal::WSEndpoint::operator==(const Ice::LocalObject& r) const
+#endif
 {
     const WSEndpoint* p = dynamic_cast<const WSEndpoint*>(&r);
     if(!p)
@@ -282,7 +310,7 @@ IceInternal::WSEndpoint::operator==(const Ice::LocalObject& r) const
         return true;
     }
 
-    if(_delegate != p->_delegate)
+    if(!Ice::targetEquals(_delegate, p->_delegate))
     {
         return false;
     }
@@ -296,12 +324,16 @@ IceInternal::WSEndpoint::operator==(const Ice::LocalObject& r) const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::WSEndpoint::operator<(const Endpoint& r) const
+#else
 IceInternal::WSEndpoint::operator<(const Ice::LocalObject& r) const
+#endif
 {
     const WSEndpoint* p = dynamic_cast<const WSEndpoint*>(&r);
     if(!p)
     {
-        const EndpointI* e = dynamic_cast<const WSEndpoint*>(&r);
+        const EndpointI* e = dynamic_cast<const EndpointI*>(&r);
         if(!e)
         {
             return false;
@@ -314,11 +346,11 @@ IceInternal::WSEndpoint::operator<(const Ice::LocalObject& r) const
         return false;
     }
 
-    if(_delegate < p->_delegate)
+    if(Ice::targetLess(_delegate, p->_delegate))
     {
         return true;
     }
-    else if (p->_delegate < _delegate)
+    else if (Ice::targetLess(p->_delegate, _delegate))
     {
         return false;
     }
@@ -333,7 +365,6 @@ IceInternal::WSEndpoint::operator<(const Ice::LocalObject& r) const
     }
 
     return false;
-
 }
 
 bool
@@ -361,8 +392,7 @@ IceInternal::WSEndpoint::checkOption(const string& option, const string& argumen
 }
 
 IceInternal::WSEndpointFactory::WSEndpointFactory(const ProtocolInstancePtr& instance, const EndpointFactoryPtr& del) :
-    _instance(instance),
-    _delegate(del)
+    _instance(instance), _delegate(del)
 {
 }
 
@@ -385,13 +415,13 @@ IceInternal::WSEndpointFactory::protocol() const
 EndpointIPtr
 IceInternal::WSEndpointFactory::create(vector<string>& args, bool oaEndpoint) const
 {
-    return new WSEndpoint(_instance, _delegate->create(args, oaEndpoint), args);
+    return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->create(args, oaEndpoint), args);
 }
 
 EndpointIPtr
-IceInternal::WSEndpointFactory::read(BasicStream* s) const
+IceInternal::WSEndpointFactory::read(InputStream* s) const
 {
-    return new WSEndpoint(_instance, _delegate->read(s), s);
+    return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->read(s), s);
 }
 
 void
@@ -402,8 +432,7 @@ IceInternal::WSEndpointFactory::destroy()
 }
 
 EndpointFactoryPtr
-IceInternal::WSEndpointFactory::clone(const ProtocolInstancePtr&) const
+IceInternal::WSEndpointFactory::clone(const ProtocolInstancePtr& instance, const EndpointFactoryPtr& delegate) const
 {
-    assert(false); // We don't support cloning this transport.
-    return 0;
+    return new WSEndpointFactory(instance, delegate);
 }
diff --git a/cpp/src/Ice/WSEndpoint.h b/cpp/src/Ice/WSEndpoint.h
index 0a34d3d6268..a247219409d 100644
--- a/cpp/src/Ice/WSEndpoint.h
+++ b/cpp/src/Ice/WSEndpoint.h
@@ -20,29 +20,19 @@
 namespace IceInternal
 {
 
-//
-// Delegate interface implemented by TcpEndpoint or IceSSL::Endpoint or any endpoint that WS can
-// delegate to.
-//
-class ICE_API WSEndpointDelegate : virtual public IceUtil::Shared
-{
-public:
-
-    virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const = 0;
-};
-
-class WSEndpoint : public EndpointI
+class WSEndpoint : public EndpointI, public Ice::EnableSharedFromThis<WSEndpoint>
 {
 public:
 
     WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, const std::string&);
     WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, std::vector<std::string>&);
-    WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, BasicStream*);
+    WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, Ice::InputStream*);
+
+    virtual void streamWriteImpl(Ice::OutputStream*) const;
 
     virtual Ice::EndpointInfoPtr getInfo() const;
     virtual Ice::Short type() const;
     virtual const std::string& protocol() const;
-    virtual void streamWrite(BasicStream*) const;
 
     virtual Ice::Int timeout() const;
     virtual EndpointIPtr timeout(Ice::Int) const;
@@ -62,11 +52,15 @@ public:
     virtual ::Ice::Int hash() const;
     virtual std::string options() const;
 
-    EndpointIPtr delegate() const;
     WSEndpointPtr endpoint(const EndpointIPtr&) const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const Ice::Endpoint&) const;
+    virtual bool operator<(const Ice::Endpoint&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
+#endif
 
 protected:
 
@@ -78,7 +72,7 @@ private:
     // All members are const, because endpoints are immutable.
     //
     const ProtocolInstancePtr _instance;
-    const IPEndpointIPtr _delegate;
+    const EndpointIPtr _delegate;
     const std::string _resource;
 };
 
@@ -92,10 +86,10 @@ public:
     virtual Ice::Short type() const;
     virtual std::string protocol() const;
     virtual EndpointIPtr create(std::vector<std::string>&, bool) const;
-    virtual EndpointIPtr read(BasicStream*) const;
+    virtual EndpointIPtr read(Ice::InputStream*) const;
     virtual void destroy();
 
-    virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const;
+    virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&, const EndpointFactoryPtr&) const;
 
 private:
 
diff --git a/cpp/src/Ice/WSTransceiver.cpp b/cpp/src/Ice/WSTransceiver.cpp
index a154194dbab..24d97b89920 100644
--- a/cpp/src/Ice/WSTransceiver.cpp
+++ b/cpp/src/Ice/WSTransceiver.cpp
@@ -184,29 +184,23 @@ IceInternal::WSTransceiver::getNativeInfo()
     return _delegate->getNativeInfo();
 }
 
-#if defined(ICE_USE_IOCP)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
 AsyncInfo*
 IceInternal::WSTransceiver::getAsyncInfo(SocketOperation status)
 {
     return _delegate->getNativeInfo()->getAsyncInfo(status);
 }
-#elif defined(ICE_OS_WINRT)
-void
-IceInternal::WSTransceiver::setCompletedHandler(IceInternal::SocketOperationCompletedHandler^ handler)
-{
-    _delegate->getNativeInfo()->setCompletedHandler(handler);
-}
 #endif
 
 SocketOperation
-IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer, bool& hasMoreData)
+IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer)
 {
     //
     // Delegate logs exceptions that occur during initialize(), so there's no need to trap them here.
     //
     if(_state == StateInitializeDelegate)
     {
-        SocketOperation op = _delegate->initialize(readBuffer, writeBuffer, hasMoreData);
+        SocketOperation op = _delegate->initialize(readBuffer, writeBuffer);
         if(op != SocketOperationNone)
         {
             return op;
@@ -236,7 +230,7 @@ IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer,
                 //
                 ostringstream out;
                 out << "GET " << _resource << " HTTP/1.1\r\n"
-                    << "Host: " << _host << ":" << _port << "\r\n"
+                    << "Host: " << _host << "\r\n"
                     << "Upgrade: websocket\r\n"
                     << "Connection: Upgrade\r\n"
                     << "Sec-WebSocket-Protocol: " << _iceProtocol << "\r\n"
@@ -280,7 +274,7 @@ IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer,
         {
             if(_readBuffer.i < _readBuffer.b.end())
             {
-                SocketOperation s = _delegate->read(_readBuffer, hasMoreData);
+                SocketOperation s = _delegate->read(_readBuffer);
                 if(s == SocketOperationWrite || _readBuffer.i == _readBuffer.b.begin())
                 {
                     return s;
@@ -384,7 +378,10 @@ IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer,
         _state = StateOpened;
         _nextState = StateOpened;
 
-        hasMoreData |= _readI < _readBuffer.i;
+        if(_readI < _readBuffer.i)
+        {
+            _delegate->getNativeInfo()->ready(SocketOperationRead, true);
+        }
     }
     catch(const Ice::LocalException& ex)
     {
@@ -413,7 +410,11 @@ IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer,
 }
 
 SocketOperation
+#ifdef ICE_CPP11_MAPPING
+IceInternal::WSTransceiver::closing(bool initiator, exception_ptr reason)
+#else
 IceInternal::WSTransceiver::closing(bool initiator, const Ice::LocalException& reason)
+#endif
 {
     if(_instance->traceLevel() >= 1)
     {
@@ -443,6 +444,38 @@ IceInternal::WSTransceiver::closing(bool initiator, const Ice::LocalException& r
     }
 
     _closingInitiator = initiator;
+#ifdef ICE_CPP11_MAPPING
+    if(reason)
+    {
+        try
+        {
+            rethrow_exception(reason);
+        }
+        catch(const Ice::CloseConnectionException&)
+        {
+            _closingReason = CLOSURE_NORMAL;
+        }
+        catch(const Ice::ObjectAdapterDeactivatedException&)
+        {
+            _closingReason = CLOSURE_SHUTDOWN;
+        }
+        catch(Ice::CommunicatorDestroyedException&)
+        {
+            _closingReason = CLOSURE_SHUTDOWN;
+        }
+        catch(const Ice::MemoryLimitException&)
+        {
+            _closingReason = CLOSURE_TOO_BIG;
+        }
+        catch(const Ice::ProtocolException&)
+        {
+            _closingReason  = CLOSURE_PROTOCOL_ERROR;
+        }
+        catch(...)
+        {
+        }
+    }
+#else
     if(dynamic_cast<const Ice::CloseConnectionException*>(&reason))
     {
         _closingReason = CLOSURE_NORMAL;
@@ -460,6 +493,7 @@ IceInternal::WSTransceiver::closing(bool initiator, const Ice::LocalException& r
     {
         _closingReason = CLOSURE_TOO_BIG;
     }
+#endif
 
     if(_state == StateOpened)
     {
@@ -544,7 +578,7 @@ IceInternal::WSTransceiver::write(Buffer& buf)
 }
 
 SocketOperation
-IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
+IceInternal::WSTransceiver::read(Buffer& buf)
 {
     if(_readPending)
     {
@@ -555,11 +589,11 @@ IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
     {
         if(_state < StateConnected)
         {
-            return _delegate->read(buf, hasMoreData);
+            return _delegate->read(buf);
         }
         else
         {
-            if(_delegate->read(_readBuffer, hasMoreData) == SocketOperationWrite)
+            if(_delegate->read(_readBuffer) == SocketOperationWrite)
             {
                 return SocketOperationWrite;
             }
@@ -576,7 +610,10 @@ IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
     //
     if(buf.i == buf.b.end())
     {
-        hasMoreData |= _readI < _readBuffer.i;
+        if(_readI < _readBuffer.i)
+        {
+            _delegate->getNativeInfo()->ready(SocketOperationRead, true);
+        }
         return SocketOperationNone;
     }
 
@@ -597,17 +634,17 @@ IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
                 {
                     size_t size = buf.b.size();
                     buf.b.resize(buf.i - buf.b.begin() + readSz);
-                    s = _delegate->read(buf, hasMoreData);
+                    s = _delegate->read(buf);
                     buf.b.resize(size);
                 }
                 else
                 {
-                    s = _delegate->read(buf, hasMoreData);
+                    s = _delegate->read(buf);
                 }
             }
             else
             {
-                s = _delegate->read(_readBuffer, hasMoreData);
+                s = _delegate->read(_readBuffer);
             }
 
             if(s == SocketOperationWrite)
@@ -621,12 +658,15 @@ IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
 
     if(buf.i == buf.b.end())
     {
-        hasMoreData |= _readI < _readBuffer.i;
+        if(_readI < _readBuffer.i)
+        {
+            _delegate->getNativeInfo()->ready(SocketOperationRead, true);
+        }
         s = SocketOperationNone;
     }
     else
     {
-        hasMoreData = false;
+        _delegate->getNativeInfo()->ready(SocketOperationRead, false);
         s = SocketOperationRead;
     }
 
@@ -767,18 +807,18 @@ IceInternal::WSTransceiver::startRead(Buffer& buf)
 }
 
 void
-IceInternal::WSTransceiver::finishRead(Buffer& buf, bool& hasMoreData)
+IceInternal::WSTransceiver::finishRead(Buffer& buf)
 {
     _readPending = false;
     if(_state < StateOpened)
     {
         if(_state < StateConnected)
         {
-            _delegate->finishRead(buf, hasMoreData);
+            _delegate->finishRead(buf);
         }
         else
         {
-            _delegate->finishRead(_readBuffer, hasMoreData);
+            _delegate->finishRead(_readBuffer);
         }
         return;
     }
@@ -789,11 +829,11 @@ IceInternal::WSTransceiver::finishRead(Buffer& buf, bool& hasMoreData)
     }
     else if(_readState == ReadStatePayload)
     {
-        _delegate->finishRead(buf, hasMoreData);
+        _delegate->finishRead(buf);
     }
     else
     {
-        _delegate->finishRead(_readBuffer, hasMoreData);
+        _delegate->finishRead(_readBuffer);
     }
 
     if(_state == StateClosed)
@@ -827,8 +867,10 @@ IceInternal::WSTransceiver::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceInternal::WSTransceiver::getInfo() const
 {
-    assert(dynamic_cast<WSTransceiverDelegate*>(_delegate.get()));
-    return dynamic_cast<WSTransceiverDelegate*>(_delegate.get())->getWSInfo(_parser->getHeaders());
+    WSConnectionInfoPtr info = ICE_MAKE_SHARED(WSConnectionInfo);
+    info->underlying = _delegate->getInfo();
+    info->headers = _parser->getHeaders();
+    return info;
 }
 
 void
@@ -844,11 +886,10 @@ IceInternal::WSTransceiver::setBufferSize(int rcvSize, int sndSize)
 }
 
 IceInternal::WSTransceiver::WSTransceiver(const ProtocolInstancePtr& instance, const TransceiverPtr& del,
-                                          const string& host, int port, const string& resource) :
+                                          const string& host, const string& resource) :
     _instance(instance),
     _delegate(del),
     _host(host),
-    _port(port),
     _resource(resource),
     _incoming(false),
     _state(StateInitializeDelegate),
@@ -878,7 +919,6 @@ IceInternal::WSTransceiver::WSTransceiver(const ProtocolInstancePtr& instance, c
 IceInternal::WSTransceiver::WSTransceiver(const ProtocolInstancePtr& instance, const TransceiverPtr& del) :
     _instance(instance),
     _delegate(del),
-    _port(-1),
     _incoming(true),
     _state(StateInitializeDelegate),
     _parser(new HttpParser),
diff --git a/cpp/src/Ice/WSTransceiver.h b/cpp/src/Ice/WSTransceiver.h
index 301e600ec51..7b6a7ffe5e6 100644
--- a/cpp/src/Ice/WSTransceiver.h
+++ b/cpp/src/Ice/WSTransceiver.h
@@ -24,38 +24,29 @@ namespace IceInternal
 class ConnectorI;
 class AcceptorI;
 
-//
-// Delegate interface implemented by TcpTransceiver or IceSSL::Transceiver or any transport that WS can
-// delegate to.
-//
-class ICE_API WSTransceiverDelegate : virtual public IceUtil::Shared
-{
-public:
-
-    virtual Ice::ConnectionInfoPtr getWSInfo(const Ice::HeaderDict&) const = 0;
-};
-
 class WSTransceiver : public Transceiver
 {
 public:
 
     virtual NativeInfoPtr getNativeInfo();
-#if defined(ICE_USE_IOCP)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual AsyncInfo* getAsyncInfo(SocketOperation);
-#elif defined(ICE_OS_WINRT)
-    virtual void setCompletedHandler(SocketOperationCompletedHandler^);
 #endif
 
-    virtual SocketOperation initialize(Buffer&, Buffer&, bool&);
+    virtual SocketOperation initialize(Buffer&, Buffer&);
+#ifdef ICE_CPP11_MAPPING
+    virtual SocketOperation closing(bool, std::exception_ptr);
+#else
     virtual SocketOperation closing(bool, const Ice::LocalException&);
+#endif
     virtual void close();
     virtual SocketOperation write(Buffer&);
-    virtual SocketOperation read(Buffer&, bool&);
+    virtual SocketOperation read(Buffer&);
 #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual bool startWrite(Buffer&);
     virtual void finishWrite(Buffer&);
     virtual void startRead(Buffer&);
-    virtual void finishRead(Buffer&, bool&);
+    virtual void finishRead(Buffer&);
 #endif
     virtual std::string protocol() const;
     virtual std::string toString() const;
@@ -66,7 +57,7 @@ public:
 
 private:
 
-    WSTransceiver(const ProtocolInstancePtr&, const TransceiverPtr&, const std::string&, int, const std::string&);
+    WSTransceiver(const ProtocolInstancePtr&, const TransceiverPtr&, const std::string&, const std::string&);
     WSTransceiver(const ProtocolInstancePtr&, const TransceiverPtr&);
     virtual ~WSTransceiver();
 
@@ -88,7 +79,6 @@ private:
     const ProtocolInstancePtr _instance;
     const TransceiverPtr _delegate;
     const std::string _host;
-    const int _port;
     const std::string _resource;
     const bool _incoming;
 
diff --git a/cpp/src/Ice/ios/Notifications.mm b/cpp/src/Ice/ios/Notifications.mm
new file mode 100644
index 00000000000..f5876b54022
--- /dev/null
+++ b/cpp/src/Ice/ios/Notifications.mm
@@ -0,0 +1,138 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#import <Ice/Config.h>
+
+#if TARGET_OS_IPHONE != 0
+
+#import <Foundation/NSObject.h>
+#import <Foundation/NSNotification.h>
+#import <UIKit/UIApplication.h>
+
+#include <Ice/ConnectionFactory.h>
+
+#include <set>
+
+using namespace std;
+using namespace IceInternal;
+
+namespace IceInternal
+{
+
+bool registerForBackgroundNotification(const IncomingConnectionFactoryPtr&);
+void unregisterForBackgroundNotification(const IncomingConnectionFactoryPtr&);
+
+}
+
+namespace
+{
+
+class Observer
+{
+public:
+
+    Observer() : _background(false)
+    {
+        [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidEnterBackgroundNotification
+                                                          object:nil
+                                                           queue:nil
+                                                      usingBlock:^(NSNotification*)
+                                                                 {
+                                                                     didEnterBackground();
+                                                                 }];
+
+        [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationWillEnterForegroundNotification
+                                                          object:nil
+                                                           queue:nil
+                                                      usingBlock:^(NSNotification*)
+                                                                 {
+                                                                     willEnterForeground();
+                                                                 }];
+    }
+
+    bool
+    add(const IncomingConnectionFactoryPtr& factory)
+    {
+        IceUtil::Mutex::Lock sync(_mutex);
+        _factories.insert(factory);
+        if(_background)
+        {
+            factory->stopAcceptor();
+        }
+        else
+        {
+            factory->startAcceptor();
+        }
+        return _background;
+    }
+
+    void
+    remove(const IncomingConnectionFactoryPtr& factory)
+    {
+        IceUtil::Mutex::Lock sync(_mutex);
+        _factories.erase(factory);
+    }
+
+    void
+    didEnterBackground()
+    {
+        IceUtil::Mutex::Lock sync(_mutex);
+
+        //
+        // Notify all the incoming connection factories that we are
+        // entering the background mode.
+        //
+        for(set<IncomingConnectionFactoryPtr>::const_iterator p = _factories.begin(); p != _factories.end(); ++p)
+        {
+            (*p)->stopAcceptor();
+        }
+        _background = true;
+    }
+
+    void
+    willEnterForeground()
+    {
+        IceUtil::Mutex::Lock sync(_mutex);
+
+        //
+        // Notify all the incoming connection factories that we are
+        // entering the foreground mode.
+        //
+        _background = false;
+        for(set<IncomingConnectionFactoryPtr>::const_iterator p = _factories.begin(); p != _factories.end(); ++p)
+        {
+            (*p)->startAcceptor();
+        }
+    }
+
+private:
+
+    IceUtil::Mutex _mutex;
+    bool _background;
+    set<IncomingConnectionFactoryPtr> _factories;
+};
+
+
+}
+
+static Observer* observer = new Observer();
+
+bool
+IceInternal::registerForBackgroundNotification(const IncomingConnectionFactoryPtr& factory)
+{
+    return observer->add(factory);
+}
+
+void
+IceInternal::unregisterForBackgroundNotification(const IncomingConnectionFactoryPtr& factory)
+{
+    observer->remove(factory);
+}
+
+#endif
diff --git a/cpp/src/Ice/ios/StreamAcceptor.cpp b/cpp/src/Ice/ios/StreamAcceptor.cpp
new file mode 100644
index 00000000000..8b3ca41041a
--- /dev/null
+++ b/cpp/src/Ice/ios/StreamAcceptor.cpp
@@ -0,0 +1,160 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include "StreamTransceiver.h"
+#include "StreamEndpointI.h"
+#include "StreamAcceptor.h"
+
+#include <IceUtil/StringUtil.h>
+
+#include <Ice/Instance.h>
+#include <Ice/Network.h>
+#include <Ice/Exception.h>
+#include <Ice/Properties.h>
+
+#include <CoreFoundation/CoreFoundation.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+NativeInfoPtr
+IceObjC::StreamAcceptor::getNativeInfo()
+{
+    return this;
+}
+
+void
+IceObjC::StreamAcceptor::close()
+{
+    if(_fd != INVALID_SOCKET)
+    {
+        closeSocketNoThrow(_fd);
+        _fd = INVALID_SOCKET;
+    }
+}
+
+EndpointIPtr
+IceObjC::StreamAcceptor::listen()
+{
+    try
+    {
+        const_cast<Address&>(_addr) = doBind(_fd, _addr);
+        doListen(_fd, _backlog);
+    }
+    catch(...)
+    {
+        _fd = INVALID_SOCKET;
+        throw;
+    }
+
+    _endpoint = _endpoint->endpoint(this);
+    return _endpoint;
+}
+
+TransceiverPtr
+IceObjC::StreamAcceptor::accept()
+{
+    SOCKET fd = doAccept(_fd);
+    setBlock(fd, false);
+    setTcpBufSize(fd, _instance);
+
+    //
+    // Create the read/write streams
+    //
+    CFReadStreamRef readStream = nil;
+    CFWriteStreamRef writeStream = nil;
+    try
+    {
+        CFStreamCreatePairWithSocket(NULL, fd, &readStream, &writeStream);
+        _instance->setupStreams(readStream, writeStream, true, "");
+        return new StreamTransceiver(_instance, readStream, writeStream, fd);
+    }
+    catch(const Ice::LocalException& ex)
+    {
+        if(fd != INVALID_SOCKET)
+        {
+            closeSocketNoThrow(fd);
+        }
+        if(readStream)
+        {
+            CFRelease(readStream);
+        }
+        if(writeStream)
+        {
+            CFRelease(writeStream);
+        }
+        throw;
+    }
+}
+
+string
+IceObjC::StreamAcceptor::protocol() const
+{
+    return _instance->protocol();
+}
+
+string
+IceObjC::StreamAcceptor::toString() const
+{
+    return addrToString(_addr);
+}
+
+string
+IceObjC::StreamAcceptor::toDetailedString() const
+{
+    ostringstream os;
+    os << "local address = " << toString();
+    vector<string> intfs = getHostsForEndpointExpand(inetAddrToString(_addr), _instance->protocolSupport(), true);
+    if(!intfs.empty())
+    {
+        os << "\nlocal interfaces = ";
+        os << IceUtilInternal::joinString(intfs, ", ");
+    }
+    return os.str();
+}
+
+int
+IceObjC::StreamAcceptor::effectivePort() const
+{
+    return getPort(_addr);
+}
+
+IceObjC::StreamAcceptor::StreamAcceptor(const StreamEndpointIPtr& endpoint,
+                                        const InstancePtr& instance,
+                                        const string& host,
+                                        int port) :
+    _endpoint(endpoint),
+    _instance(instance),
+    _addr(getAddressForServer(host, port, instance->protocolSupport(), instance->preferIPv6()))
+{
+#ifdef SOMAXCONN
+    _backlog = instance->properties()->getPropertyAsIntWithDefault("Ice.TCP.Backlog", SOMAXCONN);
+#else
+    _backlog = instance->properties()->getPropertyAsIntWithDefault("Ice.TCP.Backlog", 511);
+#endif
+
+    try
+    {
+        _fd = createSocket(false, _addr);
+        setBlock(_fd, false);
+        setTcpBufSize(_fd, _instance);
+        setReuseAddress(_fd, true);
+    }
+    catch(...)
+    {
+        _fd = INVALID_SOCKET;
+        throw;
+    }
+}
+
+IceObjC::StreamAcceptor::~StreamAcceptor()
+{
+    assert(_fd == INVALID_SOCKET);
+}
diff --git a/cpp/src/Ice/ios/StreamAcceptor.h b/cpp/src/Ice/ios/StreamAcceptor.h
new file mode 100644
index 00000000000..b81f342bd11
--- /dev/null
+++ b/cpp/src/Ice/ios/StreamAcceptor.h
@@ -0,0 +1,54 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_STREAM_ACCEPTOR_H
+#define ICE_STREAM_ACCEPTOR_H
+
+#include <Ice/TransceiverF.h>
+#include <Ice/Acceptor.h>
+
+namespace IceObjC
+{
+
+class StreamEndpointI;
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+typedef ::std::shared_ptr<StreamEndpointI> StreamEndpointIPtr;
+#else
+typedef IceUtil::Handle<StreamEndpointI> StreamEndpointIPtr;
+#endif
+
+class StreamAcceptor : public IceInternal::Acceptor, public IceInternal::NativeInfo
+{
+public:
+
+    virtual IceInternal::NativeInfoPtr getNativeInfo();
+    virtual void close();
+    virtual IceInternal::EndpointIPtr listen();
+    virtual IceInternal::TransceiverPtr accept();
+    virtual std::string protocol() const;
+    virtual std::string toString() const;
+    virtual std::string toDetailedString() const;
+
+    int effectivePort() const;
+
+private:
+
+    StreamAcceptor(const StreamEndpointIPtr&, const InstancePtr&, const std::string&, int);
+    virtual ~StreamAcceptor();
+    friend class StreamEndpointI;
+
+    StreamEndpointIPtr _endpoint;
+    InstancePtr _instance;
+    int _backlog;
+    IceInternal::Address _addr;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Ice/ios/StreamConnector.cpp b/cpp/src/Ice/ios/StreamConnector.cpp
new file mode 100644
index 00000000000..2e3d95ef7a8
--- /dev/null
+++ b/cpp/src/Ice/ios/StreamConnector.cpp
@@ -0,0 +1,169 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include "StreamTransceiver.h"
+#include "StreamEndpointI.h"
+#include "StreamConnector.h"
+
+#include <Ice/Network.h>
+#include <Ice/Exception.h>
+#include <Ice/Properties.h>
+#include <Ice/NetworkProxy.h>
+
+#include <CoreFoundation/CoreFoundation.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+TransceiverPtr
+IceObjC::StreamConnector::connect()
+{
+    CFReadStreamRef readStream = nil;
+    CFWriteStreamRef writeStream = nil;
+    try
+    {
+        CFStringRef h = CFStringCreateWithCString(NULL, _host.c_str(), kCFStringEncodingUTF8);
+        CFHostRef host = CFHostCreateWithName(NULL, h);
+        CFRelease(h);
+        CFStreamCreatePairWithSocketToCFHost(NULL, host, _port, &readStream, &writeStream);
+        CFRelease(host);
+
+        _instance->setupStreams(readStream, writeStream, false, _host);
+        return new StreamTransceiver(_instance, readStream, writeStream, _host, _port);
+    }
+    catch(const Ice::LocalException& ex)
+    {
+        if(readStream)
+        {
+            CFRelease(readStream);
+        }
+        if(writeStream)
+        {
+            CFRelease(writeStream);
+        }
+        throw;
+    }
+}
+
+Short
+IceObjC::StreamConnector::type() const
+{
+    return _instance->type();
+}
+
+string
+IceObjC::StreamConnector::toString() const
+{
+    string proxyHost = _instance->proxyHost();
+    ostringstream os;
+    if(!proxyHost.empty())
+    {
+        os << proxyHost << ":" << _instance->proxyPort();
+    }
+    else
+    {
+        os << _host << ":" << _port;
+    }
+    return os.str();
+}
+
+bool
+IceObjC::StreamConnector::operator==(const IceInternal::Connector& r) const
+{
+    const StreamConnector* p = dynamic_cast<const StreamConnector*>(&r);
+    if(!p)
+    {
+        return false;
+    }
+
+    if(_timeout != p->_timeout)
+    {
+        return false;
+    }
+
+    if(_connectionId != p->_connectionId)
+    {
+        return false;
+    }
+
+    if(_host != p->_host)
+    {
+        return false;
+    }
+
+    if(_port != p->_port)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool
+IceObjC::StreamConnector::operator!=(const IceInternal::Connector& r) const
+{
+    return !operator==(r);
+}
+
+bool
+IceObjC::StreamConnector::operator<(const IceInternal::Connector& r) const
+{
+    const StreamConnector* p = dynamic_cast<const StreamConnector*>(&r);
+    if(!p)
+    {
+        return type() < r.type();
+    }
+
+    if(_timeout < p->_timeout)
+    {
+        return true;
+    }
+    else if(p->_timeout < _timeout)
+    {
+        return false;
+    }
+
+    if(_connectionId < p->_connectionId)
+    {
+        return true;
+    }
+    else if(p->_connectionId < _connectionId)
+    {
+        return false;
+    }
+
+    if(_host < p->_host)
+    {
+        return true;
+    }
+    else if(p->_host < _host)
+    {
+        return false;
+    }
+
+    return _port < p->_port;
+}
+
+IceObjC::StreamConnector::StreamConnector(const InstancePtr& instance,
+                                          const string& host,
+                                          Ice::Int port,
+                                          Ice::Int timeout,
+                                          const string& connectionId) :
+    _instance(instance),
+    _host(host.empty() ? string("127.0.0.1") : host),
+    _port(port),
+    _timeout(timeout),
+    _connectionId(connectionId)
+{
+}
+
+IceObjC::StreamConnector::~StreamConnector()
+{
+}
diff --git a/cpp/src/Ice/ios/StreamConnector.h b/cpp/src/Ice/ios/StreamConnector.h
new file mode 100644
index 00000000000..6b93275c34a
--- /dev/null
+++ b/cpp/src/Ice/ios/StreamConnector.h
@@ -0,0 +1,52 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_STREAM_CONNECTOR_H
+#define ICE_STREAM_CONNECTOR_H
+
+#include <Ice/TransceiverF.h>
+#include <Ice/Connector.h>
+
+namespace IceObjC
+{
+
+class StreamEndpointI;
+
+class Instance;
+typedef IceUtil::Handle<Instance> InstancePtr;
+
+class StreamConnector : public IceInternal::Connector
+{
+public:
+
+    virtual IceInternal::TransceiverPtr connect();
+
+    virtual Ice::Short type() const;
+    virtual std::string toString() const;
+
+    virtual bool operator==(const IceInternal::Connector&) const;
+    virtual bool operator!=(const IceInternal::Connector&) const;
+    virtual bool operator<(const IceInternal::Connector&) const;
+
+private:
+
+    StreamConnector(const InstancePtr&, const std::string&, Ice::Int, Ice::Int, const std::string&);
+    virtual ~StreamConnector();
+    friend class StreamEndpointI;
+
+    const InstancePtr _instance;
+    const std::string _host;
+    const Ice::Int _port;
+    const Ice::Int _timeout;
+    const std::string _connectionId;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Ice/ios/StreamEndpointI.cpp b/cpp/src/Ice/ios/StreamEndpointI.cpp
new file mode 100644
index 00000000000..78e8dab2cff
--- /dev/null
+++ b/cpp/src/Ice/ios/StreamEndpointI.cpp
@@ -0,0 +1,485 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include "StreamEndpointI.h"
+#include "StreamAcceptor.h"
+#include "StreamConnector.h"
+
+#include <IceUtil/StringUtil.h>
+
+#include <Ice/Network.h>
+#include <Ice/InputStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/LocalException.h>
+#include <Ice/Communicator.h>
+#include <Ice/EndpointFactoryManager.h>
+#include <Ice/Properties.h>
+#include <Ice/HashUtil.h>
+#include <Ice/NetworkProxy.h>
+
+#include <CoreFoundation/CoreFoundation.h>
+
+#include <fstream>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+extern "C"
+{
+
+Plugin*
+createIceTCP(const CommunicatorPtr& com, const string&, const StringSeq&)
+{
+    IceObjC::InstancePtr tcpInstance = new IceObjC::Instance(com, TCPEndpointType, "tcp", false);
+    return new EndpointFactoryPlugin(com, new IceObjC::StreamEndpointFactory(tcpInstance));
+}
+
+}
+
+namespace
+{
+
+inline CFStringRef
+toCFString(const string& s)
+{
+    return CFStringCreateWithCString(NULL, s.c_str(), kCFStringEncodingUTF8);
+}
+
+}
+
+IceObjC::Instance::Instance(const Ice::CommunicatorPtr& com, Short type, const string& protocol, bool secure) :
+    ProtocolInstance(com, type, protocol, secure),
+    _voip(com->getProperties()->getPropertyAsIntWithDefault("Ice.Voip", 0) > 0),
+    _communicator(com),
+    _proxySettings(0)
+{
+    const Ice::PropertiesPtr properties = com->getProperties();
+
+    //
+    // Proxy settings
+    //
+    _proxyHost = properties->getProperty("Ice.SOCKSProxyHost");
+    if(!_proxyHost.empty())
+    {
+#if TARGET_IPHONE_SIMULATOR != 0
+        throw Ice::FeatureNotSupportedException(__FILE__, __LINE__, "SOCKS proxy not supported");
+#endif
+        _proxySettings = CFDictionaryCreateMutable(0, 3, &kCFTypeDictionaryKeyCallBacks,
+                                                   &kCFTypeDictionaryValueCallBacks);
+
+        _proxyPort = properties->getPropertyAsIntWithDefault("Ice.SOCKSProxyPort", 1080);
+
+        CFStringRef host = toCFString(_proxyHost);
+        CFDictionarySetValue(_proxySettings, kCFStreamPropertySOCKSProxyHost, host);
+        CFRelease(host);
+
+        CFNumberRef port = CFNumberCreate(0, kCFNumberSInt32Type, &_proxyPort);
+        CFDictionarySetValue(_proxySettings, kCFStreamPropertySOCKSProxyPort, port);
+        CFRelease(port);
+
+        CFDictionarySetValue(_proxySettings, kCFStreamPropertySOCKSVersion, kCFStreamSocketSOCKSVersion4);
+    }
+}
+
+IceObjC::Instance::~Instance()
+{
+    if(_proxySettings)
+    {
+        CFRelease(_proxySettings);
+    }
+}
+
+void
+IceObjC::Instance::setupStreams(CFReadStreamRef readStream,
+                                CFWriteStreamRef writeStream,
+                                bool server,
+                                const string& host) const
+{
+    if(_voip)
+    {
+#if TARGET_IPHONE_SIMULATOR == 0
+        if(!CFReadStreamSetProperty(readStream, kCFStreamNetworkServiceType, kCFStreamNetworkServiceTypeVoIP) ||
+           !CFWriteStreamSetProperty(writeStream, kCFStreamNetworkServiceType, kCFStreamNetworkServiceTypeVoIP))
+        {
+            throw Ice::SyscallException(__FILE__, __LINE__);
+        }
+#endif
+    }
+
+    if(!server && _proxySettings)
+    {
+        if(!CFReadStreamSetProperty(readStream, kCFStreamPropertySOCKSProxy, _proxySettings) ||
+           !CFWriteStreamSetProperty(writeStream, kCFStreamPropertySOCKSProxy, _proxySettings))
+        {
+            throw Ice::SyscallException(__FILE__, __LINE__);
+        }
+    }
+}
+
+IceObjC::Instance*
+IceObjC::Instance::clone(const ProtocolInstancePtr& instance)
+{
+    return new Instance(_communicator, instance->type(), instance->protocol(), instance->secure());
+}
+
+IceObjC::StreamEndpointI::StreamEndpointI(const InstancePtr& instance, const string& ho, Int po,
+                                          const Address& sourceAddr, Int ti, const string& conId, bool co) :
+    IceInternal::IPEndpointI(instance, ho, po, sourceAddr, conId),
+    _instance(instance),
+    _timeout(ti),
+    _compress(co)
+{
+}
+
+IceObjC::StreamEndpointI::StreamEndpointI(const InstancePtr& instance) :
+    IceInternal::IPEndpointI(instance),
+    _instance(instance),
+    _timeout(instance->defaultTimeout()),
+    _compress(false)
+{
+}
+
+IceObjC::StreamEndpointI::StreamEndpointI(const InstancePtr& instance, Ice::InputStream* s) :
+    IPEndpointI(instance, s),
+    _instance(instance),
+    _timeout(-1),
+    _compress(false)
+{
+    s->read(const_cast<Int&>(_timeout));
+    s->read(const_cast<bool&>(_compress));
+}
+
+EndpointInfoPtr
+IceObjC::StreamEndpointI::getInfo() const
+{
+    TCPEndpointInfoPtr info = ICE_MAKE_SHARED(InfoI<Ice::TCPEndpointInfo>, shared_from_this());
+    IPEndpointI::fillEndpointInfo(info.get());
+    info->timeout = _timeout;
+    info->compress = _compress;
+    return info;
+}
+
+Int
+IceObjC::StreamEndpointI::timeout() const
+{
+    return _timeout;
+}
+
+EndpointIPtr
+IceObjC::StreamEndpointI::timeout(Int t) const
+{
+    if(t == _timeout)
+    {
+        return shared_from_this();
+    }
+    else
+    {
+        return ICE_MAKE_SHARED(StreamEndpointI, _instance, _host, _port, _sourceAddr, t, _connectionId, _compress);
+    }
+}
+
+bool
+IceObjC::StreamEndpointI::compress() const
+{
+    return _compress;
+}
+
+EndpointIPtr
+IceObjC::StreamEndpointI::compress(bool c) const
+{
+    if(c == _compress)
+    {
+        return shared_from_this();
+    }
+    else
+    {
+        return ICE_MAKE_SHARED(StreamEndpointI, _instance, _host, _port, _sourceAddr, _timeout, _connectionId, c);
+    }
+}
+
+bool
+IceObjC::StreamEndpointI::datagram() const
+{
+    return false;
+}
+
+bool
+IceObjC::StreamEndpointI::secure() const
+{
+    return _instance->secure();
+}
+
+void
+IceObjC::StreamEndpointI::connectors_async(Ice::EndpointSelectionType selType, const EndpointI_connectorsPtr& cb) const
+{
+    vector<ConnectorPtr> connectors;
+    connectors.push_back(new StreamConnector(_instance, _host, _port, _timeout, _connectionId));
+    cb->connectors(connectors);
+}
+
+TransceiverPtr
+IceObjC::StreamEndpointI::transceiver() const
+{
+    return 0;
+}
+
+AcceptorPtr
+IceObjC::StreamEndpointI::acceptor(const string&) const
+{
+    return new StreamAcceptor(shared_from_this(), _instance, _host, _port);
+}
+
+IceObjC::StreamEndpointIPtr
+IceObjC::StreamEndpointI::endpoint(const StreamAcceptorPtr& a) const
+{
+    return ICE_MAKE_SHARED(StreamEndpointI, _instance, _host, a->effectivePort(), _sourceAddr, _timeout, _connectionId,
+                           _compress);
+}
+
+string
+IceObjC::StreamEndpointI::options() const
+{
+    //
+    // WARNING: Certain features, such as proxy validation in Glacier2,
+    // depend on the format of proxy strings. Changes to toString() and
+    // methods called to generate parts of the reference string could break
+    // these features. Please review for all features that depend on the
+    // format of proxyToString() before changing this and related code.
+    //
+    ostringstream s;
+
+    s << IPEndpointI::options();
+
+    if(_timeout == -1)
+    {
+        s << " -t infinite";
+    }
+    else
+    {
+        s << " -t " << _timeout;
+    }
+
+    if(_compress)
+    {
+        s << " -z";
+    }
+
+    return s.str();
+}
+
+bool
+#ifdef ICE_CPP11_MAPPING
+IceObjC::StreamEndpointI::operator==(const Endpoint& r) const
+#else
+IceObjC::StreamEndpointI::operator==(const LocalObject& r) const
+#endif
+{
+    if(!IPEndpointI::operator==(r))
+    {
+        return false;
+    }
+
+    const StreamEndpointI* p = dynamic_cast<const StreamEndpointI*>(&r);
+    if(!p)
+    {
+        return false;
+    }
+
+    if(this == p)
+    {
+        return true;
+    }
+
+    if(_timeout != p->_timeout)
+    {
+        return false;
+    }
+
+    if(_compress != p->_compress)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool
+#ifdef ICE_CPP11_MAPPING
+IceObjC::StreamEndpointI::operator<(const Endpoint& r) const
+#else
+IceObjC::StreamEndpointI::operator<(const LocalObject& r) const
+#endif
+{
+    const StreamEndpointI* p = dynamic_cast<const StreamEndpointI*>(&r);
+    if(!p)
+    {
+        const IceInternal::EndpointI* e = dynamic_cast<const IceInternal::EndpointI*>(&r);
+        if(!e)
+        {
+            return false;
+        }
+        return type() < e->type();
+    }
+
+    if(this == p)
+    {
+        return false;
+    }
+
+    if(_timeout < p->_timeout)
+    {
+        return true;
+    }
+    else if(p->_timeout < _timeout)
+    {
+        return false;
+    }
+
+    if(!_compress && p->_compress)
+    {
+        return true;
+    }
+    else if(p->_compress < _compress)
+    {
+        return false;
+    }
+
+    return IPEndpointI::operator<(r);
+}
+
+void
+IceObjC::StreamEndpointI::streamWriteImpl(Ice::OutputStream* s) const
+{
+    IPEndpointI::streamWriteImpl(s);
+    s->write(_timeout);
+    s->write(_compress);
+}
+
+void
+IceObjC::StreamEndpointI::hashInit(Ice::Int& h) const
+{
+    IPEndpointI::hashInit(h);
+    hashAdd(h, _timeout);
+    hashAdd(h, _compress);
+}
+
+bool
+IceObjC::StreamEndpointI::checkOption(const string& option, const string& argument, const string& endpoint)
+{
+    if(IPEndpointI::checkOption(option, argument, endpoint))
+    {
+        return true;
+    }
+
+    switch(option[1])
+    {
+    case 't':
+    {
+        if(argument.empty())
+        {
+            EndpointParseException ex(__FILE__, __LINE__);
+            ex.str = "no argument provided for -t option in endpoint " + endpoint;
+            throw ex;
+        }
+
+        if(argument == "infinite")
+        {
+            const_cast<Int&>(_timeout) = -1;
+        }
+        else
+        {
+            istringstream t(argument);
+            if(!(t >> const_cast<Int&>(_timeout)) || !t.eof() || _timeout < 1)
+            {
+                EndpointParseException ex(__FILE__, __LINE__);
+                ex.str = "invalid timeout value `" + argument + "' in endpoint " + endpoint;
+                throw ex;
+            }
+        }
+        return true;
+    }
+
+    case 'z':
+    {
+        if(!argument.empty())
+        {
+            EndpointParseException ex(__FILE__, __LINE__);
+            ex.str = "unexpected argument `" + argument + "' provided for -z option in " + endpoint;
+            throw ex;
+        }
+        const_cast<bool&>(_compress) = true;
+        return true;
+    }
+
+    default:
+    {
+        return false;
+    }
+    }
+}
+
+ConnectorPtr
+IceObjC::StreamEndpointI::createConnector(const Address& address, const NetworkProxyPtr& proxy) const
+{
+    assert(false);
+    return 0;
+}
+
+IPEndpointIPtr
+IceObjC::StreamEndpointI::createEndpoint(const string& host, int port, const string& connectionId) const
+{
+    return ICE_MAKE_SHARED(StreamEndpointI, _instance, host, port, _sourceAddr, _timeout, connectionId, _compress);
+}
+
+IceObjC::StreamEndpointFactory::StreamEndpointFactory(const InstancePtr& instance) : _instance(instance)
+{
+}
+
+IceObjC::StreamEndpointFactory::~StreamEndpointFactory()
+{
+}
+
+Short
+IceObjC::StreamEndpointFactory::type() const
+{
+    return _instance->type();
+}
+
+string
+IceObjC::StreamEndpointFactory::protocol() const
+{
+    return _instance->protocol();
+}
+
+EndpointIPtr
+IceObjC::StreamEndpointFactory::create(vector<string>& args, bool oaEndpoint) const
+{
+    IPEndpointIPtr endpt = ICE_MAKE_SHARED(StreamEndpointI, _instance);
+    endpt->initWithOptions(args, oaEndpoint);
+    return endpt;
+}
+
+EndpointIPtr
+IceObjC::StreamEndpointFactory::read(Ice::InputStream* s) const
+{
+    return ICE_MAKE_SHARED(StreamEndpointI, _instance, s);
+}
+
+void
+IceObjC::StreamEndpointFactory::destroy()
+{
+    _instance = 0;
+}
+
+EndpointFactoryPtr
+IceObjC::StreamEndpointFactory::clone(const ProtocolInstancePtr& instance, const EndpointFactoryPtr&) const
+{
+    return new StreamEndpointFactory(_instance->clone(instance));
+}
diff --git a/cpp/src/Ice/ios/StreamEndpointI.h b/cpp/src/Ice/ios/StreamEndpointI.h
new file mode 100644
index 00000000000..3dd90551199
--- /dev/null
+++ b/cpp/src/Ice/ios/StreamEndpointI.h
@@ -0,0 +1,155 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_STREAM_ENDPOINT_I_H
+#define ICE_STREAM_ENDPOINT_I_H
+
+#include <Ice/ProtocolInstance.h>
+#include <Ice/IPEndpointI.h>
+#include <Ice/WSEndpoint.h>
+#include <Ice/EndpointFactory.h>
+#include <Ice/InstanceF.h>
+
+#include <CoreFoundation/CFDictionary.h>
+#include <CFNetwork/CFNetwork.h>
+
+namespace Ice
+{
+
+class OutputStream;
+class InputStream;
+
+}
+
+namespace IceObjC
+{
+
+class Instance : public IceInternal::ProtocolInstance
+{
+public:
+
+    Instance(const Ice::CommunicatorPtr&, Ice::Short, const std::string&, bool);
+    virtual ~Instance();
+
+    const std::string& proxyHost() const
+    {
+        return _proxyHost;
+    }
+
+    int proxyPort() const
+    {
+        return _proxyPort;
+    }
+
+    void setupStreams(CFReadStreamRef, CFWriteStreamRef, bool, const std::string&) const;
+
+    Instance* clone(const IceInternal::ProtocolInstancePtr&);
+
+private:
+
+    const bool _voip;
+    const Ice::CommunicatorPtr _communicator;
+    CFMutableDictionaryRef _proxySettings;
+    std::string _proxyHost;
+    int _proxyPort;
+};
+typedef IceUtil::Handle<Instance> InstancePtr;
+
+class StreamAcceptor;
+typedef IceUtil::Handle<StreamAcceptor> StreamAcceptorPtr;
+
+class StreamEndpointI;
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+typedef ::std::shared_ptr<StreamEndpointI> StreamEndpointIPtr;
+#else
+typedef IceUtil::Handle<StreamEndpointI> StreamEndpointIPtr;
+#endif
+
+class StreamEndpointI : public IceInternal::IPEndpointI, public Ice::EnableSharedFromThis<StreamEndpointI>
+{
+public:
+
+    StreamEndpointI(const InstancePtr&, const std::string&, Ice::Int, const IceInternal::Address&, Ice::Int,
+                    const std::string&, bool);
+    StreamEndpointI(const InstancePtr&);
+    StreamEndpointI(const InstancePtr&, Ice::InputStream*);
+
+    virtual Ice::EndpointInfoPtr getInfo() const;
+
+    virtual Ice::Int timeout() const;
+    virtual IceInternal::EndpointIPtr timeout(Ice::Int) const;
+    virtual bool compress() const;
+    virtual IceInternal::EndpointIPtr compress(bool) const;
+    virtual bool datagram() const;
+    virtual bool secure() const;
+
+    virtual void connectors_async(Ice::EndpointSelectionType, const IceInternal::EndpointI_connectorsPtr&) const;
+    virtual IceInternal::TransceiverPtr transceiver() const;
+    virtual IceInternal::AcceptorPtr acceptor(const std::string&) const;
+    virtual std::string options() const;
+
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const Ice::Endpoint&) const;
+    virtual bool operator<(const Ice::Endpoint&) const;
+#else
+    virtual bool operator==(const Ice::LocalObject&) const;
+    virtual bool operator<(const Ice::LocalObject&) const;
+#endif
+
+    StreamEndpointIPtr endpoint(const StreamAcceptorPtr&) const;
+
+    using IPEndpointI::connectionId;
+    using Ice::EnableSharedFromThis<StreamEndpointI>::shared_from_this;
+
+protected:
+
+    virtual void streamWriteImpl(Ice::OutputStream*) const;
+    virtual void hashInit(Ice::Int&) const;
+    virtual bool checkOption(const std::string&, const std::string&, const std::string&);
+
+    virtual IceInternal::ConnectorPtr createConnector(const IceInternal::Address&,
+                                                      const IceInternal::NetworkProxyPtr&) const;
+    virtual IceInternal::IPEndpointIPtr createEndpoint(const std::string&, int, const std::string&) const;
+
+private:
+
+    const InstancePtr _instance;
+
+    //
+    // All members are const, because endpoints are immutable.
+    //
+    const Ice::Int _timeout;
+    const bool _compress;
+};
+
+class StreamEndpointFactory : public IceInternal::EndpointFactory
+{
+public:
+
+    StreamEndpointFactory(const InstancePtr&);
+
+    virtual ~StreamEndpointFactory();
+
+    virtual Ice::Short type() const;
+    virtual std::string protocol() const;
+    virtual IceInternal::EndpointIPtr create(std::vector<std::string>&, bool) const;
+    virtual IceInternal::EndpointIPtr read(Ice::InputStream*) const;
+    virtual void destroy();
+
+    virtual IceInternal::EndpointFactoryPtr clone(const IceInternal::ProtocolInstancePtr&,
+                                                  const IceInternal::EndpointFactoryPtr&) const;
+
+private:
+
+    InstancePtr _instance;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Ice/ios/StreamTransceiver.cpp b/cpp/src/Ice/ios/StreamTransceiver.cpp
new file mode 100644
index 00000000000..4fcbec4f400
--- /dev/null
+++ b/cpp/src/Ice/ios/StreamTransceiver.cpp
@@ -0,0 +1,597 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include "StreamTransceiver.h"
+#include "StreamEndpointI.h"
+
+#include <Ice/Properties.h>
+#include <Ice/TraceLevels.h>
+#include <Ice/Connection.h>
+#include <Ice/LoggerUtil.h>
+#include <Ice/Buffer.h>
+#include <Ice/Network.h>
+#include <IceSSL/ConnectionInfo.h>
+
+#include <CoreFoundation/CoreFoundation.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+namespace
+{
+
+void selectorReadCallback(CFReadStreamRef, CFStreamEventType event, void* info)
+{
+    SelectorReadyCallback* callback = reinterpret_cast<SelectorReadyCallback*>(info);
+    switch(event)
+    {
+    case kCFStreamEventOpenCompleted:
+        callback->readyCallback(static_cast<SocketOperation>(SocketOperationConnect | SocketOperationRead));
+        break;
+    case kCFStreamEventHasBytesAvailable:
+        callback->readyCallback(SocketOperationRead);
+        break;
+    default:
+        callback->readyCallback(SocketOperationRead, -1); // Error
+        break;
+    }
+}
+
+void selectorWriteCallback(CFWriteStreamRef, CFStreamEventType event, void* info)
+{
+    SelectorReadyCallback* callback = reinterpret_cast<SelectorReadyCallback*>(info);
+    switch(event)
+    {
+    case kCFStreamEventOpenCompleted:
+        callback->readyCallback(static_cast<SocketOperation>(SocketOperationConnect | SocketOperationWrite));
+        break;
+    case kCFStreamEventCanAcceptBytes:
+        callback->readyCallback(SocketOperationWrite);
+        break;
+    default:
+        callback->readyCallback(SocketOperationWrite, -1); // Error
+        break;
+    }
+}
+
+}
+
+static inline string
+fromCFString(CFStringRef ref)
+{
+   const char* s = CFStringGetCStringPtr(ref, kCFStringEncodingUTF8);
+   if(s)
+   {
+       return string(s);
+   }
+
+   // Not great, but is good enough for this purpose.
+   char buf[1024];
+   CFStringGetCString(ref, buf, sizeof(buf), kCFStringEncodingUTF8);
+   return string(buf);
+}
+
+IceInternal::NativeInfoPtr
+IceObjC::StreamTransceiver::getNativeInfo()
+{
+    return this;
+}
+
+void
+IceObjC::StreamTransceiver::initStreams(SelectorReadyCallback* callback)
+{
+    CFOptionFlags events;
+    CFStreamClientContext ctx = { 0, callback, 0, 0, 0 };
+    events = kCFStreamEventOpenCompleted | kCFStreamEventCanAcceptBytes | kCFStreamEventErrorOccurred |
+        kCFStreamEventEndEncountered;
+    CFWriteStreamSetClient(_writeStream, events, selectorWriteCallback, &ctx);
+
+    events = kCFStreamEventOpenCompleted | kCFStreamEventHasBytesAvailable | kCFStreamEventErrorOccurred |
+        kCFStreamEventEndEncountered;
+    CFReadStreamSetClient(_readStream, events, selectorReadCallback, &ctx);
+}
+
+SocketOperation
+IceObjC::StreamTransceiver::registerWithRunLoop(SocketOperation op)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    SocketOperation readyOp = SocketOperationNone;
+    if(op & SocketOperationConnect)
+    {
+        if(CFWriteStreamGetStatus(_writeStream) != kCFStreamStatusNotOpen ||
+           CFReadStreamGetStatus(_readStream) != kCFStreamStatusNotOpen)
+        {
+            return SocketOperationConnect;
+        }
+
+        _opening = true;
+
+        CFWriteStreamScheduleWithRunLoop(_writeStream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+        CFReadStreamScheduleWithRunLoop(_readStream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+
+        _writeStreamRegistered = true; // Note: this must be set after the schedule call
+        _readStreamRegistered = true; // Note: this must be set after the schedule call
+
+        CFReadStreamOpen(_readStream);
+        CFWriteStreamOpen(_writeStream);
+    }
+    else
+    {
+        if(op & SocketOperationWrite)
+        {
+            if(CFWriteStreamCanAcceptBytes(_writeStream))
+            {
+                readyOp = static_cast<SocketOperation>(readyOp | SocketOperationWrite);
+            }
+            else if(!_writeStreamRegistered)
+            {
+                CFWriteStreamScheduleWithRunLoop(_writeStream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+                _writeStreamRegistered = true; // Note: this must be set after the schedule call
+                if(CFWriteStreamCanAcceptBytes(_writeStream))
+                {
+                    readyOp = static_cast<SocketOperation>(readyOp | SocketOperationWrite);
+                }
+            }
+        }
+
+        if(op & SocketOperationRead)
+        {
+            if(CFReadStreamHasBytesAvailable(_readStream))
+            {
+                readyOp = static_cast<SocketOperation>(readyOp | SocketOperationRead);
+            }
+            else if(!_readStreamRegistered)
+            {
+                CFReadStreamScheduleWithRunLoop(_readStream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+                _readStreamRegistered = true; // Note: this must be set after the schedule call
+                if(CFReadStreamHasBytesAvailable(_readStream))
+                {
+                    readyOp = static_cast<SocketOperation>(readyOp | SocketOperationRead);
+                }
+            }
+        }
+    }
+    return readyOp;
+}
+
+SocketOperation
+IceObjC::StreamTransceiver::unregisterFromRunLoop(SocketOperation op, bool error)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    _error |= error;
+
+    if(_opening)
+    {
+        // Wait for the stream to be ready for write
+        if(op == SocketOperationWrite)
+        {
+            _writeStreamRegistered = false;
+        }
+
+        //
+        // We don't wait for the stream to be ready for read (even if
+        // it's a client connection) because there's no guarantees that
+        // the server might actually send data right away. If we use
+        // the WebSocket transport, the server actually waits for the
+        // client to write the HTTP upgrade request.
+        //
+        //if(op & SocketOperationRead && (_fd != INVALID_SOCKET || !(op & SocketOperationConnect)))
+        if(op == (SocketOperationRead | SocketOperationConnect))
+        {
+            _readStreamRegistered = false;
+        }
+
+        if(error || (!_readStreamRegistered && !_writeStreamRegistered))
+        {
+            CFWriteStreamUnscheduleFromRunLoop(_writeStream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+            CFReadStreamUnscheduleFromRunLoop(_readStream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+            _opening = false;
+            return SocketOperationConnect;
+        }
+        else
+        {
+            return SocketOperationNone;
+        }
+    }
+    else
+    {
+        if(op & SocketOperationWrite && _writeStreamRegistered)
+        {
+            CFWriteStreamUnscheduleFromRunLoop(_writeStream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+            _writeStreamRegistered = false;
+        }
+
+        if(op & SocketOperationRead && _readStreamRegistered)
+        {
+            CFReadStreamUnscheduleFromRunLoop(_readStream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+            _readStreamRegistered = false;
+        }
+    }
+    return op;
+}
+
+void
+IceObjC::StreamTransceiver::closeStreams()
+{
+    CFReadStreamSetClient(_readStream, kCFStreamEventNone, 0, 0);
+    CFWriteStreamSetClient(_writeStream, kCFStreamEventNone, 0, 0);
+
+    CFReadStreamClose(_readStream);
+    CFWriteStreamClose(_writeStream);
+}
+
+SocketOperation
+IceObjC::StreamTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if(_state == StateNeedConnect)
+    {
+        _state = StateConnectPending;
+        return SocketOperationConnect;
+    }
+
+    if(_state <= StateConnectPending)
+    {
+        if(_error)
+        {
+            CFErrorRef err = NULL;
+            if(CFWriteStreamGetStatus(_writeStream) == kCFStreamStatusError)
+            {
+                err = CFWriteStreamCopyError(_writeStream);
+            }
+            else if(CFReadStreamGetStatus(_readStream) == kCFStreamStatusError)
+            {
+                err = CFReadStreamCopyError(_readStream);
+            }
+            checkError(err, __FILE__, __LINE__);
+        }
+
+        _state = StateConnected;
+
+        if(_fd == INVALID_SOCKET)
+        {
+            if(!CFReadStreamSetProperty(_readStream, kCFStreamPropertyShouldCloseNativeSocket, kCFBooleanFalse) ||
+               !CFWriteStreamSetProperty(_writeStream, kCFStreamPropertyShouldCloseNativeSocket, kCFBooleanFalse))
+            {
+                throw Ice::SocketException(__FILE__, __LINE__, 0);
+            }
+
+            CFDataRef d = (CFDataRef)CFReadStreamCopyProperty(_readStream, kCFStreamPropertySocketNativeHandle);
+            CFDataGetBytes(d, CFRangeMake(0, sizeof(SOCKET)), reinterpret_cast<UInt8*>(&_fd));
+            CFRelease(d);
+        }
+
+        ostringstream s;
+        Address localAddr;
+        fdToLocalAddress(_fd, localAddr);
+        s << "local address = " << addrToString(localAddr);
+        string proxyHost = _instance->proxyHost();
+        if(!proxyHost.empty())
+        {
+            s << "\nSOCKS proxy address = " << proxyHost << ":" << _instance->proxyPort();
+        }
+        Address remoteAddr;
+        bool peerConnected = fdToRemoteAddress(_fd, remoteAddr);
+        if(peerConnected)
+        {
+            s << "\nremote address = " << addrToString(remoteAddr);
+        }
+        else
+        {
+            s << "\nremote address = " << _host << ":" << _port;
+        }
+        _desc = s.str();
+
+        setBlock(_fd, false);
+        setTcpBufSize(_fd, _instance);
+    }
+    assert(_state == StateConnected);
+    return SocketOperationNone;
+}
+
+SocketOperation
+#ifdef ICE_CPP11_MAPPING
+IceObjC::StreamTransceiver::closing(bool initiator, exception_ptr)
+#else
+IceObjC::StreamTransceiver::closing(bool initiator, const Ice::LocalException&)
+#endif
+{
+    // If we are initiating the connection closure, wait for the peer
+    // to close the TCP/IP connection. Otherwise, close immediately.
+    return initiator ? SocketOperationRead : SocketOperationNone;
+}
+
+void
+IceObjC::StreamTransceiver::close()
+{
+    if(_fd != INVALID_SOCKET)
+    {
+        try
+        {
+            closeSocket(_fd);
+            _fd = INVALID_SOCKET;
+        }
+        catch(const SocketException&)
+        {
+            _fd = INVALID_SOCKET;
+            throw;
+        }
+    }
+}
+
+SocketOperation
+IceObjC::StreamTransceiver::write(Buffer& buf)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if(_error)
+    {
+        assert(CFWriteStreamGetStatus(_writeStream) == kCFStreamStatusError);
+        checkError(CFWriteStreamCopyError(_writeStream), __FILE__, __LINE__);
+    }
+
+    // Its impossible for the packetSize to be more than an Int.
+    size_t packetSize = static_cast<size_t>(buf.b.end() - buf.i);
+    while(buf.i != buf.b.end())
+    {
+        if(!CFWriteStreamCanAcceptBytes(_writeStream))
+        {
+            return SocketOperationWrite;
+        }
+
+        assert(_fd != INVALID_SOCKET);
+        CFIndex ret = CFWriteStreamWrite(_writeStream, reinterpret_cast<const UInt8*>(&*buf.i), packetSize);
+
+        if(ret == SOCKET_ERROR)
+        {
+            if(CFWriteStreamGetStatus(_writeStream) == kCFStreamStatusAtEnd)
+            {
+                ConnectionLostException ex(__FILE__, __LINE__);
+                ex.error = getSocketErrno();
+                throw ex;
+            }
+
+            assert(CFWriteStreamGetStatus(_writeStream) == kCFStreamStatusError);
+            checkError(CFWriteStreamCopyError(_writeStream), __FILE__, __LINE__);
+            if(noBuffers() && packetSize > 1024)
+            {
+                packetSize /= 2;
+            }
+            continue;
+        }
+
+        buf.i += ret;
+
+        if(packetSize > buf.b.end() - buf.i)
+        {
+            packetSize = static_cast<int>(buf.b.end() - buf.i);
+        }
+    }
+    return SocketOperationNone;
+}
+
+SocketOperation
+IceObjC::StreamTransceiver::read(Buffer& buf)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if(_error)
+    {
+        assert(CFReadStreamGetStatus(_readStream) == kCFStreamStatusError);
+        checkError(CFReadStreamCopyError(_readStream), __FILE__, __LINE__);
+    }
+
+    // Its impossible for the packetSize to be more than an Int.
+    size_t packetSize = static_cast<size_t>(buf.b.end() - buf.i);
+    while(buf.i != buf.b.end())
+    {
+        if(!CFReadStreamHasBytesAvailable(_readStream))
+        {
+            return SocketOperationRead;
+        }
+
+        assert(_fd != INVALID_SOCKET);
+        CFIndex ret = CFReadStreamRead(_readStream, reinterpret_cast<UInt8*>(&*buf.i), packetSize);
+
+        if(ret == 0)
+        {
+            ConnectionLostException ex(__FILE__, __LINE__);
+            ex.error = 0;
+            throw ex;
+        }
+
+        if(ret == SOCKET_ERROR)
+        {
+            if(CFReadStreamGetStatus(_readStream) == kCFStreamStatusAtEnd)
+            {
+                ConnectionLostException ex(__FILE__, __LINE__);
+                ex.error = getSocketErrno();
+                throw ex;
+            }
+
+            assert(CFReadStreamGetStatus(_readStream) == kCFStreamStatusError);
+            checkError(CFReadStreamCopyError(_readStream), __FILE__, __LINE__);
+            if(noBuffers() && packetSize > 1024)
+            {
+                packetSize /= 2;
+            }
+            continue;
+        }
+
+        buf.i += ret;
+
+        if(packetSize > buf.b.end() - buf.i)
+        {
+            packetSize = static_cast<int>(buf.b.end() - buf.i);
+        }
+    }
+
+    return SocketOperationNone;
+}
+
+string
+IceObjC::StreamTransceiver::protocol() const
+{
+    return _instance->protocol();
+}
+
+string
+IceObjC::StreamTransceiver::toString() const
+{
+    return _desc;
+}
+
+string
+IceObjC::StreamTransceiver::toDetailedString() const
+{
+    return _desc;
+}
+
+Ice::ConnectionInfoPtr
+IceObjC::StreamTransceiver::getInfo() const
+{
+    Ice::TCPConnectionInfoPtr info = ICE_MAKE_SHARED(Ice::TCPConnectionInfo);
+    fdToAddressAndPort(_fd, info->localAddress, info->localPort, info->remoteAddress, info->remotePort);
+    info->rcvSize = getRecvBufferSize(_fd);
+    info->sndSize = getSendBufferSize(_fd);
+    return info;
+}
+
+void
+IceObjC::StreamTransceiver::checkSendSize(const Buffer& buf)
+{
+}
+
+void
+IceObjC::StreamTransceiver::setBufferSize(int rcvSize, int sndSize)
+{
+    setTcpBufSize(_fd, rcvSize, sndSize, _instance);
+}
+
+IceObjC::StreamTransceiver::StreamTransceiver(const InstancePtr& instance,
+                                              CFReadStreamRef readStream,
+                                              CFWriteStreamRef writeStream,
+                                              const string& host,
+                                              Ice::Int port) :
+    StreamNativeInfo(INVALID_SOCKET),
+    _instance(instance),
+    _host(host),
+    _port(port),
+    _readStream(readStream),
+    _writeStream(writeStream),
+    _readStreamRegistered(false),
+    _writeStreamRegistered(false),
+    _opening(false),
+    _error(false),
+    _state(StateNeedConnect)
+{
+    ostringstream s;
+    s << "local address = <not available>";
+    string proxyHost = instance->proxyHost();
+    if(!proxyHost.empty())
+    {
+        s << "\nSOCKS proxy address = " << proxyHost << ":" << instance->proxyPort();
+    }
+    s << "\nremote address = " << host << ":" << port;
+    _desc = s.str();
+}
+
+IceObjC::StreamTransceiver::StreamTransceiver(const InstancePtr& instance,
+                                              CFReadStreamRef readStream,
+                                              CFWriteStreamRef writeStream,
+                                              SOCKET fd) :
+    StreamNativeInfo(fd),
+    _instance(instance),
+    _port(0),
+    _readStream(readStream),
+    _writeStream(writeStream),
+    _readStreamRegistered(false),
+    _writeStreamRegistered(false),
+    _opening(false),
+    _error(false),
+    _state(StateNeedConnect),
+    _desc(fdToString(fd))
+{
+}
+
+IceObjC::StreamTransceiver::~StreamTransceiver()
+{
+    assert(_fd == INVALID_SOCKET);
+    CFRelease(_readStream);
+    CFRelease(_writeStream);
+}
+
+void
+IceObjC::StreamTransceiver::checkError(CFErrorRef err, const char* file, int line)
+{
+    assert(err);
+    CFStringRef domain = CFErrorGetDomain(err);
+    if(CFStringCompare(domain, kCFErrorDomainPOSIX, 0) == kCFCompareEqualTo)
+    {
+        errno = CFErrorGetCode(err);
+        CFRelease(err);
+        if(interrupted() || noBuffers())
+        {
+            return;
+        }
+
+        if(connectionLost())
+        {
+            ConnectionLostException ex(file, line);
+            ex.error = getSocketErrno();
+            throw ex;
+        }
+        else if(connectionRefused())
+        {
+            ConnectionRefusedException ex(file, line);
+            ex.error = getSocketErrno();
+            throw ex;
+        }
+        else if(connectFailed())
+        {
+            ConnectFailedException ex(file, line);
+            ex.error = getSocketErrno();
+            throw ex;
+        }
+        else
+        {
+            SocketException ex(file, line);
+            ex.error = getSocketErrno();
+            throw ex;
+        }
+    }
+
+    int error = CFErrorGetCode(err);
+    if(error == kCFHostErrorHostNotFound || error == kCFHostErrorUnknown)
+    {
+        int rs = 0;
+        if(error == kCFHostErrorUnknown)
+        {
+            CFDictionaryRef dict = CFErrorCopyUserInfo(err);
+            CFNumberRef d = (CFNumberRef)CFDictionaryGetValue(dict, kCFGetAddrInfoFailureKey);
+            if(d != 0)
+            {
+                CFNumberGetValue(d, kCFNumberSInt32Type, &rs);
+            }
+            CFRelease(dict);
+        }
+
+        CFRelease(err);
+
+        DNSException ex(file, line);
+        ex.error = rs;
+        ex.host = _host;
+        throw ex;
+    }
+
+    CFNetworkException ex(file, line);
+    ex.domain = fromCFString(domain);
+    ex.error = CFErrorGetCode(err);
+    CFRelease(err);
+    throw ex;
+}
diff --git a/cpp/src/Ice/ios/StreamTransceiver.h b/cpp/src/Ice/ios/StreamTransceiver.h
new file mode 100644
index 00000000000..e38285451f8
--- /dev/null
+++ b/cpp/src/Ice/ios/StreamTransceiver.h
@@ -0,0 +1,94 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_STREAM_TRANSCEIVER_H
+#define ICE_STREAM_TRANSCEIVER_H
+
+#include <Ice/WSTransceiver.h>
+#include <Ice/Network.h>
+#include <Ice/Selector.h>
+
+struct __CFError;
+typedef struct __CFError * CFErrorRef;
+
+struct __CFWriteStream;
+typedef struct __CFWriteStream * CFWriteStreamRef;
+
+struct __CFReadStream;
+typedef struct __CFReadStream * CFReadStreamRef;
+
+namespace IceObjC
+{
+
+class Instance;
+typedef IceUtil::Handle<Instance> InstancePtr;
+
+class StreamTransceiver : public IceInternal::Transceiver, public IceInternal::StreamNativeInfo
+{
+    enum State
+    {
+        StateNeedConnect,
+        StateConnectPending,
+        StateConnected
+    };
+
+public:
+
+    StreamTransceiver(const InstancePtr&, CFReadStreamRef, CFWriteStreamRef, const std::string&, Ice::Int);
+    StreamTransceiver(const InstancePtr&, CFReadStreamRef, CFWriteStreamRef, SOCKET);
+    virtual ~StreamTransceiver();
+
+    virtual IceInternal::NativeInfoPtr getNativeInfo();
+
+    virtual void initStreams(IceInternal::SelectorReadyCallback*);
+    virtual IceInternal::SocketOperation registerWithRunLoop(IceInternal::SocketOperation);
+    virtual IceInternal::SocketOperation unregisterFromRunLoop(IceInternal::SocketOperation, bool);
+    virtual void closeStreams();
+
+    virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&);
+#ifdef ICE_CPP11_MAPPING
+    virtual IceInternal::SocketOperation closing(bool initiator, std::exception_ptr);
+#else
+    virtual IceInternal::SocketOperation closing(bool, const Ice::LocalException&);
+#endif
+    virtual void close();
+
+    virtual IceInternal::SocketOperation write(IceInternal::Buffer&);
+    virtual IceInternal::SocketOperation read(IceInternal::Buffer&);
+
+    virtual std::string protocol() const;
+    virtual std::string toString() const;
+    virtual std::string toDetailedString() const;
+    virtual Ice::ConnectionInfoPtr getInfo() const;
+    virtual void checkSendSize(const IceInternal::Buffer&);
+    virtual void setBufferSize(int, int);
+
+private:
+
+    void checkError(CFErrorRef, const char*, int);
+
+    const InstancePtr _instance;
+    const std::string _host;
+    const Ice::Int _port;
+    CFReadStreamRef _readStream;
+    CFWriteStreamRef _writeStream;
+    bool _readStreamRegistered;
+    bool _writeStreamRegistered;
+    bool _opening;
+
+    IceUtil::Mutex _mutex;
+    bool _error;
+
+    State _state;
+    std::string _desc;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
new file mode 100644
index 00000000000..f7b60592918
--- /dev/null
+++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
@@ -0,0 +1,1772 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{3AB9772C-6113-4F1C-90FB-5368E7486C11}</ProjectGuid>
+    <RootNamespace>Ice</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>Ice</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderDLLExport>ICE_API</IceBuilderDLLExport>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\Ice.rc" />
+    <ResourceCompile Include="Win32\Debug\EventLoggerMsg.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ResourceCompile>
+    <ResourceCompile Include="Win32\Release\EventLoggerMsg.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ResourceCompile>
+    <ResourceCompile Include="x64\Debug\EventLoggerMsg.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ResourceCompile>
+    <ResourceCompile Include="x64\Release\EventLoggerMsg.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\BuiltinSequences.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Communicator.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\CommunicatorF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Connection.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ConnectionF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Current.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Endpoint.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\EndpointF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\EndpointTypes.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\FacetMap.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Identity.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ImplicitContext.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ImplicitContextF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Instrumentation.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\InstrumentationF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LocalException.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Locator.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LocatorF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Logger.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LoggerF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Metrics.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectAdapter.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectAdapterF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectFactory.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Plugin.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PluginF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Process.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ProcessF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Properties.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PropertiesAdmin.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PropertiesF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\RemoteLogger.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Router.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\RouterF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ServantLocator.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ValueFactory.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Version.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\EventLoggerMsg.mc">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc &amp;&amp; move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc &amp;&amp; move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc &amp;&amp; move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc &amp;&amp; move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs>
+    </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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Communicator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\CommunicatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Connection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ConnectionF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Current.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Endpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FacetMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Identity.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ImplicitContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ImplicitContextF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\InstrumentationF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LocalException.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Locator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Logger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LoggerF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectAdapter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectAdapterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Plugin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PluginF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Process.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ProcessF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Properties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PropertiesAdmin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PropertiesF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RemoteLogger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ServantLocator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ServantLocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ValueFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Version.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\BuiltinSequences.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Communicator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\CommunicatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Connection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ConnectionF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Current.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Endpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FacetMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Identity.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ImplicitContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ImplicitContextF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\InstrumentationF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LocalException.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Locator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Logger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LoggerF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectAdapter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectAdapterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Plugin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PluginF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Process.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ProcessF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Properties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PropertiesAdmin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PropertiesF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RemoteLogger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ServantLocator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ServantLocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SliceChecksumDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ValueFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Version.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\BuiltinSequences.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Communicator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\CommunicatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Connection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ConnectionF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Current.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Endpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FacetMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Identity.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ImplicitContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ImplicitContextF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\InstrumentationF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LocalException.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Locator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Logger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LoggerF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectAdapter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectAdapterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Plugin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PluginF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Process.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ProcessF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Properties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PropertiesAdmin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PropertiesF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RemoteLogger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ServantLocator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ServantLocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SliceChecksumDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ValueFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Version.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\BuiltinSequences.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Communicator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\CommunicatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Connection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ConnectionF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Current.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Endpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FacetMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Identity.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ImplicitContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ImplicitContextF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\InstrumentationF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LocalException.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Locator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Logger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LoggerF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectAdapter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectAdapterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Plugin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PluginF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Process.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ProcessF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Properties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PropertiesAdmin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PropertiesF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RemoteLogger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ServantLocator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ServantLocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SliceChecksumDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ValueFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Version.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\BuiltinSequences.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Communicator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\CommunicatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Connection.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ConnectionF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Current.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Endpoint.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\EndpointF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\EndpointTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\FacetMap.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Identity.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ImplicitContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ImplicitContextF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\InstrumentationF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\LocalException.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Locator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\LocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Logger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\LoggerF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ObjectAdapter.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ObjectAdapterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ObjectFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Plugin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\PluginF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Process.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ProcessF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Properties.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\PropertiesAdmin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\PropertiesF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\RemoteLogger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ServantLocator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ServantLocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\SliceChecksumDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ValueFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Version.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\BuiltinSequences.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Communicator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\CommunicatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Connection.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ConnectionF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Current.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Endpoint.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\EndpointF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\EndpointTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\FacetMap.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Identity.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ImplicitContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ImplicitContextF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\InstrumentationF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\LocalException.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Locator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\LocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Logger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\LoggerF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ObjectAdapter.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ObjectAdapterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ObjectFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Plugin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\PluginF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Process.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ProcessF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Properties.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\PropertiesAdmin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\PropertiesF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\RemoteLogger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ServantLocator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ServantLocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\SliceChecksumDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ValueFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Version.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\BuiltinSequences.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Communicator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\CommunicatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Connection.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ConnectionF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Current.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Endpoint.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\EndpointF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\EndpointTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\FacetMap.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Identity.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ImplicitContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ImplicitContextF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\InstrumentationF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\LocalException.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Locator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\LocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Logger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\LoggerF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ObjectAdapter.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ObjectAdapterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ObjectFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Plugin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\PluginF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Process.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ProcessF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Properties.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\PropertiesAdmin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\PropertiesF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\RemoteLogger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ServantLocator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ServantLocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\SliceChecksumDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ValueFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Version.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\BuiltinSequences.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Communicator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\CommunicatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Connection.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ConnectionF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Current.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Endpoint.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\EndpointF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\EndpointTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\FacetMap.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Identity.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ImplicitContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ImplicitContextF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\InstrumentationF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\LocalException.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Locator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\LocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Logger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\LoggerF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ObjectAdapter.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ObjectAdapterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ObjectFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Plugin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\PluginF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Process.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ProcessF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Properties.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\PropertiesAdmin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\PropertiesF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\RemoteLogger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ServantLocator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ServantLocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\SliceChecksumDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ValueFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Version.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets'))" />
+  </Target>
+</Project>
diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters
new file mode 100644
index 00000000000..13df6b362e1
--- /dev/null
+++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters
@@ -0,0 +1,1438 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{10409629-905B-4370-AAEE-B0458725C38C}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{605E3CFB-F312-46C4-ABF2-A8E26A66E152}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{7191E98D-DD02-4836-934B-E25571A72CDD}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{76D8992F-EDA3-4FAE-B303-05D9A03B2125}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Resource Files\Win32">
+      <UniqueIdentifier>{1c1296c4-dd4b-420f-8e31-fbf5993a5c28}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\x64">
+      <UniqueIdentifier>{c280c0f1-e313-436a-9966-234aff49a6ea}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\x64\Debug">
+      <UniqueIdentifier>{7ece7fb8-49d8-4051-8d17-2e2e38cea90c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\x64\Release">
+      <UniqueIdentifier>{3e379faf-c6c1-4ece-8cce-42f0121006e5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\Win32\Debug">
+      <UniqueIdentifier>{e411c020-22be-424c-9a70-605e8d4fa06c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\Win32\Release">
+      <UniqueIdentifier>{3dc1cea9-e62c-4da9-8654-3a358e27a2b4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{2a73cac1-73f5-4c26-86d9-ea2fb5174687}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{8f6918f6-4939-479d-8d59-aec203c3a608}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{2ec9c6f6-a705-42e0-b4e3-249cea21bab5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{b9f3875a-5a8b-44ac-937b-c8872d43e684}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{7fc12f50-71b7-471e-a537-c4b42dac1654}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{cccab72e-1120-4343-8390-810a0deeefdb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{dc4de605-8105-436b-bf9e-e67775ddfd3f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{a534641f-afba-4a5c-a89e-1170f0f7a5c6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{ad43740b-66eb-43ea-9b0b-2dd3a07cefab}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{2467dd5d-5a35-4a5b-ab85-0cdfaed7a3a5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{a523c5a1-c83b-4c8f-9c0f-61402d19a8da}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{efb1387e-a41e-4b1e-958c-88d9bb342a60}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\Ice.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="Win32\Debug\EventLoggerMsg.rc">
+      <Filter>Resource Files\Win32\Debug</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="Win32\Release\EventLoggerMsg.rc">
+      <Filter>Resource Files\Win32\Release</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="x64\Debug\EventLoggerMsg.rc">
+      <Filter>Resource Files\x64\Debug</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="x64\Release\EventLoggerMsg.rc">
+      <Filter>Resource Files\x64\Release</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\BuiltinSequences.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Communicator.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\CommunicatorF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Connection.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ConnectionF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Current.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Endpoint.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\EndpointF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\EndpointTypes.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\FacetMap.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Identity.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ImplicitContext.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ImplicitContextF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Instrumentation.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\InstrumentationF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LocalException.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Locator.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LocatorF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Logger.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LoggerF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Metrics.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectAdapter.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectAdapterF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectFactory.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Plugin.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PluginF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Process.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ProcessF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Properties.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PropertiesAdmin.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PropertiesF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\RemoteLogger.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Router.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\RouterF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ServantLocator.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ValueFactory.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Version.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <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="..\..\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="..\..\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="..\..\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="..\..\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="..\..\Outgoing.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="..\..\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="..\..\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="..\..\ThreadPool.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>
+    <ClCompile Include="Win32\Debug\BuiltinSequences.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Communicator.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\CommunicatorF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Connection.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ConnectionF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Current.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Endpoint.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointTypes.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FacetMap.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Identity.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ImplicitContext.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ImplicitContextF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Instrumentation.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\InstrumentationF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LocalException.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Locator.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LocatorF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Logger.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LoggerF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectAdapter.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectAdapterF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectFactory.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Plugin.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PluginF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Process.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ProcessF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Properties.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PropertiesAdmin.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PropertiesF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RemoteLogger.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Router.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RouterF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ServantLocator.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ServantLocatorF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ValueFactory.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Version.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\BuiltinSequences.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Communicator.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\CommunicatorF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Connection.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ConnectionF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Current.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Endpoint.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointTypes.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FacetMap.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Identity.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ImplicitContext.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ImplicitContextF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Instrumentation.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\InstrumentationF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LocalException.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Locator.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LocatorF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Logger.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LoggerF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectAdapter.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectAdapterF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectFactory.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Plugin.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PluginF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Process.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ProcessF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Properties.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PropertiesAdmin.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PropertiesF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RemoteLogger.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Router.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RouterF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ServantLocator.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ServantLocatorF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SliceChecksumDict.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ValueFactory.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Version.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\BuiltinSequences.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Communicator.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\CommunicatorF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Connection.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ConnectionF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Current.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Endpoint.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointTypes.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FacetMap.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Identity.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ImplicitContext.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ImplicitContextF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Instrumentation.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\InstrumentationF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LocalException.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Locator.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LocatorF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Logger.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LoggerF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectAdapter.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectAdapterF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectFactory.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Plugin.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PluginF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Process.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ProcessF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Properties.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PropertiesAdmin.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PropertiesF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RemoteLogger.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Router.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RouterF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ServantLocator.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ServantLocatorF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SliceChecksumDict.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ValueFactory.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Version.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\BuiltinSequences.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Communicator.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\CommunicatorF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Connection.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ConnectionF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Current.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Endpoint.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointTypes.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FacetMap.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Identity.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ImplicitContext.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ImplicitContextF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Instrumentation.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\InstrumentationF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LocalException.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Locator.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LocatorF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Logger.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LoggerF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectAdapter.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectAdapterF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectFactory.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Plugin.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PluginF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Process.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ProcessF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Properties.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PropertiesAdmin.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PropertiesF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RemoteLogger.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Router.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RouterF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ServantLocator.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ServantLocatorF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SliceChecksumDict.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ValueFactory.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Version.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\*.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\EventLoggerMsg.mc">
+      <Filter>Resource Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\BuiltinSequences.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Communicator.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\CommunicatorF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Connection.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ConnectionF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Current.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Endpoint.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\EndpointF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\EndpointTypes.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\FacetMap.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Identity.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ImplicitContext.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ImplicitContextF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Instrumentation.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\InstrumentationF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\LocalException.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Locator.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\LocatorF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Logger.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\LoggerF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Metrics.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ObjectAdapter.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ObjectAdapterF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ObjectFactory.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Plugin.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\PluginF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Process.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ProcessF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Properties.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\PropertiesAdmin.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\PropertiesF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\RemoteLogger.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Router.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\RouterF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ServantLocator.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ServantLocatorF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\SliceChecksumDict.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ValueFactory.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\Version.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\BuiltinSequences.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Communicator.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\CommunicatorF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Connection.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ConnectionF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Current.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Endpoint.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\EndpointF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\EndpointTypes.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\FacetMap.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Identity.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ImplicitContext.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ImplicitContextF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Instrumentation.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\InstrumentationF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\LocalException.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Locator.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\LocatorF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Logger.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\LoggerF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Metrics.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ObjectAdapter.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ObjectAdapterF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ObjectFactory.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Plugin.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\PluginF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Process.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ProcessF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Properties.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\PropertiesAdmin.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\PropertiesF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\RemoteLogger.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Router.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\RouterF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ServantLocator.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ServantLocatorF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\SliceChecksumDict.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ValueFactory.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\Version.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\BuiltinSequences.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Communicator.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\CommunicatorF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Connection.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ConnectionF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Current.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Endpoint.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\EndpointF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\EndpointTypes.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\FacetMap.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Identity.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ImplicitContext.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ImplicitContextF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Instrumentation.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\InstrumentationF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\LocalException.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Locator.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\LocatorF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Logger.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\LoggerF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Metrics.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ObjectAdapter.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ObjectAdapterF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ObjectFactory.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Plugin.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\PluginF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Process.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ProcessF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Properties.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\PropertiesAdmin.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\PropertiesF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\RemoteLogger.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Router.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\RouterF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ServantLocator.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ServantLocatorF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\SliceChecksumDict.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ValueFactory.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\Version.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\BuiltinSequences.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Communicator.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\CommunicatorF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Connection.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ConnectionF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Current.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Endpoint.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\EndpointF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\EndpointTypes.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\FacetMap.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Identity.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ImplicitContext.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ImplicitContextF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Instrumentation.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\InstrumentationF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\LocalException.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Locator.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\LocatorF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Logger.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\LoggerF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Metrics.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ObjectAdapter.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ObjectAdapterF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ObjectFactory.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Plugin.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\PluginF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Process.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ProcessF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Properties.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\PropertiesAdmin.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\PropertiesF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\RemoteLogger.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Router.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\RouterF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ServantLocator.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ServantLocatorF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\SliceChecksumDict.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ValueFactory.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\Version.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
diff --git a/cpp/src/Ice/msbuild/ice++11/packages.config b/cpp/src/Ice/msbuild/ice++11/packages.config
new file mode 100644
index 00000000000..0a7d8fee24d
--- /dev/null
+++ b/cpp/src/Ice/msbuild/ice++11/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="bzip2.v120" version="1.0.6.4" targetFramework="native" />
+  <package id="bzip2.v140" version="1.0.6.4" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj
new file mode 100644
index 00000000000..bec21218a56
--- /dev/null
+++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj
@@ -0,0 +1,1779 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{6485EC94-6B47-428D-B42D-AAA11F08DB59}</ProjectGuid>
+    <RootNamespace>Ice</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>Ice</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderDLLExport>ICE_API</IceBuilderDLLExport>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\Ice.rc" />
+    <ResourceCompile Include="Win32\Debug\EventLoggerMsg.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ResourceCompile>
+    <ResourceCompile Include="Win32\Release\EventLoggerMsg.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ResourceCompile>
+    <ResourceCompile Include="x64\Debug\EventLoggerMsg.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ResourceCompile>
+    <ResourceCompile Include="x64\Release\EventLoggerMsg.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\BuiltinSequences.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Communicator.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\CommunicatorF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Connection.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ConnectionF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Current.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Endpoint.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\EndpointF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\EndpointTypes.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\FacetMap.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Identity.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ImplicitContext.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ImplicitContextF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Instrumentation.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\InstrumentationF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LocalException.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Locator.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LocatorF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Logger.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LoggerF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Metrics.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectAdapter.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectAdapterF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectFactory.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Plugin.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PluginF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Process.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ProcessF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Properties.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PropertiesAdmin.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PropertiesF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\RemoteLogger.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Router.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\RouterF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ServantLocator.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ValueFactory.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Version.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\EventLoggerMsg.mc">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc &amp;&amp; move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc &amp;&amp; move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc &amp;&amp; move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc &amp;&amp; move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs>
+    </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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Communicator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\CommunicatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Connection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ConnectionF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Current.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Endpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FacetMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Identity.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ImplicitContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ImplicitContextF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\InstrumentationF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LocalException.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Locator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Logger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LoggerF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectAdapter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectAdapterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Plugin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PluginF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Process.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ProcessF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Properties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PropertiesAdmin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PropertiesF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RemoteLogger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ServantLocator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ServantLocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ValueFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Version.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\BuiltinSequences.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Communicator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\CommunicatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Connection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ConnectionF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Current.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Endpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FacetMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Identity.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ImplicitContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ImplicitContextF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\InstrumentationF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LocalException.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Locator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Logger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LoggerF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectAdapter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectAdapterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Plugin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PluginF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Process.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ProcessF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Properties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PropertiesAdmin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PropertiesF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RemoteLogger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ServantLocator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ServantLocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SliceChecksumDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ValueFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Version.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\BuiltinSequences.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Communicator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\CommunicatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Connection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ConnectionF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Current.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Endpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FacetMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Identity.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ImplicitContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ImplicitContextF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\InstrumentationF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LocalException.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Locator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Logger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LoggerF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectAdapter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectAdapterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Plugin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PluginF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Process.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ProcessF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Properties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PropertiesAdmin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PropertiesF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RemoteLogger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ServantLocator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ServantLocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SliceChecksumDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ValueFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Version.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\BuiltinSequences.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Communicator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\CommunicatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Connection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ConnectionF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Current.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Endpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FacetMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Identity.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ImplicitContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ImplicitContextF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\InstrumentationF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LocalException.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Locator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Logger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LoggerF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectAdapter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectAdapterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Plugin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PluginF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Process.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ProcessF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Properties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PropertiesAdmin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PropertiesF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RemoteLogger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ServantLocator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ServantLocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SliceChecksumDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ValueFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Version.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\BuiltinSequences.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Communicator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\CommunicatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Connection.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ConnectionF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Current.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Endpoint.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\EndpointF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\EndpointTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\FacetMap.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Identity.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ImplicitContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ImplicitContextF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\InstrumentationF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\LocalException.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Locator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\LocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Logger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\LoggerF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ObjectAdapter.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ObjectAdapterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ObjectFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Plugin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\PluginF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Process.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ProcessF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Properties.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\PropertiesAdmin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\PropertiesF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\RemoteLogger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ServantLocator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ServantLocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\SliceChecksumDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ValueFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Version.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\BuiltinSequences.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Communicator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\CommunicatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Connection.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ConnectionF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Current.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Endpoint.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\EndpointF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\EndpointTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\FacetMap.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Identity.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ImplicitContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ImplicitContextF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\InstrumentationF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\LocalException.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Locator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\LocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Logger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\LoggerF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ObjectAdapter.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ObjectAdapterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ObjectFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Plugin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\PluginF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Process.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ProcessF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Properties.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\PropertiesAdmin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\PropertiesF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\RemoteLogger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ServantLocator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ServantLocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\SliceChecksumDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ValueFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Version.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\BuiltinSequences.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Communicator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\CommunicatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Connection.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ConnectionF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Current.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Endpoint.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\EndpointF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\EndpointTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\FacetMap.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Identity.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ImplicitContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ImplicitContextF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\InstrumentationF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\LocalException.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Locator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\LocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Logger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\LoggerF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ObjectAdapter.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ObjectAdapterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ObjectFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Plugin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\PluginF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Process.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ProcessF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Properties.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\PropertiesAdmin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\PropertiesF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\RemoteLogger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ServantLocator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ServantLocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\SliceChecksumDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ValueFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Version.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\BuiltinSequences.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Communicator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\CommunicatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Connection.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ConnectionF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Current.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Endpoint.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\EndpointF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\EndpointTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\FacetMap.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Identity.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ImplicitContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ImplicitContextF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\InstrumentationF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\LocalException.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Locator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\LocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Logger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\LoggerF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ObjectAdapter.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ObjectAdapterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ObjectFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Plugin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\PluginF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Process.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ProcessF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Properties.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\PropertiesAdmin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\PropertiesF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\RemoteLogger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ServantLocator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ServantLocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\SliceChecksumDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ValueFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Version.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets'))" />
+  </Target>
+</Project>
diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters
new file mode 100644
index 00000000000..cb39feea931
--- /dev/null
+++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters
@@ -0,0 +1,1437 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{8B3A9001-4005-4944-A6DA-971BBAD133FC}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{E6261236-F264-49AD-97FE-C4A2103E10C4}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{6CF148F1-D3A5-45BD-A9B8-6E1E209A8E92}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{6dc90333-23f5-4ed6-b6d0-48df24ec0545}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\Win32">
+      <UniqueIdentifier>{14fb601d-0523-42d1-b4e1-bbf25c602d36}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\x64">
+      <UniqueIdentifier>{88d72eee-23e6-4033-915d-1e268d063f36}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\x64\Debug">
+      <UniqueIdentifier>{72477db4-8b14-4cdc-ba09-19a721bc131a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\x64\Release">
+      <UniqueIdentifier>{643e71da-f232-440b-8ec5-d4916249347d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\Win32\Debug">
+      <UniqueIdentifier>{f85aa59a-c843-4df8-b3e7-514badf1e59e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\Win32\Release">
+      <UniqueIdentifier>{99571211-c8c7-4917-a515-d7d1bee0ecae}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{25888d28-c6bd-4068-ae55-e39110dbad15}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{6926d289-853c-4bfe-956b-9d0a950097a0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{693371b0-6e63-4b9b-8df7-6ed3b01b1a81}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{c7408825-208d-4c1f-9b48-5b2bdcc68ba7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{f2e3b40a-e592-4dd0-b767-2dc53ec2e7a0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{7d6cb962-958b-4fb8-b327-4ba7b45d3343}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{f1d4165d-43bb-42b6-989b-6ae32e040283}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{4b1059af-9da4-45dc-b9c1-09cad4f7b4ef}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{e00f420e-cf07-4b10-9d34-02d15dc5a2c6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{8d2f9581-52d9-4df1-ad88-097b536ae295}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{28c3a03b-8420-4895-ac52-31e759608807}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{fd1e942c-59c4-4773-b1ed-19f0af1bb042}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\Ice.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="Win32\Debug\EventLoggerMsg.rc">
+      <Filter>Resource Files\Win32\Debug</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="x64\Debug\EventLoggerMsg.rc">
+      <Filter>Resource Files\x64\Debug</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="Win32\Release\EventLoggerMsg.rc">
+      <Filter>Resource Files\Win32\Release</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="x64\Release\EventLoggerMsg.rc">
+      <Filter>Resource Files\x64\Release</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\BuiltinSequences.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Communicator.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\CommunicatorF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Connection.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ConnectionF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Current.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Endpoint.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\EndpointF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\EndpointTypes.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\FacetMap.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Identity.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ImplicitContext.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ImplicitContextF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Instrumentation.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\InstrumentationF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LocalException.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Locator.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LocatorF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Logger.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LoggerF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Metrics.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectAdapter.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectAdapterF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectFactory.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Plugin.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PluginF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Process.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ProcessF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Properties.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PropertiesAdmin.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PropertiesF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\RemoteLogger.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Router.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\RouterF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ServantLocator.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ValueFactory.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Version.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <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="..\..\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="..\..\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="..\..\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="..\..\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="..\..\Outgoing.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="..\..\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="..\..\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="..\..\ThreadPool.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>
+    <ClCompile Include="Win32\Debug\BuiltinSequences.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Communicator.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\CommunicatorF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Connection.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ConnectionF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Current.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Endpoint.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointTypes.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FacetMap.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Identity.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ImplicitContext.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ImplicitContextF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Instrumentation.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\InstrumentationF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LocalException.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Locator.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LocatorF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Logger.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LoggerF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectAdapter.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectAdapterF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectFactory.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Plugin.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PluginF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Process.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ProcessF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Properties.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PropertiesAdmin.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PropertiesF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RemoteLogger.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Router.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RouterF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ServantLocator.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ServantLocatorF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ValueFactory.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Version.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\BuiltinSequences.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Communicator.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\CommunicatorF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Connection.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ConnectionF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Current.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Endpoint.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointTypes.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FacetMap.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Identity.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ImplicitContext.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ImplicitContextF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Instrumentation.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\InstrumentationF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LocalException.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Locator.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LocatorF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Logger.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LoggerF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectAdapter.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectAdapterF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectFactory.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Plugin.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PluginF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Process.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ProcessF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Properties.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PropertiesAdmin.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PropertiesF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RemoteLogger.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Router.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RouterF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ServantLocator.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ServantLocatorF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SliceChecksumDict.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ValueFactory.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Version.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\BuiltinSequences.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Communicator.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\CommunicatorF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Connection.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ConnectionF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Current.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Endpoint.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointTypes.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FacetMap.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Identity.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ImplicitContext.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ImplicitContextF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Instrumentation.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\InstrumentationF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LocalException.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Locator.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LocatorF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Logger.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LoggerF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectAdapter.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectAdapterF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectFactory.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Plugin.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PluginF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Process.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ProcessF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Properties.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PropertiesAdmin.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PropertiesF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RemoteLogger.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Router.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RouterF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ServantLocator.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ServantLocatorF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SliceChecksumDict.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ValueFactory.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Version.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\BuiltinSequences.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Communicator.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\CommunicatorF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Connection.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ConnectionF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Current.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Endpoint.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointTypes.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FacetMap.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Identity.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ImplicitContext.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ImplicitContextF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Instrumentation.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\InstrumentationF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LocalException.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Locator.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LocatorF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Logger.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LoggerF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectAdapter.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectAdapterF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectFactory.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Plugin.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PluginF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Process.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ProcessF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Properties.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PropertiesAdmin.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PropertiesF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RemoteLogger.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Router.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RouterF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ServantLocator.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ServantLocatorF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SliceChecksumDict.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ValueFactory.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Version.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\*.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\EventLoggerMsg.mc">
+      <Filter>Resource Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\BuiltinSequences.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Communicator.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\CommunicatorF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Connection.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ConnectionF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Current.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Endpoint.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\EndpointF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\EndpointTypes.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\FacetMap.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Identity.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ImplicitContext.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ImplicitContextF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Instrumentation.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\InstrumentationF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\LocalException.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Locator.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\LocatorF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Logger.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\LoggerF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Metrics.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ObjectAdapter.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ObjectAdapterF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ObjectFactory.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Plugin.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\PluginF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Process.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ProcessF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Properties.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\PropertiesAdmin.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\PropertiesF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\RemoteLogger.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Router.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\RouterF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ServantLocator.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ServantLocatorF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\SliceChecksumDict.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ValueFactory.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\Version.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\BuiltinSequences.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Communicator.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\CommunicatorF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Connection.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ConnectionF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Current.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Endpoint.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\EndpointF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\EndpointTypes.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\FacetMap.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Identity.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ImplicitContext.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ImplicitContextF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Instrumentation.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\InstrumentationF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\LocalException.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Locator.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\LocatorF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Logger.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\LoggerF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Metrics.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ObjectAdapter.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ObjectAdapterF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ObjectFactory.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Plugin.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\PluginF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Process.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ProcessF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Properties.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\PropertiesAdmin.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\PropertiesF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\RemoteLogger.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Router.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\RouterF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ServantLocator.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ServantLocatorF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\SliceChecksumDict.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ValueFactory.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\Version.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\BuiltinSequences.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Communicator.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\CommunicatorF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Connection.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ConnectionF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Current.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Endpoint.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\EndpointF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\EndpointTypes.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\FacetMap.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Identity.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ImplicitContext.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ImplicitContextF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Instrumentation.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\InstrumentationF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\LocalException.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Locator.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\LocatorF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Logger.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\LoggerF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Metrics.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ObjectAdapter.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ObjectAdapterF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ObjectFactory.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Plugin.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\PluginF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Process.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ProcessF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Properties.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\PropertiesAdmin.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\PropertiesF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\RemoteLogger.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Router.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\RouterF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ServantLocator.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ServantLocatorF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\SliceChecksumDict.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ValueFactory.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\Version.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\BuiltinSequences.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Communicator.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\CommunicatorF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Connection.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ConnectionF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Current.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Endpoint.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\EndpointF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\EndpointTypes.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\FacetMap.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Identity.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ImplicitContext.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ImplicitContextF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Instrumentation.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\InstrumentationF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\LocalException.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Locator.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\LocatorF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Logger.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\LoggerF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Metrics.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ObjectAdapter.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ObjectAdapterF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ObjectFactory.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Plugin.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\PluginF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Process.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ProcessF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Properties.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\PropertiesAdmin.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\PropertiesF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\RemoteLogger.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Router.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\RouterF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ServantLocator.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ServantLocatorF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\SliceChecksumDict.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ValueFactory.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\Version.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
diff --git a/cpp/src/Ice/msbuild/ice/packages.config b/cpp/src/Ice/msbuild/ice/packages.config
new file mode 100644
index 00000000000..0a7d8fee24d
--- /dev/null
+++ b/cpp/src/Ice/msbuild/ice/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="bzip2.v120" version="1.0.6.4" targetFramework="native" />
+  <package id="bzip2.v140" version="1.0.6.4" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj
new file mode 100644
index 00000000000..68b41ffea80
--- /dev/null
+++ b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj
@@ -0,0 +1,3570 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{31B3AC58-9642-4410-B16D-52A064AF3E55}</ProjectGuid>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WindowsAppContainer>true</WindowsAppContainer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\Ice\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>Ice</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\ArgVector.cpp" />
+    <ClCompile Include="..\..\Cond.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\ConvertUTF.cpp" />
+    <ClCompile Include="..\..\CountDownLatch.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="..\..\SHA1.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\Shared.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\StringConverter.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\StringUtil.cpp" />
+    <ClCompile Include="..\..\StreamSocket.cpp" />
+    <ClCompile Include="..\..\Thread.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\ThreadException.cpp" />
+    <ClCompile Include="..\..\..\IceUtil\Time.cpp" />
+    <ClCompile Include="..\..\Timer.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="..\..\AsyncResult.cpp" />
+    <ClCompile Include="..\..\Base64.cpp" />
+    <ClCompile Include="..\..\BatchRequestQueue.cpp" />
+    <ClCompile Include="..\..\Buffer.cpp" />
+    <ClCompile Include="..\..\CollocatedRequestHandler.cpp" />
+    <ClCompile Include="..\..\CommunicatorI.cpp" />
+    <ClCompile Include="..\..\ConnectionFactory.cpp" />
+    <ClCompile Include="..\..\ConnectionI.cpp" />
+    <ClCompile Include="..\..\ConnectionRequestHandler.cpp" />
+    <ClCompile Include="..\..\Connector.cpp" />
+    <ClCompile Include="..\..\ConnectRequestHandler.cpp" />
+    <ClCompile Include="..\..\DefaultsAndOverrides.cpp" />
+    <ClCompile Include="..\..\DispatchInterceptor.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="..\..\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="..\..\Outgoing.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="..\..\SliceChecksums.cpp" />
+    <ClCompile Include="..\..\SlicedData.cpp" />
+    <ClCompile Include="..\..\ThreadPool.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="..\..\TcpAcceptor.cpp" />
+    <ClCompile Include="..\..\TcpConnector.cpp" />
+    <ClCompile Include="..\..\TcpEndpointI.cpp" />
+    <ClCompile Include="..\..\TcpTransceiver.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" />
+    <ClCompile Include="ARM\Debug\BuiltinSequences.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Communicator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\CommunicatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Connection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ConnectionF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Current.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Endpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\EndpointF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\EndpointTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\FacetMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Identity.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ImplicitContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ImplicitContextF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\InstrumentationF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\LocalException.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Locator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\LocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Logger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\LoggerF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ObjectAdapter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ObjectAdapterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ObjectFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Plugin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\PluginF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Process.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ProcessF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Properties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\PropertiesAdmin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\PropertiesF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\RemoteLogger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ServantLocator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ServantLocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\SliceChecksumDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ValueFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Version.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\BuiltinSequences.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Communicator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\CommunicatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Connection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ConnectionF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Current.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Endpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\EndpointF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\EndpointTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\FacetMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Identity.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ImplicitContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ImplicitContextF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\InstrumentationF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\LocalException.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Locator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\LocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Logger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\LoggerF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ObjectAdapter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ObjectAdapterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ObjectFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Plugin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\PluginF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Process.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ProcessF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Properties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\PropertiesAdmin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\PropertiesF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\RemoteLogger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ServantLocator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ServantLocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\SliceChecksumDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ValueFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Version.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\BuiltinSequences.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Communicator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\CommunicatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Connection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ConnectionF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Current.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Endpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FacetMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Identity.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ImplicitContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ImplicitContextF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\InstrumentationF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LocalException.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Locator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Logger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LoggerF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectAdapter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectAdapterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Plugin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PluginF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Process.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ProcessF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Properties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PropertiesAdmin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PropertiesF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RemoteLogger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ServantLocator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ServantLocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ValueFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Version.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\BuiltinSequences.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Communicator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\CommunicatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Connection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ConnectionF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Current.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Endpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FacetMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Identity.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ImplicitContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ImplicitContextF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\InstrumentationF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LocalException.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Locator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Logger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LoggerF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectAdapter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectAdapterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Plugin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PluginF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Process.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ProcessF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Properties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PropertiesAdmin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PropertiesF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RemoteLogger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ServantLocator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ServantLocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SliceChecksumDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ValueFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Version.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\BuiltinSequences.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Communicator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\CommunicatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Connection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ConnectionF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Current.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Endpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FacetMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Identity.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ImplicitContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ImplicitContextF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\InstrumentationF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LocalException.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Locator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Logger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LoggerF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectAdapter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectAdapterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Plugin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PluginF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Process.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ProcessF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Properties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PropertiesAdmin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PropertiesF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RemoteLogger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ServantLocator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ServantLocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SliceChecksumDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ValueFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Version.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\BuiltinSequences.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Communicator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\CommunicatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Connection.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ConnectionF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Current.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Endpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FacetMap.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Identity.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ImplicitContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ImplicitContextF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\InstrumentationF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LocalException.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Locator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Logger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LoggerF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectAdapter.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectAdapterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Plugin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PluginF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Process.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ProcessF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Properties.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PropertiesAdmin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PropertiesF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RemoteLogger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Router.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RouterF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ServantLocator.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ServantLocatorF.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SliceChecksumDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ValueFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Version.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\BuiltinSequences.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Communicator.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\CommunicatorF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Connection.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ConnectionF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Current.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Endpoint.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\EndpointF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\EndpointTypes.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\FacetMap.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Identity.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ImplicitContext.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ImplicitContextF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Instrumentation.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\InstrumentationF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LocalException.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Locator.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LocatorF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Logger.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LoggerF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Metrics.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectAdapter.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectAdapterF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectFactory.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Plugin.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PluginF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Process.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ProcessF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Properties.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PropertiesAdmin.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PropertiesF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\RemoteLogger.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Router.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\RouterF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ServantLocator.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ValueFactory.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Version.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\BuiltinSequences.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Communicator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\CommunicatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Connection.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ConnectionF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Current.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Endpoint.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\EndpointF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\EndpointTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\FacetMap.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Identity.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ImplicitContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ImplicitContextF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\InstrumentationF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\LocalException.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Locator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\LocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Logger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\LoggerF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ObjectAdapter.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ObjectAdapterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ObjectFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Plugin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\PluginF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Process.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ProcessF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Properties.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\PropertiesAdmin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\PropertiesF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\RemoteLogger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ServantLocator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ServantLocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\SliceChecksumDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ValueFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Version.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\BuiltinSequences.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Communicator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\CommunicatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Connection.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ConnectionF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Current.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Endpoint.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\EndpointF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\EndpointTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\FacetMap.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Identity.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ImplicitContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ImplicitContextF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\InstrumentationF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\LocalException.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Locator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\LocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Logger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\LoggerF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ObjectAdapter.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ObjectAdapterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ObjectFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Plugin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\PluginF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Process.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ProcessF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Properties.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\PropertiesAdmin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\PropertiesF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\RemoteLogger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ServantLocator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ServantLocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\SliceChecksumDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ValueFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Version.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\BuiltinSequences.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Communicator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\CommunicatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Connection.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ConnectionF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Current.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Endpoint.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\EndpointF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\EndpointTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\FacetMap.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Identity.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ImplicitContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ImplicitContextF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\InstrumentationF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\LocalException.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Locator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\LocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Logger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\LoggerF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ObjectAdapter.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ObjectAdapterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ObjectFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Plugin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\PluginF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Process.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ProcessF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Properties.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\PropertiesAdmin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\PropertiesF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\RemoteLogger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ServantLocator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ServantLocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\SliceChecksumDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ValueFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Version.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\BuiltinSequences.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Communicator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\CommunicatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Connection.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ConnectionF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Current.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Endpoint.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\EndpointF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\EndpointTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\FacetMap.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Identity.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ImplicitContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ImplicitContextF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\InstrumentationF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\LocalException.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Locator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\LocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Logger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\LoggerF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ObjectAdapter.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ObjectAdapterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ObjectFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Plugin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\PluginF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Process.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ProcessF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Properties.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\PropertiesAdmin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\PropertiesF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\RemoteLogger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ServantLocator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ServantLocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\SliceChecksumDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ValueFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Version.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\BuiltinSequences.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Communicator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\CommunicatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Connection.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ConnectionF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Current.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Endpoint.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\EndpointF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\EndpointTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\FacetMap.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Identity.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ImplicitContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ImplicitContextF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\InstrumentationF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\LocalException.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Locator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\LocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Logger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\LoggerF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ObjectAdapter.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ObjectAdapterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ObjectFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Plugin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\PluginF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Process.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ProcessF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Properties.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\PropertiesAdmin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\PropertiesF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\RemoteLogger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ServantLocator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ServantLocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\SliceChecksumDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ValueFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Version.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\BuiltinSequences.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Communicator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\CommunicatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Connection.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ConnectionF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Current.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Endpoint.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\EndpointF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\EndpointTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\FacetMap.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Identity.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ImplicitContext.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ImplicitContextF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\InstrumentationF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\LocalException.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Locator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\LocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Logger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\LoggerF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ObjectAdapter.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ObjectAdapterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ObjectFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Plugin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\PluginF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Process.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ProcessF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Properties.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\PropertiesAdmin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\PropertiesF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\RemoteLogger.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Router.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\RouterF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ServantLocator.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ServantLocatorF.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\SliceChecksumDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ValueFactory.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Version.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters
new file mode 100644
index 00000000000..4a33c8ded78
--- /dev/null
+++ b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters
@@ -0,0 +1,1930 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{abdeb632-2a92-4845-833d-de0701de68f2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{3d3afe6f-9b58-4f4c-a018-be4438ff9cc0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{0e7c168c-f371-4301-b1bb-c214e02ef608}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{a3aebbae-51ba-4a0a-a380-5679e60affd8}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{d8e0ec5d-adb0-4467-ac07-186d1beb9465}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{4bfb53ce-a191-4ab5-88f7-139f55cd8ca7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{2391d4da-a5ce-4bfe-a8db-14e89430338e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{f0b45030-7376-4428-a024-2cc1b8e47cb5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM">
+      <UniqueIdentifier>{7f81bb33-6db3-4951-b466-927eb463148e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Debug">
+      <UniqueIdentifier>{a03742a3-dbcf-40c3-9d64-7109ebd685e9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM">
+      <UniqueIdentifier>{adff1d43-1bcd-42e8-b909-64705f0eaf25}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Debug">
+      <UniqueIdentifier>{ef3aa479-1075-48a7-8798-57931628d434}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{5544371e-c16e-40fb-9d92-456bf64fe26a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{893b7546-f0c4-4c5c-abd6-52c08cc3ed5c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{1c7f7a6e-db82-4a09-8314-d53df22b866b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{6ab18e8c-f12f-488f-8f48-2ac6c6a570fa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{78e7e144-2a1e-4da9-a602-b97db0e20d19}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{c652ac92-22af-47a2-b94b-095ea7e9edf7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Release">
+      <UniqueIdentifier>{d0cf545b-0651-469c-85c1-252b9a3ed5cc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Release">
+      <UniqueIdentifier>{c43b82c6-29b3-4aea-8bca-0c5c98e26b4f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{53bccbf7-efa3-45fc-bfb3-555ec22f6762}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{496fb990-1aee-4f23-873e-c92377cc6a3d}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Acceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ACM.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="..\..\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="..\..\DefaultsAndOverrides.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DispatchInterceptor.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="..\..\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="..\..\Outgoing.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="..\..\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="..\..\SliceChecksums.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SlicedData.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThreadPool.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="..\..\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>
+    <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="..\..\RegisterPluginsInit.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\BuiltinSequences.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Communicator.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\CommunicatorF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Connection.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ConnectionF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Current.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Endpoint.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointTypes.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FacetMap.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Identity.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ImplicitContext.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ImplicitContextF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Instrumentation.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\InstrumentationF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LocalException.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Locator.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LocatorF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Logger.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LoggerF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectAdapter.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectAdapterF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ObjectFactory.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Plugin.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PluginF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Process.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ProcessF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Properties.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PropertiesAdmin.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PropertiesF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RemoteLogger.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Router.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\RouterF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ServantLocator.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ServantLocatorF.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ValueFactory.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Version.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\BuiltinSequences.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Communicator.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\CommunicatorF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Connection.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ConnectionF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Current.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Endpoint.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\EndpointF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\EndpointTypes.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\FacetMap.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Identity.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ImplicitContext.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ImplicitContextF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Instrumentation.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\InstrumentationF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\LocalException.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Locator.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\LocatorF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Logger.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\LoggerF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Metrics.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ObjectAdapter.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ObjectAdapterF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ObjectFactory.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Plugin.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\PluginF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Process.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ProcessF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Properties.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\PropertiesAdmin.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\PropertiesF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\RemoteLogger.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Router.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\RouterF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ServantLocator.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ServantLocatorF.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\SliceChecksumDict.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ValueFactory.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Version.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\BuiltinSequences.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Communicator.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\CommunicatorF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Connection.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ConnectionF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Current.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Endpoint.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointTypes.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FacetMap.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Identity.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ImplicitContext.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ImplicitContextF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Instrumentation.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\InstrumentationF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LocalException.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Locator.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LocatorF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Logger.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LoggerF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectAdapter.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectAdapterF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ObjectFactory.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Plugin.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PluginF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Process.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ProcessF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Properties.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PropertiesAdmin.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PropertiesF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RemoteLogger.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Router.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\RouterF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ServantLocator.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ServantLocatorF.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SliceChecksumDict.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ValueFactory.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Version.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\BuiltinSequences.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Communicator.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\CommunicatorF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Connection.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ConnectionF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Current.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Endpoint.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointTypes.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FacetMap.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Identity.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ImplicitContext.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ImplicitContextF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Instrumentation.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\InstrumentationF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LocalException.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Locator.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LocatorF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Logger.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LoggerF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectAdapter.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectAdapterF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ObjectFactory.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Plugin.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PluginF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Process.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ProcessF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Properties.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PropertiesAdmin.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PropertiesF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RemoteLogger.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Router.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\RouterF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ServantLocator.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ServantLocatorF.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SliceChecksumDict.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ValueFactory.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Version.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\BuiltinSequences.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Communicator.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\CommunicatorF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Connection.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ConnectionF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Current.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Endpoint.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\EndpointF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\EndpointTypes.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\FacetMap.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Identity.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ImplicitContext.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ImplicitContextF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Instrumentation.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\InstrumentationF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\LocalException.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Locator.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\LocatorF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Logger.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\LoggerF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Metrics.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ObjectAdapter.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ObjectAdapterF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ObjectFactory.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Plugin.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\PluginF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Process.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ProcessF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Properties.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\PropertiesAdmin.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\PropertiesF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\RemoteLogger.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Router.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\RouterF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ServantLocator.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ServantLocatorF.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\SliceChecksumDict.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ValueFactory.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Version.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\BuiltinSequences.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Communicator.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\CommunicatorF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Connection.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ConnectionF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Current.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Endpoint.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointTypes.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FacetMap.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Identity.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ImplicitContext.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ImplicitContextF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Instrumentation.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\InstrumentationF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LocalException.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Locator.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LocatorF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Logger.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LoggerF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectAdapter.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectAdapterF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ObjectFactory.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Plugin.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PluginF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Process.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ProcessF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Properties.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PropertiesAdmin.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PropertiesF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RemoteLogger.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Router.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\RouterF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ServantLocator.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ServantLocatorF.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SliceChecksumDict.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ValueFactory.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Version.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\ConvertUTF.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\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="..\..\ArgVector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Cond.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\CountDownLatch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\MutexProtocol.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SHA1.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Thread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TcpEndpointI.cpp" />
+    <ClCompile Include="..\..\TcpAcceptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TcpConnector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TcpTransceiver.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\StreamSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\BuiltinSequences.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Communicator.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\CommunicatorF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Connection.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ConnectionF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Current.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Endpoint.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\EndpointF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\EndpointTypes.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\FacetMap.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Identity.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ImplicitContext.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ImplicitContextF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Instrumentation.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\InstrumentationF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LocalException.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Locator.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LocatorF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Logger.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\LoggerF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Metrics.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectAdapter.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectAdapterF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ObjectFactory.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Plugin.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PluginF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Process.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ProcessF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Properties.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PropertiesAdmin.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\PropertiesF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\RemoteLogger.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Router.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\RouterF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ServantLocator.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\ValueFactory.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\Ice\Version.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\BuiltinSequences.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Communicator.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\CommunicatorF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Connection.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ConnectionF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Current.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Endpoint.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\EndpointF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\EndpointTypes.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\FacetMap.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Identity.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ImplicitContext.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ImplicitContextF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Instrumentation.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\InstrumentationF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\LocalException.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Locator.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\LocatorF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Logger.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\LoggerF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Metrics.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ObjectAdapter.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ObjectAdapterF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ObjectFactory.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Plugin.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\PluginF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Process.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ProcessF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Properties.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\PropertiesAdmin.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\PropertiesF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\RemoteLogger.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Router.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\RouterF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ServantLocator.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ServantLocatorF.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\SliceChecksumDict.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ValueFactory.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\Version.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\BuiltinSequences.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Communicator.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\CommunicatorF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Connection.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ConnectionF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Current.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Endpoint.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\EndpointF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\EndpointTypes.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\FacetMap.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Identity.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ImplicitContext.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ImplicitContextF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Instrumentation.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\InstrumentationF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\LocalException.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Locator.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\LocatorF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Logger.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\LoggerF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Metrics.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ObjectAdapter.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ObjectAdapterF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ObjectFactory.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Plugin.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\PluginF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Process.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ProcessF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Properties.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\PropertiesAdmin.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\PropertiesF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\RemoteLogger.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Router.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\RouterF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ServantLocator.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ServantLocatorF.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\SliceChecksumDict.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ValueFactory.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\Version.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\BuiltinSequences.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Communicator.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\CommunicatorF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Connection.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ConnectionF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Current.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Endpoint.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\EndpointF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\EndpointTypes.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\FacetMap.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Identity.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ImplicitContext.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ImplicitContextF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Instrumentation.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\InstrumentationF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\LocalException.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Locator.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\LocatorF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Logger.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\LoggerF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Metrics.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ObjectAdapter.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ObjectAdapterF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ObjectFactory.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Plugin.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\PluginF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Process.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ProcessF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Properties.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\PropertiesAdmin.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\PropertiesF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\RemoteLogger.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Router.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\RouterF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ServantLocator.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ServantLocatorF.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\SliceChecksumDict.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ValueFactory.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\Version.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\BuiltinSequences.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Communicator.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\CommunicatorF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Connection.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ConnectionF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Current.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Endpoint.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\EndpointF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\EndpointTypes.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\FacetMap.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Identity.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ImplicitContext.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ImplicitContextF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Instrumentation.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\InstrumentationF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\LocalException.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Locator.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\LocatorF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Logger.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\LoggerF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Metrics.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ObjectAdapter.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ObjectAdapterF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ObjectFactory.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Plugin.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\PluginF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Process.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ProcessF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Properties.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\PropertiesAdmin.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\PropertiesF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\RemoteLogger.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Router.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\RouterF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ServantLocator.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ServantLocatorF.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\SliceChecksumDict.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ValueFactory.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\Version.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\BuiltinSequences.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Communicator.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\CommunicatorF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Connection.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ConnectionF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Current.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Endpoint.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\EndpointF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\EndpointTypes.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\FacetMap.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Identity.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ImplicitContext.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ImplicitContextF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Instrumentation.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\InstrumentationF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\LocalException.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Locator.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\LocatorF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Logger.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\LoggerF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Metrics.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ObjectAdapter.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ObjectAdapterF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ObjectFactory.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Plugin.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\PluginF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Process.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ProcessF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Properties.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\PropertiesAdmin.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\PropertiesF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\RemoteLogger.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Router.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\RouterF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ServantLocator.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ServantLocatorF.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\SliceChecksumDict.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ValueFactory.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\Version.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\BuiltinSequences.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Communicator.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\CommunicatorF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Connection.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ConnectionF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Current.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Endpoint.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\EndpointF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\EndpointTypes.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\FacetMap.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Identity.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ImplicitContext.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ImplicitContextF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Instrumentation.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\InstrumentationF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\LocalException.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Locator.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\LocatorF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Logger.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\LoggerF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Metrics.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ObjectAdapter.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ObjectAdapterF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ObjectFactory.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Plugin.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\PluginF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Process.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ProcessF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Properties.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\PropertiesAdmin.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\PropertiesF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\RemoteLogger.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Router.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\RouterF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ServantLocator.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ServantLocatorF.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\SliceChecksumDict.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ValueFactory.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\Version.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/Ice/winrt/.depend.mak b/cpp/src/Ice/winrt/.depend.mak
deleted file mode 100755
index 6ee2f1ea6b7..00000000000
--- a/cpp/src/Ice/winrt/.depend.mak
+++ /dev/null
@@ -1,11701 +0,0 @@
-
-..\BuiltinSequences.h: \
-    "$(slicedir)\Ice\BuiltinSequences.ice"
-
-..\CommunicatorF.h: \
-    "$(slicedir)\Ice\CommunicatorF.ice"
-
-..\Communicator.h: \
-    "$(slicedir)\Ice\Communicator.ice" \
-    "$(slicedir)/Ice/LoggerF.ice" \
-    "$(slicedir)/Ice/InstrumentationF.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ObjectFactoryF.ice" \
-    "$(slicedir)/Ice/RouterF.ice" \
-    "$(slicedir)/Ice/LocatorF.ice" \
-    "$(slicedir)/Ice/PluginF.ice" \
-    "$(slicedir)/Ice/ImplicitContextF.ice" \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/FacetMap.ice"
-
-..\ConnectionF.h: \
-    "$(slicedir)\Ice\ConnectionF.ice"
-
-..\Connection.h: \
-    "$(slicedir)\Ice\Connection.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Endpoint.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/EndpointF.ice"
-
-..\Current.h: \
-    "$(slicedir)\Ice\Current.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice"
-
-..\Endpoint.h: \
-    "$(slicedir)\Ice\Endpoint.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/EndpointF.ice"
-
-..\EndpointF.h: \
-    "$(slicedir)\Ice\EndpointF.ice"
-
-..\EndpointTypes.h: \
-    "$(slicedir)\Ice\EndpointTypes.ice"
-
-..\FacetMap.h: \
-    "$(slicedir)\Ice\FacetMap.ice"
-
-..\Identity.h: \
-    "$(slicedir)\Ice\Identity.ice"
-
-..\ImplicitContextF.h: \
-    "$(slicedir)\Ice\ImplicitContextF.ice"
-
-..\ImplicitContext.h: \
-    "$(slicedir)\Ice\ImplicitContext.ice" \
-    "$(slicedir)/Ice/LocalException.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice"
-
-..\LocalException.h: \
-    "$(slicedir)\Ice\LocalException.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-..\LocatorF.h: \
-    "$(slicedir)\Ice\LocatorF.ice"
-
-..\Locator.h: \
-    "$(slicedir)\Ice\Locator.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/ProcessF.ice"
-
-..\LoggerF.h: \
-    "$(slicedir)\Ice\LoggerF.ice"
-
-..\Logger.h: \
-    "$(slicedir)\Ice\Logger.ice"
-
-..\ObjectAdapterF.h: \
-    "$(slicedir)\Ice\ObjectAdapterF.ice"
-
-..\ObjectAdapter.h: \
-    "$(slicedir)\Ice\ObjectAdapter.ice" \
-    "$(slicedir)/Ice/CommunicatorF.ice" \
-    "$(slicedir)/Ice/ServantLocatorF.ice" \
-    "$(slicedir)/Ice/LocatorF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/FacetMap.ice" \
-    "$(slicedir)/Ice/Endpoint.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/EndpointF.ice"
-
-..\ObjectFactoryF.h: \
-    "$(slicedir)\Ice\ObjectFactoryF.ice"
-
-..\ObjectFactory.h: \
-    "$(slicedir)\Ice\ObjectFactory.ice"
-
-..\PluginF.h: \
-    "$(slicedir)\Ice\PluginF.ice"
-
-..\Plugin.h: \
-    "$(slicedir)\Ice\Plugin.ice" \
-    "$(slicedir)/Ice/LoggerF.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-..\ProcessF.h: \
-    "$(slicedir)\Ice\ProcessF.ice"
-
-..\Process.h: \
-    "$(slicedir)\Ice\Process.ice"
-
-..\PropertiesF.h: \
-    "$(slicedir)\Ice\PropertiesF.ice"
-
-..\Properties.h: \
-    "$(slicedir)\Ice\Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-..\PropertiesAdmin.h: \
-    "$(slicedir)\Ice\PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-..\RemoteLogger.h: \
-    "$(slicedir)\Ice\RemoteLogger.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-..\Router.h: \
-    "$(slicedir)\Ice\Router.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-..\RouterF.h: \
-    "$(slicedir)\Ice\RouterF.ice"
-
-..\ServantLocatorF.h: \
-    "$(slicedir)\Ice\ServantLocatorF.ice"
-
-..\ServantLocator.h: \
-    "$(slicedir)\Ice\ServantLocator.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice"
-
-..\SliceChecksumDict.h: \
-    "$(slicedir)\Ice\SliceChecksumDict.ice"
-
-..\Version.h: \
-    "$(slicedir)\Ice\Version.ice"
-
-..\Metrics.h: \
-    "$(slicedir)\Ice\Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-..\Instrumentation.h: \
-    "$(slicedir)\Ice\Instrumentation.ice" \
-    "$(slicedir)/Ice/EndpointF.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice"
-
-EndpointInfo.h: \
-    "$(slicedir)\IceSSL\EndpointInfo.ice" \
-    "$(slicedir)/Ice/Endpoint.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/EndpointF.ice"
-
-ConnectionInfo.h: \
-    "$(slicedir)\IceSSL\ConnectionInfo.ice" \
-    "$(slicedir)/Ice/Connection.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Endpoint.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/EndpointF.ice"
-
-..\IceDiscovery.h: \
-    "$(slicedir)\IceDiscovery\IceDiscovery.ice" \
-    "$(slicedir)/Ice/Identity.ice"
-
-..\IceLocatorDiscovery.h: \
-    "$(slicedir)\IceLocatorDiscovery\IceLocatorDiscovery.ice" \
-    "$(slicedir)/Ice/Locator.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/ProcessF.ice"
-
-$(ARCH)\$(CONFIG)\Acceptor.obj: \
-	..\Acceptor.cpp \
-    "..\..\..\src\Ice\Acceptor.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-
-$(ARCH)\$(CONFIG)\ACM.obj: \
-	..\ACM.cpp \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-
-$(ARCH)\$(CONFIG)\AsyncResult.obj: \
-	..\AsyncResult.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "..\..\..\src\Ice\ThreadPool.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-
-$(ARCH)\$(CONFIG)\Base64.obj: \
-	..\Base64.cpp \
-    "..\..\..\src\Ice\Base64.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-$(ARCH)\$(CONFIG)\Buffer.obj: \
-	..\Buffer.cpp \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-$(ARCH)\$(CONFIG)\BasicStream.obj: \
-	..\BasicStream.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\ProxyFactory.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "..\..\..\src\Ice\ObjectFactoryManager.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "..\..\..\src\Ice\TraceUtil.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-
-$(ARCH)\$(CONFIG)\BatchRequestQueue.obj: \
-	..\BatchRequestQueue.cpp \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-
-$(ARCH)\$(CONFIG)\BuiltinSequences.obj: \
-	..\BuiltinSequences.cpp \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\CommunicatorI.obj: \
-	..\CommunicatorI.cpp \
-    "..\..\..\src\Ice\CommunicatorI.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Process.h" \
-    "..\..\..\src\Ice\ConnectionFactory.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\ReferenceFactory.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "..\..\..\src\Ice\ProxyFactory.h" \
-    "..\..\..\src\Ice\ObjectFactoryManager.h" \
-    "..\..\..\src\Ice\ObjectAdapterFactory.h" \
-    "..\..\..\src\Ice\ObjectAdapterI.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-$(ARCH)\$(CONFIG)\Communicator.obj: \
-	..\Communicator.cpp \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-$(ARCH)\$(CONFIG)\CollocatedRequestHandler.obj: \
-	..\CollocatedRequestHandler.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "..\..\..\src\Ice\CollocatedRequestHandler.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\ObjectAdapterI.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\..\src\Ice\ThreadPool.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Process.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "..\..\..\src\Ice\TraceUtil.h" \
-
-$(ARCH)\$(CONFIG)\ConnectRequestHandler.obj: \
-	..\ConnectRequestHandler.cpp \
-    "..\..\..\src\Ice\ConnectRequestHandler.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "..\..\..\src\Ice\ConnectRequestHandlerF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\RouterInfo.h" \
-    "..\..\..\src\Ice\ConnectionRequestHandler.h" \
-    "..\..\..\src\Ice\RequestHandlerFactory.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "..\..\..\src\Ice\ThreadPool.h" \
-    "..\..\..\src\Ice\Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\ConnectionFactory.obj: \
-	..\ConnectionFactory.cpp \
-    "..\..\..\src\Ice\ConnectionFactory.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "..\..\..\src\Ice\Transceiver.h" \
-    "..\..\..\src\Ice\Connector.h" \
-    "..\..\..\src\Ice\Acceptor.h" \
-    "..\..\..\src\Ice\ThreadPool.h" \
-    "..\..\..\src\Ice\Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\..\src\Ice\ObjectAdapterI.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "..\..\..\src\Ice\RouterInfo.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Random.h" \
-
-$(ARCH)\$(CONFIG)\ConnectionI.obj: \
-	..\ConnectionI.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "..\..\..\src\Ice\TraceUtil.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "..\..\..\src\Ice\Transceiver.h" \
-    "..\..\..\src\Ice\ThreadPool.h" \
-    "..\..\..\src\Ice\Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\..\src\Ice\ObjectAdapterI.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "..\..\..\src\Ice\ReferenceFactory.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "..\..\..\src\Ice\ProxyFactory.h" \
-
-$(ARCH)\$(CONFIG)\Connection.obj: \
-	..\Connection.cpp \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-$(ARCH)\$(CONFIG)\Connector.obj: \
-	..\Connector.cpp \
-    "..\..\..\src\Ice\Connector.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-
-$(ARCH)\$(CONFIG)\ConnectionRequestHandler.obj: \
-	..\ConnectionRequestHandler.cpp \
-    "..\..\..\src\Ice\ConnectionRequestHandler.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "..\..\..\src\Ice\RouterInfo.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-
-$(ARCH)\$(CONFIG)\Current.obj: \
-	..\Current.cpp \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\DefaultsAndOverrides.obj: \
-	..\DefaultsAndOverrides.cpp \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LocalException.h" \
-
-$(ARCH)\$(CONFIG)\DeprecatedStringConverter.obj: \
-	..\DeprecatedStringConverter.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-
-$(ARCH)\$(CONFIG)\DispatchInterceptor.obj: \
-	..\DispatchInterceptor.cpp \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "..\..\..\src\Ice\IncomingRequest.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-$(ARCH)\$(CONFIG)\DynamicLibrary.obj: \
-	..\DynamicLibrary.cpp \
-    "$(includedir)\Ice\DynamicLibrary.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-
-$(ARCH)\$(CONFIG)\EndpointFactoryManager.obj: \
-	..\EndpointFactoryManager.cpp \
-    "..\..\..\src\Ice\EndpointFactoryManager.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "..\..\..\src\Ice\OpaqueEndpointI.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\EndpointFactory.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\EndpointFactory.obj: \
-	..\EndpointFactory.cpp \
-    "..\..\..\src\Ice\EndpointFactory.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManager.h" \
-
-$(ARCH)\$(CONFIG)\Endpoint.obj: \
-	..\Endpoint.cpp \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\EndpointI.obj: \
-	..\EndpointI.cpp \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-
-$(ARCH)\$(CONFIG)\EndpointTypes.obj: \
-	..\EndpointTypes.cpp \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\EventHandler.obj: \
-	..\EventHandler.cpp \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-
-$(ARCH)\$(CONFIG)\Exception.obj: \
-	..\Exception.cpp \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\FacetMap.obj: \
-	..\FacetMap.cpp \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\FactoryTable.obj: \
-	..\FactoryTable.cpp \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-
-$(ARCH)\$(CONFIG)\FactoryTableInit.obj: \
-	..\FactoryTableInit.cpp \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-
-$(ARCH)\$(CONFIG)\GCObject.obj: \
-	..\GCObject.cpp \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-
-$(ARCH)\$(CONFIG)\Identity.obj: \
-	..\Identity.cpp \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\ImplicitContextI.obj: \
-	..\ImplicitContextI.cpp \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-
-$(ARCH)\$(CONFIG)\ImplicitContext.obj: \
-	..\ImplicitContext.cpp \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\IncomingAsync.obj: \
-	..\IncomingAsync.cpp \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "..\..\..\src\Ice\ReplyStatus.h" \
-
-$(ARCH)\$(CONFIG)\Incoming.obj: \
-	..\Incoming.cpp \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "..\..\..\src\Ice\IncomingRequest.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "..\..\..\src\Ice\ServantManager.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\Ice\ReplyStatus.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\Initialize.obj: \
-	..\Initialize.cpp \
-    "..\..\..\src\IceUtil\ArgVector.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "..\..\..\src\Ice\CommunicatorI.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "..\..\..\src\Ice\PropertiesI.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "..\..\..\src\Ice\StreamI.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "..\..\..\src\Ice\LoggerI.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\IceUtil\FileUtil.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Process.h" \
-    "..\..\..\src\Ice\PluginManagerI.h" \
-
-$(ARCH)\$(CONFIG)\Instance.obj: \
-	..\Instance.cpp \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\RouterInfo.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "..\..\..\src\Ice\LocatorInfo.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "..\..\..\src\Ice\ReferenceFactory.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "..\..\..\src\Ice\ProxyFactory.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "..\..\..\src\Ice\ThreadPool.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\..\src\Ice\ConnectionFactory.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\ObjectFactoryManager.h" \
-    "..\..\..\src\Ice\ObjectAdapterFactory.h" \
-    "..\..\..\src\Ice\ObjectAdapterI.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "..\..\..\src\Ice\PropertiesI.h" \
-    "..\..\..\src\Ice\PropertiesAdminI.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "..\..\..\src\Ice\LoggerI.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\IceUtil\FileUtil.h" \
-    "..\..\..\src\Ice\NetworkProxy.h" \
-    "..\..\..\src\Ice\EndpointFactoryManager.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-    "..\..\..\src\Ice\IPEndpointI.h" \
-    "..\..\..\src\Ice\WSEndpoint.h" \
-    "..\..\..\src\Ice\EndpointFactory.h" \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\..\src\Ice\RequestHandlerFactory.h" \
-    "..\..\..\src\Ice\ConnectRequestHandlerF.h" \
-    "..\..\..\src\Ice\RetryQueue.h" \
-    "$(includedir)\Ice\DynamicLibrary.h" \
-    "..\..\..\src\Ice\PluginManagerI.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "..\..\..\src\Ice\InstrumentationI.h" \
-    "$(includedir)\Ice\MetricsObserverI.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\MetricsAdminI.h" \
-    "$(includedir)\Ice\MetricsFunctional.h" \
-    "..\..\..\src\Ice\LoggerAdminI.h" \
-    "..\..\..\src\Ice\RegisterPluginsInit.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-$(ARCH)\$(CONFIG)\IPEndpointI.obj: \
-	..\IPEndpointI.cpp \
-    "..\..\..\src\Ice\IPEndpointI.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\PropertiesI.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\Ice\HashUtil.h" \
-    "..\..\..\src\Ice\NetworkProxy.h" \
-
-$(ARCH)\$(CONFIG)\LocalException.obj: \
-	..\LocalException.cpp \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\LocalObject.obj: \
-	..\LocalObject.cpp \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-
-$(ARCH)\$(CONFIG)\LocatorInfo.obj: \
-	..\LocatorInfo.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "..\..\..\src\Ice\LocatorInfo.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-
-$(ARCH)\$(CONFIG)\Locator.obj: \
-	..\Locator.cpp \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-$(ARCH)\$(CONFIG)\LoggerAdminI.obj: \
-	..\LoggerAdminI.cpp \
-    "..\..\..\src\Ice\LoggerAdminI.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-
-$(ARCH)\$(CONFIG)\LoggerI.obj: \
-	..\LoggerI.cpp \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "..\..\..\src\Ice\LoggerI.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "..\..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-$(ARCH)\$(CONFIG)\Logger.obj: \
-	..\Logger.cpp \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-$(ARCH)\$(CONFIG)\LoggerUtil.obj: \
-	..\LoggerUtil.cpp \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-
-$(ARCH)\$(CONFIG)\Metrics.obj: \
-	..\Metrics.cpp \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-$(ARCH)\$(CONFIG)\MetricsAdminI.obj: \
-	..\MetricsAdminI.cpp \
-    "$(includedir)\Ice\MetricsAdminI.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "..\..\..\src\Ice\InstrumentationI.h" \
-    "$(includedir)\Ice\MetricsObserverI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\MetricsFunctional.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\MetricsObserverI.obj: \
-	..\MetricsObserverI.cpp \
-    "$(includedir)\Ice\MetricsObserverI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\MetricsAdminI.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\MetricsFunctional.h" \
-
-$(ARCH)\$(CONFIG)\Network.obj: \
-	..\Network.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\NetworkProxy.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-
-$(ARCH)\$(CONFIG)\NetworkProxy.obj: \
-	..\NetworkProxy.cpp \
-    "..\..\..\src\Ice\NetworkProxy.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\HttpParser.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-
-$(ARCH)\$(CONFIG)\ObjectAdapterFactory.obj: \
-	..\ObjectAdapterFactory.cpp \
-    "..\..\..\src\Ice\ObjectAdapterFactory.h" \
-    "..\..\..\src\Ice\ObjectAdapterI.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-$(ARCH)\$(CONFIG)\ObjectAdapterI.obj: \
-	..\ObjectAdapterI.cpp \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "..\..\..\src\Ice\ObjectAdapterI.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\ObjectAdapterFactory.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\ProxyFactory.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "..\..\..\src\Ice\ReferenceFactory.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManager.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-    "..\..\..\src\Ice\ConnectionFactory.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "..\..\..\src\Ice\ServantManager.h" \
-    "..\..\..\src\Ice\RouterInfo.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "..\..\..\src\Ice\LocatorInfo.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\Ice\ThreadPool.h" \
-    "..\..\..\src\Ice\Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-    "..\..\..\src\Ice\PropertyNames.h" \
-
-$(ARCH)\$(CONFIG)\ObjectAdapter.obj: \
-	..\ObjectAdapter.cpp \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-$(ARCH)\$(CONFIG)\ObjectFactoryManager.obj: \
-	..\ObjectFactoryManager.cpp \
-    "..\..\..\src\Ice\ObjectFactoryManager.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-$(ARCH)\$(CONFIG)\ObjectFactory.obj: \
-	..\ObjectFactory.cpp \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\Object.obj: \
-	..\Object.cpp \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "..\..\..\src\Ice\IncomingRequest.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-
-$(ARCH)\$(CONFIG)\Instrumentation.obj: \
-	..\Instrumentation.cpp \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\InstrumentationF.obj: \
-	..\InstrumentationF.cpp \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-$(ARCH)\$(CONFIG)\ObserverHelper.obj: \
-	..\ObserverHelper.cpp \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-
-$(ARCH)\$(CONFIG)\InstrumentationI.obj: \
-	..\InstrumentationI.cpp \
-    "..\..\..\src\Ice\InstrumentationI.h" \
-    "$(includedir)\Ice\MetricsObserverI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\MetricsAdminI.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\MetricsFunctional.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-$(ARCH)\$(CONFIG)\OpaqueEndpointI.obj: \
-	..\OpaqueEndpointI.cpp \
-    "..\..\..\src\Ice\OpaqueEndpointI.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\EndpointFactory.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\Base64.h" \
-    "..\..\..\src\Ice\HashUtil.h" \
-    "$(includedir)\Ice\LocalException.h" \
-
-$(ARCH)\$(CONFIG)\OutgoingAsync.obj: \
-	..\OutgoingAsync.cpp \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "..\..\..\src\Ice\CollocatedRequestHandler.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "..\..\..\src\Ice\ReplyStatus.h" \
-    "..\..\..\src\Ice\ThreadPool.h" \
-    "..\..\..\src\Ice\Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\..\src\Ice\RetryQueue.h" \
-
-$(ARCH)\$(CONFIG)\Outgoing.obj: \
-	..\Outgoing.cpp \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "..\..\..\src\Ice\CollocatedRequestHandler.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "..\..\..\src\Ice\ReplyStatus.h" \
-
-$(ARCH)\$(CONFIG)\PluginManagerI.obj: \
-	..\PluginManagerI.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "..\..\..\src\Ice\PluginManagerI.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\Ice\DynamicLibrary.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Process.h" \
-
-$(ARCH)\$(CONFIG)\Plugin.obj: \
-	..\Plugin.cpp \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\Process.obj: \
-	..\Process.cpp \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-$(ARCH)\$(CONFIG)\PropertiesI.obj: \
-	..\PropertiesI.cpp \
-    "..\..\..\src\Ice\PropertiesI.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "..\..\..\src\Ice\PropertyNames.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-
-$(ARCH)\$(CONFIG)\Properties.obj: \
-	..\Properties.cpp \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-$(ARCH)\$(CONFIG)\PropertiesAdmin.obj: \
-	..\PropertiesAdmin.cpp \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-$(ARCH)\$(CONFIG)\PropertiesAdminI.obj: \
-	..\PropertiesAdminI.cpp \
-    "..\..\..\src\Ice\PropertiesAdminI.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Plugin.h" \
-
-$(ARCH)\$(CONFIG)\PropertyNames.obj: \
-	..\PropertyNames.cpp \
-    "..\..\..\src\Ice\PropertyNames.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-$(ARCH)\$(CONFIG)\Protocol.obj: \
-	..\Protocol.cpp \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-$(ARCH)\$(CONFIG)\ProtocolInstance.obj: \
-	..\ProtocolInstance.cpp \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\IPEndpointI.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-
-$(ARCH)\$(CONFIG)\ProtocolPluginFacade.obj: \
-	..\ProtocolPluginFacade.cpp \
-    "..\..\..\src\Ice\ProtocolPluginFacade.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "..\..\..\src\Ice\ProtocolPluginFacadeF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManager.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-
-$(ARCH)\$(CONFIG)\ProxyFactory.obj: \
-	..\ProxyFactory.cpp \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "..\..\..\src\Ice\ProxyFactory.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "..\..\..\src\Ice\ReferenceFactory.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "..\..\..\src\Ice\LocatorInfo.h" \
-    "..\..\..\src\Ice\RouterInfo.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-
-$(ARCH)\$(CONFIG)\Proxy.obj: \
-	..\Proxy.cpp \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "..\..\..\src\Ice\ProxyFactory.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\ReferenceFactory.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "..\..\..\src\Ice\ObjectAdapterFactory.h" \
-    "..\..\..\src\Ice\ObjectAdapterI.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Process.h" \
-    "..\..\..\src\Ice\RouterInfo.h" \
-    "..\..\..\src\Ice\LocatorInfo.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Stream.h" \
-
-$(ARCH)\$(CONFIG)\ReferenceFactory.obj: \
-	..\ReferenceFactory.cpp \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "..\..\..\src\Ice\ReferenceFactory.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "..\..\..\src\Ice\ProxyFactory.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Process.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "..\..\..\src\Ice\EndpointFactoryManager.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-    "..\..\..\src\Ice\RouterInfo.h" \
-    "$(includedir)\Ice\Router.h" \
-    "..\..\..\src\Ice\LocatorInfo.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "..\..\..\src\Ice\PropertyNames.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\Reference.obj: \
-	..\Reference.cpp \
-    "..\..\..\src\Ice\Reference.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\ReferenceFactory.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\OpaqueEndpointI.h" \
-    "..\..\..\src\Ice\EndpointFactory.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\RouterInfo.h" \
-    "$(includedir)\Ice\Router.h" \
-    "..\..\..\src\Ice\LocatorInfo.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "..\..\..\src\Ice\ConnectionI.h" \
-    "..\..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "..\..\..\src\Ice\ConnectionFactory.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-    "..\..\..\src\Ice\HashUtil.h" \
-    "..\..\..\src\Ice\RequestHandlerFactory.h" \
-    "..\..\..\src\Ice\ConnectRequestHandlerF.h" \
-    "..\..\..\src\Ice\ConnectionRequestHandler.h" \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-
-$(ARCH)\$(CONFIG)\RemoteLogger.obj: \
-	..\RemoteLogger.cpp \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-$(ARCH)\$(CONFIG)\RetryQueue.obj: \
-	..\RetryQueue.cpp \
-    "..\..\..\src\Ice\RetryQueue.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-$(ARCH)\$(CONFIG)\RequestHandler.obj: \
-	..\RequestHandler.cpp \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-$(ARCH)\$(CONFIG)\RequestHandlerFactory.obj: \
-	..\RequestHandlerFactory.cpp \
-    "..\..\..\src\Ice\RequestHandlerFactory.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\ConnectRequestHandlerF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "..\..\..\src\Ice\CollocatedRequestHandler.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\..\src\Ice\RequestHandler.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\ConnectRequestHandler.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "..\..\..\src\Ice\RouterInfo.h" \
-    "..\..\..\src\Ice\ObjectAdapterFactory.h" \
-    "..\..\..\src\Ice\ObjectAdapterI.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Process.h" \
-
-$(ARCH)\$(CONFIG)\ResponseHandler.obj: \
-	..\ResponseHandler.cpp \
-    "..\..\..\src\Ice\ResponseHandler.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-
-$(ARCH)\$(CONFIG)\RouterInfo.obj: \
-	..\RouterInfo.cpp \
-    "..\..\..\src\Ice\RouterInfo.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "..\..\..\src\Ice\Reference.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\BatchRequestQueue.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\SharedContext.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-
-$(ARCH)\$(CONFIG)\Router.obj: \
-	..\Router.cpp \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-$(ARCH)\$(CONFIG)\Selector.obj: \
-	..\Selector.cpp \
-    "..\..\..\src\Ice\Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-$(ARCH)\$(CONFIG)\ServantLocator.obj: \
-	..\ServantLocator.cpp \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\ServantManager.obj: \
-	..\ServantManager.cpp \
-    "..\..\..\src\Ice\ServantManager.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\SliceChecksumDict.obj: \
-	..\SliceChecksumDict.cpp \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\SliceChecksums.obj: \
-	..\SliceChecksums.cpp \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-
-$(ARCH)\$(CONFIG)\SlicedData.obj: \
-	..\SlicedData.cpp \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\StreamI.obj: \
-	..\StreamI.cpp \
-    "..\..\..\src\Ice\StreamI.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-
-$(ARCH)\$(CONFIG)\Stream.obj: \
-	..\Stream.cpp \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\StringConverterPlugin.obj: \
-	..\StringConverterPlugin.cpp \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-$(ARCH)\$(CONFIG)\ThreadPool.obj: \
-	..\ThreadPool.cpp \
-    "..\..\..\src\Ice\ThreadPool.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "..\..\..\src\Ice\EventHandler.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\Selector.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\Ice\ObjectAdapterFactory.h" \
-    "..\..\..\src\Ice\ObjectAdapterI.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-
-$(ARCH)\$(CONFIG)\TraceLevels.obj: \
-	..\TraceLevels.cpp \
-    "..\..\..\src\Ice\TraceLevels.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-$(ARCH)\$(CONFIG)\TraceUtil.obj: \
-	..\TraceUtil.cpp \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\..\src\Ice\TraceUtil.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\TraceLevels.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\Ice\ReplyStatus.h" \
-
-$(ARCH)\$(CONFIG)\Transceiver.obj: \
-	..\Transceiver.cpp \
-    "..\..\..\src\Ice\Transceiver.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-
-$(ARCH)\$(CONFIG)\UdpConnector.obj: \
-	..\UdpConnector.cpp \
-    "..\..\..\src\Ice\UdpConnector.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\Connector.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\UdpTransceiver.h" \
-    "..\..\..\src\Ice\Transceiver.h" \
-    "..\..\..\src\Ice\UdpEndpointI.h" \
-    "..\..\..\src\Ice\IPEndpointI.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\EndpointFactory.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-
-$(ARCH)\$(CONFIG)\UdpEndpointI.obj: \
-	..\UdpEndpointI.cpp \
-    "..\..\..\src\Ice\UdpEndpointI.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "..\..\..\src\Ice\IPEndpointI.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\EndpointFactory.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\..\src\Ice\UdpConnector.h" \
-    "..\..\..\src\Ice\Connector.h" \
-    "..\..\..\src\Ice\UdpTransceiver.h" \
-    "..\..\..\src\Ice\Transceiver.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\HashUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-$(ARCH)\$(CONFIG)\UdpTransceiver.obj: \
-	..\UdpTransceiver.cpp \
-    "..\..\..\src\Ice\UdpTransceiver.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\Transceiver.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\UdpEndpointI.h" \
-    "..\..\..\src\Ice\IPEndpointI.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\EndpointFactory.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\Version.obj: \
-	..\Version.cpp \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\WSAcceptor.obj: \
-	..\WSAcceptor.cpp \
-    "..\..\..\src\Ice\WSAcceptor.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\Acceptor.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\WSTransceiver.h" \
-    "..\..\..\src\Ice\HttpParser.h" \
-    "..\..\..\src\Ice\Transceiver.h" \
-    "..\..\..\src\Ice\WSEndpoint.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\EndpointFactory.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-
-$(ARCH)\$(CONFIG)\WSConnector.obj: \
-	..\WSConnector.cpp \
-    "..\..\..\src\Ice\WSConnector.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\Connector.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\WSTransceiver.h" \
-    "..\..\..\src\Ice\HttpParser.h" \
-    "..\..\..\src\Ice\Transceiver.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\WSEndpoint.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\EndpointFactory.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-
-$(ARCH)\$(CONFIG)\WSEndpoint.obj: \
-	..\WSEndpoint.cpp \
-    "..\..\..\src\Ice\WSEndpoint.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\EndpointFactory.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\WSAcceptor.h" \
-    "..\..\..\src\Ice\Acceptor.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\WSConnector.h" \
-    "..\..\..\src\Ice\Connector.h" \
-    "..\..\..\src\Ice\IPEndpointI.h" \
-    "..\..\..\src\Ice\HashUtil.h" \
-    "..\..\..\src\Ice\EndpointFactoryManager.h" \
-
-$(ARCH)\$(CONFIG)\WSTransceiver.obj: \
-	..\WSTransceiver.cpp \
-    "..\..\..\src\Ice\WSTransceiver.h" \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\HttpParser.h" \
-    "..\..\..\src\Ice\Transceiver.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\..\src\Ice\Base64.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\SHA1.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\HttpParser.obj: \
-	..\HttpParser.cpp \
-    "$(includedir)\IceUtil\Config.h" \
-    "..\..\..\src\Ice\HttpParser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\IceDiscovery\LookupI.obj: \
-	..\..\IceDiscovery\LookupI.cpp \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\IceDiscovery\LookupI.h" \
-    "IceDiscovery\IceDiscovery.h" \
-    "..\..\..\src\IceDiscovery\LocatorI.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-
-$(ARCH)\$(CONFIG)\IceDiscovery\LocatorI.obj: \
-	..\..\IceDiscovery\LocatorI.cpp \
-    "..\..\..\src\IceDiscovery\LocatorI.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "..\..\..\src\IceDiscovery\LookupI.h" \
-    "IceDiscovery\IceDiscovery.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-
-$(ARCH)\$(CONFIG)\IceDiscovery\PluginI.obj: \
-	..\..\IceDiscovery\PluginI.cpp \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "..\..\..\src\IceDiscovery\PluginI.h" \
-    "..\..\..\src\IceDiscovery\LookupI.h" \
-    "IceDiscovery\IceDiscovery.h" \
-    "..\..\..\src\IceDiscovery\LocatorI.h" \
-
-$(ARCH)\$(CONFIG)\IceLocatorDiscovery\PluginI.obj: \
-	..\..\IceLocatorDiscovery\PluginI.cpp \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "..\..\..\src\IceLocatorDiscovery\PluginI.h" \
-    "IceLocatorDiscovery\IceLocatorDiscovery.h" \
-
-$(ARCH)\$(CONFIG)\RegisterPluginsInit.obj: \
-	RegisterPluginsInit.cpp \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\RegisterPluginsInit.h" \
-
-$(ARCH)\$(CONFIG)\StreamAcceptor.obj: \
-	StreamAcceptor.cpp \
-    "StreamAcceptor.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\Acceptor.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "StreamF.h" \
-    "StreamTransceiver.h" \
-    "..\..\..\src\Ice\Transceiver.h" \
-    "..\..\..\src\Ice\WSTransceiver.h" \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\HttpParser.h" \
-    "StreamEndpointI.h" \
-    "..\..\..\src\Ice\IPEndpointI.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\EndpointFactory.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-    "..\..\..\src\Ice\WSEndpoint.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\StreamConnector.obj: \
-	StreamConnector.cpp \
-    "StreamConnector.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\Connector.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "StreamTransceiver.h" \
-    "..\..\..\src\Ice\Transceiver.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\WSTransceiver.h" \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\HttpParser.h" \
-    "StreamEndpointI.h" \
-    "..\..\..\src\Ice\IPEndpointI.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\EndpointFactory.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-    "..\..\..\src\Ice\WSEndpoint.h" \
-    "StreamF.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-$(ARCH)\$(CONFIG)\StreamEndpointI.obj: \
-	StreamEndpointI.cpp \
-    "StreamEndpointI.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "..\..\..\src\Ice\IPEndpointI.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\EndpointI.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\AcceptorF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\EndpointFactory.h" \
-    "..\..\..\src\Ice\EndpointFactoryF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\..\src\Ice\WSEndpoint.h" \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "StreamF.h" \
-    "StreamAcceptor.h" \
-    "..\..\..\src\Ice\Acceptor.h" \
-    "StreamConnector.h" \
-    "..\..\..\src\Ice\Connector.h" \
-    "StreamTransceiver.h" \
-    "..\..\..\src\Ice\Transceiver.h" \
-    "..\..\..\src\Ice\WSTransceiver.h" \
-    "..\..\..\src\Ice\HttpParser.h" \
-    "..\..\..\src\Ice\DefaultsAndOverrides.h" \
-    "..\..\..\src\Ice\HashUtil.h" \
-    "$(includedir)\IceSSL\EndpointInfo.h" \
-
-$(ARCH)\$(CONFIG)\StreamTransceiver.obj: \
-	StreamTransceiver.cpp \
-    "StreamTransceiver.h" \
-    "..\..\..\src\Ice\ProtocolInstanceF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\..\src\Ice\Transceiver.h" \
-    "..\..\..\src\Ice\TransceiverF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "..\..\..\src\Ice\EndpointIF.h" \
-    "..\..\..\src\Ice\Network.h" \
-    "..\..\..\src\Ice\NetworkF.h" \
-    "..\..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\..\src\Ice\EventHandlerF.h" \
-    "..\..\..\src\Ice\WSTransceiver.h" \
-    "..\..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\..\src\Ice\ConnectorF.h" \
-    "..\..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\..\src\Ice\RouterInfoF.h" \
-    "..\..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\..\src\Ice\HttpParser.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\IceSSL\EndpointInfo.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-
-$(ARCH)\$(CONFIG)\EndpointInfo.obj: \
-	EndpointInfo.cpp \
-    "$(includedir)\IceSSL\EndpointInfo.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\ConnectionInfo.obj: \
-	ConnectionInfo.cpp \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-$(ARCH)\$(CONFIG)\IceDiscovery.obj: \
-	IceDiscovery.cpp \
-    "IceDiscovery\IceDiscovery.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-$(ARCH)\$(CONFIG)\IceLocatorDiscovery.obj: \
-	IceLocatorDiscovery.cpp \
-    "IceLocatorDiscovery\IceLocatorDiscovery.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-$(ARCH)\$(CONFIG)\CommunicatorF.obj: \
-	..\CommunicatorF.cpp \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-$(ARCH)\$(CONFIG)\ConnectionF.obj: \
-	..\ConnectionF.cpp \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-$(ARCH)\$(CONFIG)\EndpointF.obj: \
-	..\EndpointF.cpp \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-$(ARCH)\$(CONFIG)\ImplicitContextF.obj: \
-	..\ImplicitContextF.cpp \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-$(ARCH)\$(CONFIG)\LocatorF.obj: \
-	..\LocatorF.cpp \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\LoggerF.obj: \
-	..\LoggerF.cpp \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-$(ARCH)\$(CONFIG)\ObjectAdapterF.obj: \
-	..\ObjectAdapterF.cpp \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-$(ARCH)\$(CONFIG)\ObjectFactoryF.obj: \
-	..\ObjectFactoryF.cpp \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-$(ARCH)\$(CONFIG)\PluginF.obj: \
-	..\PluginF.cpp \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
-$(ARCH)\$(CONFIG)\ProcessF.obj: \
-	..\ProcessF.cpp \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\PropertiesF.obj: \
-	..\PropertiesF.cpp \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\RouterF.obj: \
-	..\RouterF.cpp \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-$(ARCH)\$(CONFIG)\ServantLocatorF.obj: \
-	..\ServantLocatorF.cpp \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
diff --git a/cpp/src/Ice/winrt/.gitignore b/cpp/src/Ice/winrt/.gitignore
deleted file mode 100644
index 54bc089cf2e..00000000000
--- a/cpp/src/Ice/winrt/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-ConnectionInfo.cpp
-EndpointInfo.cpp
-IceDiscovery.cpp
-IceLocatorDiscovery.cpp
-IceDiscovery
-IceLocatorDiscovery
diff --git a/cpp/src/Ice/winrt/Makefile.mak b/cpp/src/Ice/winrt/Makefile.mak
deleted file mode 100644
index a0939c47c64..00000000000
--- a/cpp/src/Ice/winrt/Makefile.mak
+++ /dev/null
@@ -1,395 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-LIBNAME		= $(SDK_LIBRARY_PATH)\ice.lib
-TARGETS		= $(LIBNAME)
-SOURCE_DIR	= ..
-
-OBJS		= $(ARCH)\$(CONFIG)\Acceptor.obj \
-		  $(ARCH)\$(CONFIG)\ACM.obj \
-		  $(ARCH)\$(CONFIG)\AsyncResult.obj \
-		  $(ARCH)\$(CONFIG)\Base64.obj \
-		  $(ARCH)\$(CONFIG)\Buffer.obj \
-		  $(ARCH)\$(CONFIG)\BasicStream.obj \
-		  $(ARCH)\$(CONFIG)\BatchRequestQueue.obj \
-		  $(ARCH)\$(CONFIG)\BuiltinSequences.obj \
-		  $(ARCH)\$(CONFIG)\CommunicatorI.obj \
-		  $(ARCH)\$(CONFIG)\Communicator.obj \
-		  $(ARCH)\$(CONFIG)\CollocatedRequestHandler.obj \
-		  $(ARCH)\$(CONFIG)\ConnectRequestHandler.obj \
-		  $(ARCH)\$(CONFIG)\ConnectionFactory.obj \
-		  $(ARCH)\$(CONFIG)\ConnectionI.obj \
-		  $(ARCH)\$(CONFIG)\Connection.obj \
-		  $(ARCH)\$(CONFIG)\Connector.obj \
-		  $(ARCH)\$(CONFIG)\ConnectionRequestHandler.obj \
-		  $(ARCH)\$(CONFIG)\Current.obj \
-		  $(ARCH)\$(CONFIG)\DefaultsAndOverrides.obj \
-		  $(ARCH)\$(CONFIG)\DeprecatedStringConverter.obj \
-		  $(ARCH)\$(CONFIG)\DispatchInterceptor.obj \
-		  $(ARCH)\$(CONFIG)\DynamicLibrary.obj \
-		  $(ARCH)\$(CONFIG)\EndpointFactoryManager.obj \
-		  $(ARCH)\$(CONFIG)\EndpointFactory.obj \
-		  $(ARCH)\$(CONFIG)\Endpoint.obj \
-		  $(ARCH)\$(CONFIG)\EndpointI.obj \
-		  $(ARCH)\$(CONFIG)\EndpointTypes.obj \
-		  $(ARCH)\$(CONFIG)\EventHandler.obj \
-		  $(ARCH)\$(CONFIG)\Exception.obj \
-		  $(ARCH)\$(CONFIG)\FacetMap.obj \
-		  $(ARCH)\$(CONFIG)\FactoryTable.obj \
-		  $(ARCH)\$(CONFIG)\FactoryTableInit.obj \
-		  $(ARCH)\$(CONFIG)\GCObject.obj \
-		  $(ARCH)\$(CONFIG)\Identity.obj \
-		  $(ARCH)\$(CONFIG)\ImplicitContextI.obj \
-		  $(ARCH)\$(CONFIG)\ImplicitContext.obj \
-		  $(ARCH)\$(CONFIG)\IncomingAsync.obj \
-		  $(ARCH)\$(CONFIG)\Incoming.obj \
-		  $(ARCH)\$(CONFIG)\Initialize.obj \
-		  $(ARCH)\$(CONFIG)\Instance.obj \
-		  $(ARCH)\$(CONFIG)\IPEndpointI.obj \
-		  $(ARCH)\$(CONFIG)\LocalException.obj \
-		  $(ARCH)\$(CONFIG)\LocalObject.obj \
-		  $(ARCH)\$(CONFIG)\LocatorInfo.obj \
-		  $(ARCH)\$(CONFIG)\Locator.obj \
-		  $(ARCH)\$(CONFIG)\LoggerAdminI.obj \
-		  $(ARCH)\$(CONFIG)\LoggerI.obj \
-		  $(ARCH)\$(CONFIG)\Logger.obj \
-		  $(ARCH)\$(CONFIG)\LoggerUtil.obj \
-		  $(ARCH)\$(CONFIG)\Metrics.obj \
-		  $(ARCH)\$(CONFIG)\MetricsAdminI.obj \
-		  $(ARCH)\$(CONFIG)\MetricsObserverI.obj \
-		  $(ARCH)\$(CONFIG)\Network.obj \
-		  $(ARCH)\$(CONFIG)\NetworkProxy.obj \
-		  $(ARCH)\$(CONFIG)\ObjectAdapterFactory.obj \
-		  $(ARCH)\$(CONFIG)\ObjectAdapterI.obj \
-		  $(ARCH)\$(CONFIG)\ObjectAdapter.obj \
-		  $(ARCH)\$(CONFIG)\ObjectFactoryManager.obj \
-		  $(ARCH)\$(CONFIG)\ObjectFactory.obj \
-		  $(ARCH)\$(CONFIG)\Object.obj \
-		  $(ARCH)\$(CONFIG)\Instrumentation.obj \
-		  $(ARCH)\$(CONFIG)\InstrumentationF.obj \
-		  $(ARCH)\$(CONFIG)\ObserverHelper.obj \
-		  $(ARCH)\$(CONFIG)\InstrumentationI.obj \
-		  $(ARCH)\$(CONFIG)\OpaqueEndpointI.obj \
-		  $(ARCH)\$(CONFIG)\OutgoingAsync.obj \
-		  $(ARCH)\$(CONFIG)\Outgoing.obj \
-		  $(ARCH)\$(CONFIG)\PluginManagerI.obj \
-		  $(ARCH)\$(CONFIG)\Plugin.obj \
-		  $(ARCH)\$(CONFIG)\Process.obj \
-		  $(ARCH)\$(CONFIG)\PropertiesI.obj \
-		  $(ARCH)\$(CONFIG)\Properties.obj \
-		  $(ARCH)\$(CONFIG)\PropertiesAdmin.obj \
-		  $(ARCH)\$(CONFIG)\PropertiesAdminI.obj \
-		  $(ARCH)\$(CONFIG)\PropertyNames.obj \
-		  $(ARCH)\$(CONFIG)\Protocol.obj \
-		  $(ARCH)\$(CONFIG)\ProtocolInstance.obj \
-		  $(ARCH)\$(CONFIG)\ProtocolPluginFacade.obj \
-		  $(ARCH)\$(CONFIG)\ProxyFactory.obj \
-		  $(ARCH)\$(CONFIG)\Proxy.obj \
-		  $(ARCH)\$(CONFIG)\ReferenceFactory.obj \
-		  $(ARCH)\$(CONFIG)\Reference.obj \
-		  $(ARCH)\$(CONFIG)\RemoteLogger.obj \
-		  $(ARCH)\$(CONFIG)\RetryQueue.obj \
-		  $(ARCH)\$(CONFIG)\RequestHandler.obj \
-		  $(ARCH)\$(CONFIG)\RequestHandlerFactory.obj \
-		  $(ARCH)\$(CONFIG)\ResponseHandler.obj \
-		  $(ARCH)\$(CONFIG)\RouterInfo.obj \
-		  $(ARCH)\$(CONFIG)\Router.obj \
-		  $(ARCH)\$(CONFIG)\Selector.obj \
-		  $(ARCH)\$(CONFIG)\ServantLocator.obj \
-		  $(ARCH)\$(CONFIG)\ServantManager.obj \
-		  $(ARCH)\$(CONFIG)\SliceChecksumDict.obj \
-		  $(ARCH)\$(CONFIG)\SliceChecksums.obj \
-		  $(ARCH)\$(CONFIG)\SlicedData.obj \
-		  $(ARCH)\$(CONFIG)\StreamI.obj \
-		  $(ARCH)\$(CONFIG)\Stream.obj \
-		  $(ARCH)\$(CONFIG)\StringConverterPlugin.obj \
-		  $(ARCH)\$(CONFIG)\ThreadPool.obj \
-		  $(ARCH)\$(CONFIG)\TraceLevels.obj \
-		  $(ARCH)\$(CONFIG)\TraceUtil.obj \
-		  $(ARCH)\$(CONFIG)\Transceiver.obj \
-		  $(ARCH)\$(CONFIG)\UdpConnector.obj \
-		  $(ARCH)\$(CONFIG)\UdpEndpointI.obj \
-		  $(ARCH)\$(CONFIG)\UdpTransceiver.obj \
-		  $(ARCH)\$(CONFIG)\Version.obj \
-		  $(ARCH)\$(CONFIG)\WSAcceptor.obj \
-		  $(ARCH)\$(CONFIG)\WSConnector.obj \
-		  $(ARCH)\$(CONFIG)\WSEndpoint.obj \
-		  $(ARCH)\$(CONFIG)\WSTransceiver.obj \
-		  $(ARCH)\$(CONFIG)\HttpParser.obj \
-		  $(ARCH)\$(CONFIG)\IceDiscovery\LookupI.obj \
-		  $(ARCH)\$(CONFIG)\IceDiscovery\LocatorI.obj \
-		  $(ARCH)\$(CONFIG)\IceDiscovery\PluginI.obj \
-		  $(ARCH)\$(CONFIG)\IceLocatorDiscovery\PluginI.obj
-
-LOCAL_OBJS	= $(ARCH)\$(CONFIG)\RegisterPluginsInit.obj \
-		  $(ARCH)\$(CONFIG)\StreamAcceptor.obj \
-		  $(ARCH)\$(CONFIG)\StreamConnector.obj \
-		  $(ARCH)\$(CONFIG)\StreamEndpointI.obj \
-		  $(ARCH)\$(CONFIG)\StreamTransceiver.obj \
-		  $(ARCH)\$(CONFIG)\EndpointInfo.obj \
-		  $(ARCH)\$(CONFIG)\ConnectionInfo.obj \
-		  $(ARCH)\$(CONFIG)\IceDiscovery.obj \
-		  $(ARCH)\$(CONFIG)\IceLocatorDiscovery.obj
-
-SLICE_SRCS	= Ice\BuiltinSequences.ice \
-		  Ice\CommunicatorF.ice \
-		  Ice\Communicator.ice \
-		  Ice\ConnectionF.ice \
-		  Ice\Connection.ice \
-		  Ice\Current.ice \
-		  Ice\Endpoint.ice \
-		  Ice\EndpointF.ice \
-		  Ice\EndpointTypes.ice \
-		  Ice\FacetMap.ice \
-		  Ice\Identity.ice \
-		  Ice\ImplicitContextF.ice \
-		  Ice\ImplicitContext.ice \
-		  Ice\LocalException.ice \
-		  Ice\LocatorF.ice \
-		  Ice\Locator.ice \
-		  Ice\LoggerF.ice \
-		  Ice\Logger.ice \
-		  Ice\ObjectAdapterF.ice \
-		  Ice\ObjectAdapter.ice \
-		  Ice\ObjectFactoryF.ice \
-		  Ice\ObjectFactory.ice \
-		  Ice\PluginF.ice \
-		  Ice\Plugin.ice \
-		  Ice\ProcessF.ice \
-		  Ice\Process.ice \
-		  Ice\PropertiesF.ice \
-		  Ice\Properties.ice \
-		  Ice\PropertiesAdmin.ice \
-		  Ice\RemoteLogger.ice \
-		  Ice\Router.ice \
-		  Ice\RouterF.ice \
-		  Ice\ServantLocatorF.ice \
-		  Ice\ServantLocator.ice \
-		  Ice\SliceChecksumDict.ice \
-		  Ice\Version.ice \
-		  Ice\Metrics.ice \
-		  Ice\Instrumentation.ice \
-		  IceSSL\EndpointInfo.ice \
-		  IceSSL\ConnectionInfo.ice \
-		  IceDiscovery\IceDiscovery.ice \
-		  IceLocatorDiscovery\IceLocatorDiscovery.ice
-
-SRCS		= $(OBJS:.obj=.cpp)
-SRCS		= $(SRCS:x86\=)
-SRCS		= $(SRCS:x64\=)
-SRCS		= $(SRCS:arm\=)
-SRCS		= $(SRCS:Retail\=..\)
-SRCS		= $(SRCS:Debug\=..\)
-SRCS		= $(SRCS:..\IceDiscovery\=..\..\IceDiscovery\)
-SRCS		= $(SRCS:..\IceLocatorDiscovery\=..\..\IceLocatorDiscovery\)
-
-LOCAL_SRCS	= $(LOCAL_OBJS:.obj=.cpp)
-LOCAL_SRCS	= $(LOCAL_SRCS:x86\=)
-LOCAL_SRCS	= $(LOCAL_SRCS:x64\=)
-LOCAL_SRCS	= $(LOCAL_SRCS:arm\=)
-LOCAL_SRCS	= $(LOCAL_SRCS:Retail\=.\)
-LOCAL_SRCS	= $(LOCAL_SRCS:Debug\=.\)
-
-SRCS		= $(SRCS) \
-		  $(LOCAL_SRCS) \
-		  ..\CommunicatorF.cpp \
-		  ..\ConnectionF.cpp \
-		  ..\EndpointF.cpp \
-		  ..\ImplicitContextF.cpp \
-		  ..\LocatorF.cpp \
-		  ..\LoggerF.cpp \
-		  ..\ObjectAdapterF.cpp \
-		  ..\ObjectFactoryF.cpp \
-		  ..\PluginF.cpp \
-		  ..\ProcessF.cpp \
-		  ..\PropertiesF.cpp \
-		  ..\RouterF.cpp \
-		  ..\ServantLocatorF.cpp
-
-HDIR		= $(headerdir)\Ice
-SDIR		= $(slicedir)\Ice
-
-PDBNAME			= $(LIBNAME:.lib=.pdb)
-CPPFLAGS		= /Fd$(PDBNAME) -I. -I..\.. -DICE_BUILDING_ICE -DICE_BUILDING_ICESSL -DWIN32_LEAN_AND_MEAN $(CPPFLAGS)
-SLICE2CPPFLAGS		= --ice $(SLICE2CPPFLAGS)
-CORE_SLICE2CPPFLAGS	= --include-dir Ice $(SLICE2CPPFLAGS)
-SSL_SLICE2CPPFLAGS 	= --include-dir IceSSL $(SLICE2CPPFLAGS)
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-$(LIBNAME): $(LOCAL_OBJS) $(OBJS) sdks
-	$(AR) $(ARFLAGS) $(OBJS) $(LOCAL_OBJS) /out:$(LIBNAME)
-
-.cpp.d:
-	@if not exist "$(ARCH)\$(CONFIG)" $(MKDIR) $(ARCH)\$(CONFIG)
-	@echo Generating dependencies for $<
-	@$(CXX) /E /Fo$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) /showIncludes $< 1>$(*F).i 2>$(*F).d && \
-	cscript /NoLogo $(top_srcdir)\..\config\makedepend.vbs $(*F).cpp $(top_srcdir)
-	@del /q $(*F).d $(*F).i
-
-.cpp{$(ARCH)\$(CONFIG)\}.obj::
-	@if not exist "$(ARCH)\$(CONFIG)" $(MKDIR) $(ARCH)\$(CONFIG)
-	$(CXX) /c /Fo$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) $<
-
-.cpp{$(ARCH)\$(CONFIG)\IceDiscovery\}.obj::
-	@if not exist "$(ARCH)\$(CONFIG)\IceDiscovery" $(MKDIR) $(ARCH)\$(CONFIG)\IceDiscovery
-	$(CXX) /c /Fo$(ARCH)\$(CONFIG)\IceDiscovery\ $(CPPFLAGS) $(CXXFLAGS) $<
-
-.cpp{$(ARCH)\$(CONFIG)\IceLocatorDiscovery\}.obj::
-	@if not exist "$(ARCH)\$(CONFIG)\IceLocatorDiscovery" $(MKDIR) $(ARCH)\$(CONFIG)\IceLocatorDiscovery
-	$(CXX) /c /Fo$(ARCH)\$(CONFIG)\IceLocatorDiscovery\ $(CPPFLAGS) $(CXXFLAGS) $<
-
-{..\..\IceDiscovery\}.cpp{$(ARCH)\$(CONFIG)\IceDiscovery\}.obj::
-	@if not exist "$(ARCH)\$(CONFIG)\IceDiscovery" $(MKDIR) $(ARCH)\$(CONFIG)\IceDiscovery
-	$(CXX) /c /Fo$(ARCH)\$(CONFIG)\IceDiscovery\ $(CPPFLAGS) $(CXXFLAGS) $<
-
-{..\..\IceLocatorDiscovery\}.cpp{$(ARCH)\$(CONFIG)\IceLocatorDiscovery\}.obj::
-	@if not exist "$(ARCH)\$(CONFIG)\IceLocatorDiscovery" $(MKDIR) $(ARCH)\$(CONFIG)\IceLocatorDiscovery
-	$(CXX) /c /Fo$(ARCH)\$(CONFIG)\IceLocatorDiscovery\ $(CPPFLAGS) $(CXXFLAGS) $<
-
-.cpp{$(DEPEND_DIR)\IceDiscovery\}.d:
-	@echo Generating dependencies for $<
-	@$(CXX) /E $(CPPFLAGS) $(CXXFLAGS) /showIncludes $< 1>$(*F).i 2>IceDiscovery\$(*F).d && \
-	cscript /NoLogo $(top_srcdir)\..\config\makedepend.vbs $(*F).cpp $(top_srcdir)
-	@del /q $(*F).d $(*F).i
-
-.cpp{$(DEPEND_DIR)\IceLocatorDiscovery\}.d:
-	@echo Generating dependencies for $<
-	@$(CXX) /E $(CPPFLAGS) $(CXXFLAGS) /showIncludes $< 1>$(*F).i 2>IceLocatorDiscovery\$(*F).d && \
-	cscript /NoLogo $(top_srcdir)\..\config\makedepend.vbs $(*F).cpp $(top_srcdir)
-	@del /q $(*F).d $(*F).i
-
-{..\..\IceDiscovery\}.cpp{$(DEPEND_DIR)\IceDiscovery\}.d:
-	@if not exist "$(ARCH)\$(CONFIG)" $(MKDIR) $(ARCH)\$(CONFIG)
-	@echo Generating dependencies for $<
-	@$(CXX) /E /Fo$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) /showIncludes $< 1>$(*F).i 2>IceDiscovery\$(*F).d && \
-	cscript /NoLogo $(top_srcdir)\..\config\makedepend.vbs $< $(top_srcdir)
-	@del /q $(*F).d $(*F).i
-
-{..\..\IceLocatorDiscovery\}.cpp{$(DEPEND_DIR)\IceLocatorDiscovery\}.d:
-	@if not exist "$(ARCH)\$(CONFIG)" $(MKDIR) $(ARCH)\$(CONFIG)
-	@echo Generating dependencies for $<
-	@$(CXX) /E /Fo$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) /showIncludes $< 1>$(*F).i 2>IceLocatorDiscovery\$(*F).d && \
-	cscript /NoLogo $(top_srcdir)\..\config\makedepend.vbs $< $(top_srcdir)
-	@del /q $(*F).d $(*F).i
-
-{$(slicedir)\Ice\}.ice{Ice\}.d:
-	@echo Generating dependencies for $<
-	@"$(SLICE2CPP)" $(CORE_SLICE2CPPFLAGS) --depend $< | \
-	cscript /NoLogo $(top_srcdir)\..\config\makedepend-slice.vbs $(*F).ice "..\"
-
-{$(slicedir)\Ice}.ice.cpp:
-	del /q $(headerdir)\Ice\$(*F).h $(*F).cpp
-	"$(SLICE2CPP)" $(CORE_SLICE2CPPFLAGS) $<
-	move $(*F).h $(headerdir)\Ice
-	move $(*F).cpp ..
-
-{$(slicedir)\Ice}.ice.h:
-	del /q $(headerdir)\Ice\$(*F).h $(*F).cpp
-	"$(SLICE2CPP)" $(CORE_SLICE2CPPFLAGS) $<
-	move $(*F).h $(headerdir)\Ice
-	move $(*F).cpp ..
-
-{$(slicedir)\IceSSL\}.ice{IceSSL\}.d:
-	@echo Generating dependencies for $<
-	@"$(SLICE2CPP)" $(CORE_SLICE2CPPFLAGS) --depend $< | \
-	cscript /NoLogo $(top_srcdir)\..\config\makedepend-slice.vbs $(*F).ice
-
-{$(slicedir)\IceSSL}.ice.cpp:
-	del /q $(headerdir)\IceSSL\$(*F).h $(*F).cpp
-	"$(SLICE2CPP)" $(SSL_SLICE2CPPFLAGS) $<
-	move $(*F).h $(headerdir)\IceSSL
-
-{$(slicedir)\IceSSL}.ice.h:
-	del /q $(headerdir)\IceSSL\$(*F).h $(*F).cpp
-	"$(SLICE2CPP)" $(SSL_SLICE2CPPFLAGS) $<
-	move $(*F).h $(headerdir)\IceSSL
-
-{$(slicedir)\IceDiscovery\}.ice{IceDiscovery\}.d:
-	@echo Generating dependencies for $<
-	@"$(SLICE2CPP)" --include-dir IceDiscovery $(SLICE2CPPFLAGS) --depend $< | \
-	cscript /NoLogo $(top_srcdir)\..\config\makedepend-slice.vbs $(*F).ice "..\"
-
-{$(slicedir)\IceDiscovery}.ice.cpp:
-	@if not exist "IceDiscovery" $(MKDIR) IceDiscovery
-	del /q IceDiscovery\$(*F).h $(*F).cpp
-	"$(SLICE2CPP)" --include-dir IceDiscovery $(SLICE2CPPFLAGS) $<
-	move $(*F).h IceDiscovery
-
-{$(slicedir)\IceDiscovery}.ice{IceDiscovery}.h:
-	@if not exist "IceDiscovery" $(MKDIR) IceDiscovery
-	del /q IceDiscovery\$(*F).h $(*F).cpp
-	"$(SLICE2CPP)" --include-dir IceDiscovery $(SLICE2CPPFLAGS) $<
-	move $(*F).h IceDiscovery
-
-{$(slicedir)\IceLocatorDiscovery\}.ice{IceLocatorDiscovery\}.d:
-	@echo Generating dependencies for $<
-	@"$(SLICE2CPP)" --include-dir IceLocatorDiscovery $(SLICE2CPPFLAGS) --depend $< | \
-	cscript /NoLogo $(top_srcdir)\..\config\makedepend-slice.vbs $(*F).ice "..\"
-
-{$(slicedir)\IceLocatorDiscovery}.ice.cpp:
-	@if not exist "IceLocatorDiscovery" $(MKDIR) IceLocatorDiscovery
-	del /q IceLocatorDiscovery\$(*F).h $(*F).cpp
-	"$(SLICE2CPP)" --include-dir IceLocatorDiscovery $(SLICE2CPPFLAGS) $<
-	move $(*F).h IceLocatorDiscovery
-
-{$(slicedir)\IceLocatorDiscovery}.ice{IceLocatorDiscovery}.h:
-	@if not exist "IceLocatorDiscovery" $(MKDIR) IceLocatorDiscovery
-	del /q IceLocatorDiscovery\$(*F).h $(*F).cpp
-	"$(SLICE2CPP)" --include-dir IceLocatorDiscovery $(SLICE2CPPFLAGS) $<
-	move $(*F).h IceLocatorDiscovery
-
-clean::
-	-del /q $(SOURCE_DIR)\BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h
-	-del /q $(SOURCE_DIR)\CommunicatorF.cpp $(HDIR)\CommunicatorF.h
-	-del /q $(SOURCE_DIR)\Communicator.cpp $(HDIR)\Communicator.h
-	-del /q $(SOURCE_DIR)\ConnectionF.cpp $(HDIR)\ConnectionF.h
-	-del /q $(SOURCE_DIR)\Connection.cpp $(HDIR)\Connection.h
-	-del /q $(SOURCE_DIR)\Current.cpp $(HDIR)\Current.h
-	-del /q $(SOURCE_DIR)\Endpoint.cpp $(HDIR)\Endpoint.h
-	-del /q $(SOURCE_DIR)\EndpointF.cpp $(HDIR)\EndpointF.h
-	-del /q $(SOURCE_DIR)\EndpointTypes.cpp $(HDIR)\EndpointTypes.h
-	-del /q $(SOURCE_DIR)\FacetMap.cpp $(HDIR)\FacetMap.h
-	-del /q $(SOURCE_DIR)\ImplicitContextF.cpp $(HDIR)\ImplicitContextF.h
-	-del /q $(SOURCE_DIR)\ImplicitContext.cpp $(HDIR)\ImplicitContext.h
-	-del /q $(SOURCE_DIR)\Identity.cpp $(HDIR)\Identity.h
-	-del /q $(SOURCE_DIR)\LocalException.cpp $(HDIR)\LocalException.h
-	-del /q $(SOURCE_DIR)\LocatorF.cpp $(HDIR)\LocatorF.h
-	-del /q $(SOURCE_DIR)\Locator.cpp $(HDIR)\Locator.h
-	-del /q $(SOURCE_DIR)\LoggerF.cpp $(HDIR)\LoggerF.h
-	-del /q $(SOURCE_DIR)\Logger.cpp $(HDIR)\Logger.h
-	-del /q $(SOURCE_DIR)\Metrics.cpp $(HDIR)\Metrics.h
-	-del /q $(SOURCE_DIR)\Observer.cpp $(HDIR)\Observer.h
-	-del /q $(SOURCE_DIR)\ObserverF.cpp $(HDIR)\ObserverF.h
-	-del /q $(SOURCE_DIR)\ObjectAdapterF.cpp $(HDIR)\ObjectAdapterF.h
-	-del /q $(SOURCE_DIR)\ObjectAdapter.cpp $(HDIR)\ObjectAdapter.h
-	-del /q $(SOURCE_DIR)\ObjectFactoryF.cpp $(HDIR)\ObjectFactoryF.h
-	-del /q $(SOURCE_DIR)\ObjectFactory.cpp $(HDIR)\ObjectFactory.h
-	-del /q $(SOURCE_DIR)\PluginF.cpp $(HDIR)\PluginF.h
-	-del /q $(SOURCE_DIR)\Plugin.cpp $(HDIR)\Plugin.h
-	-del /q $(SOURCE_DIR)\ProcessF.cpp $(HDIR)\ProcessF.h
-	-del /q $(SOURCE_DIR)\Process.cpp $(HDIR)\Process.h
-	-del /q $(SOURCE_DIR)\PropertiesF.cpp $(HDIR)\PropertiesF.h
-	-del /q $(SOURCE_DIR)\Properties.cpp $(HDIR)\Properties.h
-	-del /q $(SOURCE_DIR)\RemoteLogger.cpp $(HDIR)\RemoteLogger.h
-	-del /q $(SOURCE_DIR)\RouterF.cpp $(HDIR)\RouterF.h
-	-del /q $(SOURCE_DIR)\Router.cpp $(HDIR)\Router.h
-	-del /q $(SOURCE_DIR)\ServantLocatorF.cpp $(HDIR)\ServantLocatorF.h
-	-del /q $(SOURCE_DIR)\ServantLocator.cpp $(HDIR)\ServantLocator.h
-	-del /q $(SOURCE_DIR)\SliceChecksumDict.cpp $(HDIR)\SliceChecksumDict.h
-	-del /q $(SOURCE_DIR)\Version.cpp $(HDIR)\Version.h
-	-del /q EndpointInfo.cpp $(headerdir)\IceSSL\EndpointInfo.h
-	-del /q ConnectionInfo.cpp $(headerdir)\IceSSL\ConnectionInfo.h
-	-del /q $(ARCH)\$(CONFIG)\*.obj
-	-del /q $(ARCH)\$(CONFIG)\IceDiscovery\*.obj
-	-del /q $(ARCH)\$(CONFIG)\IceLocatorDiscovery\*.obj
-	-del /q $(PDBNAME)
-
-install:: all
diff --git a/cpp/src/Ice/winrt/RegisterPluginsInit.cpp b/cpp/src/Ice/winrt/RegisterPluginsInit.cpp
deleted file mode 100644
index 15604a8b4af..00000000000
--- a/cpp/src/Ice/winrt/RegisterPluginsInit.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Ice/Initialize.h>
-#include <Ice/RegisterPluginsInit.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-extern "C"
-{
-
-Plugin* createIceUDP(const CommunicatorPtr&, const string&, const StringSeq&);
-Plugin* createIceTCP(const CommunicatorPtr&, const string&, const StringSeq&);
-Plugin* createStringConverter(const CommunicatorPtr&, const string&, const StringSeq&);
-Plugin* createIceSSL(const CommunicatorPtr&, const string&, const StringSeq&);
-Plugin* createIceDiscovery(const CommunicatorPtr&, const string&, const StringSeq&);
-Plugin* createIceLocatorDiscovery(const CommunicatorPtr&, const string&, const StringSeq&);
-
-}
-
-namespace Ice
-{
-
-void
-registerIceSSL(bool)
-{
-    // Nothing to do, IceSSL is always registered by the static initializer.
-}
-
-}
-
-RegisterPluginsInit::RegisterPluginsInit()
-{
-    registerPluginFactory("IceUDP", createIceUDP, true);
-    registerPluginFactory("IceTCP", createIceTCP, true);
-    registerPluginFactory("IceStringConverter", createStringConverter, false);
-    registerPluginFactory("IceSSL", createIceSSL, true);
-    registerPluginFactory("IceDiscovery", createIceDiscovery, false);
-    registerPluginFactory("IceLocatorDiscovery", createIceLocatorDiscovery, false);
-}
diff --git a/cpp/src/Ice/winrt/StreamEndpointI.h b/cpp/src/Ice/winrt/StreamEndpointI.h
deleted file mode 100644
index d423e2d50cf..00000000000
--- a/cpp/src/Ice/winrt/StreamEndpointI.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef ICE_TCP_ENDPOINT_I_H
-#define ICE_TCP_ENDPOINT_I_H
-
-#include <IceUtil/Config.h>
-#include <Ice/IPEndpointI.h>
-#include <Ice/EndpointFactory.h>
-#include <Ice/WSEndpoint.h>
-#include <Ice/Network.h> // for IceIternal::Address
-#include <Ice/winrt/StreamF.h>
-
-namespace IceInternal
-{
-
-class StreamEndpointI : public IPEndpointI, public WSEndpointDelegate
-{
-public:
-
-    StreamEndpointI(const ProtocolInstancePtr&, const std::string&, Ice::Int, Ice::Int, const std::string&, bool);
-    StreamEndpointI(const ProtocolInstancePtr&);
-    StreamEndpointI(const ProtocolInstancePtr&, BasicStream*);
-
-    virtual Ice::EndpointInfoPtr getInfo() const;
-    virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const;
-
-    virtual Ice::Int timeout() const;
-    virtual EndpointIPtr timeout(Ice::Int) const;
-    virtual EndpointIPtr connectionId(const ::std::string&) const;
-    virtual bool compress() const;
-    virtual EndpointIPtr compress(bool) const;
-    virtual bool datagram() const;
-    virtual bool secure() const;
-
-    virtual TransceiverPtr transceiver() const;
-    virtual AcceptorPtr acceptor(const std::string&) const;
-    virtual std::string options() const;
-
-    virtual bool operator==(const Ice::LocalObject&) const;
-    virtual bool operator<(const Ice::LocalObject&) const;
-
-    StreamEndpointIPtr endpoint(const StreamAcceptorPtr&) const;
-
-    using IPEndpointI::connectionId;
-
-protected:
-
-    virtual void streamWriteImpl(BasicStream*) const;
-    virtual void hashInit(Ice::Int&) const;
-    virtual void initWithOptions(std::vector<std::string>&, bool);
-    virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const;
-    virtual bool checkOption(const std::string&, const std::string&, const std::string&);
-
-    virtual ConnectorPtr createConnector(const Address&, const NetworkProxyPtr&) const;
-    virtual IPEndpointIPtr createEndpoint(const std::string&, int, const std::string&) const;
-
-private:
-
-    //
-    // All members are const, because endpoints are immutable.
-    //
-    const Ice::Int _timeout;
-    const bool _compress;
-};
-
-class StreamEndpointFactory : public EndpointFactory
-{
-public:
-
-    StreamEndpointFactory(const ProtocolInstancePtr&);
-    virtual ~StreamEndpointFactory();
-
-    virtual Ice::Short type() const;
-    virtual std::string protocol() const;
-    virtual EndpointIPtr create(std::vector<std::string>&, bool) const;
-    virtual EndpointIPtr read(BasicStream*) const;
-    virtual void destroy();
-
-    virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const;
-
-private:
-
-    ProtocolInstancePtr _instance;
-};
-
-}
-
-#endif
diff --git a/cpp/src/Ice/winrt/StreamTransceiver.h b/cpp/src/Ice/winrt/StreamTransceiver.h
deleted file mode 100644
index 2a0dc98236d..00000000000
--- a/cpp/src/Ice/winrt/StreamTransceiver.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef ICE_STREAM_TRANSCEIVER_H
-#define ICE_STREAM_TRANSCEIVER_H
-
-#include <Ice/ProtocolInstanceF.h>
-#include <Ice/Transceiver.h>
-#include <Ice/Network.h>
-#include <Ice/WSTransceiver.h>
-
-namespace IceInternal
-{
-
-class StreamConnector;
-class StreamAcceptor;
-
-class StreamTransceiver : public Transceiver, public NativeInfo, public WSTransceiverDelegate
-{
-    enum State
-    {
-        StateNeedConnect,
-        StateConnectPending,
-        StateConnected
-    };
-
-public:
-
-    virtual NativeInfoPtr getNativeInfo();
-    virtual void setCompletedHandler(SocketOperationCompletedHandler^);
-
-    virtual SocketOperation initialize(Buffer&, Buffer&, bool&);
-    virtual SocketOperation closing(bool, const Ice::LocalException&);
-    virtual void close();
-    virtual SocketOperation write(Buffer&);
-    virtual SocketOperation read(Buffer&, bool&);
-
-    virtual bool startWrite(Buffer&);
-    virtual void finishWrite(Buffer&);
-    virtual void startRead(Buffer&);
-    virtual void finishRead(Buffer&, bool&);
-
-    virtual std::string protocol() const;
-    virtual std::string toString() const;
-    virtual std::string toDetailedString() const;
-    virtual Ice::ConnectionInfoPtr getInfo() const;
-    virtual Ice::ConnectionInfoPtr getWSInfo(const Ice::HeaderDict&) const;
-    virtual void checkSendSize(const Buffer&);
-    virtual void setBufferSize(int rcvSize, int sndSize);
-
-private:
-
-    StreamTransceiver(const ProtocolInstancePtr&, SOCKET, bool);
-    virtual ~StreamTransceiver();
-
-    void connect(const Address&);
-    bool checkIfErrorOrCompleted(SocketOperation, Windows::Foundation::IAsyncInfo^, int = 0);
-    void fillConnectionInfo(const Ice::IPConnectionInfoPtr&) const;
-
-    friend class StreamConnector;
-    friend class StreamAcceptor;
-
-    const ProtocolInstancePtr _instance;
-
-    State _state;
-    std::string _desc;
-    bool _verified;
-    Address _connectAddr;
-
-    AsyncInfo _read;
-    AsyncInfo _write;
-    int _maxSendPacketSize;
-    int _maxReceivePacketSize;
-
-    Windows::Storage::Streams::DataReader^ _reader;
-    Windows::Storage::Streams::DataWriter^ _writer;
-
-    Windows::Foundation::AsyncOperationCompletedHandler<unsigned int>^ _readOperationCompletedHandler;
-    Windows::Foundation::AsyncOperationCompletedHandler<unsigned int>^ _writeOperationCompletedHandler;
-};
-
-}
-
-#endif
diff --git a/cpp/src/IceBT/AcceptorI.cpp b/cpp/src/IceBT/AcceptorI.cpp
new file mode 100644
index 00000000000..de94b46b7b7
--- /dev/null
+++ b/cpp/src/IceBT/AcceptorI.cpp
@@ -0,0 +1,173 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceBT/AcceptorI.h>
+#include <IceBT/EndpointI.h>
+#include <IceBT/Instance.h>
+#include <IceBT/TransceiverI.h>
+#include <IceBT/Util.h>
+
+#include <Ice/Communicator.h>
+#include <Ice/Exception.h>
+#include <Ice/LocalException.h>
+#include <Ice/Network.h>
+#include <Ice/Properties.h>
+#include <Ice/StreamSocket.h>
+#include <IceUtil/StringUtil.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceBT;
+
+IceUtil::Shared* IceBT::upCast(AcceptorI* p) { return p; }
+
+IceInternal::NativeInfoPtr
+IceBT::AcceptorI::getNativeInfo()
+{
+    return this;
+}
+
+void
+IceBT::AcceptorI::close()
+{
+    try
+    {
+        _instance->engine()->removeService(_adapter, _serviceHandle);
+    }
+    catch(const BluetoothException&)
+    {
+        // Ignore.
+    }
+
+    if(_fd != INVALID_SOCKET)
+    {
+        IceInternal::closeSocketNoThrow(_fd);
+        _fd = INVALID_SOCKET;
+    }
+}
+
+IceInternal::EndpointIPtr
+IceBT::AcceptorI::listen()
+{
+    try
+    {
+        if(!_instance->engine()->adapterExists(_adapter))
+        {
+            throw SocketException(__FILE__, __LINE__, EADDRNOTAVAIL);
+        }
+        _addr = doBind(_fd, _addr);
+        IceInternal::doListen(_fd, _backlog);
+    }
+    catch(...)
+    {
+        _fd = INVALID_SOCKET;
+        throw;
+    }
+
+    assert(!_uuid.empty());
+
+    _serviceHandle = _instance->engine()->addService(_adapter, _name, _uuid, _addr.rc_channel);
+
+    return _endpoint;
+}
+
+IceInternal::TransceiverPtr
+IceBT::AcceptorI::accept()
+{
+    //
+    // The plug-in may not be initialized.
+    //
+    if(!_instance->initialized())
+    {
+        PluginInitializationException ex(__FILE__, __LINE__);
+        ex.reason = "IceBT: plug-in is not initialized";
+        throw ex;
+    }
+
+    SOCKET fd = doAccept(_fd);
+
+    return new TransceiverI(_instance, new StreamSocket(_instance, fd), _uuid);
+}
+
+string
+IceBT::AcceptorI::protocol() const
+{
+    return _instance->protocol();
+}
+
+string
+IceBT::AcceptorI::toString() const
+{
+    return addrToString(_addr);
+}
+
+string
+IceBT::AcceptorI::toDetailedString() const
+{
+    ostringstream os;
+    os << "local address = " << toString();
+    if(!_name.empty())
+    {
+        os << "\nservice name = '" << _name << "'";
+    }
+    if(!_uuid.empty())
+    {
+        os << "\nservice uuid = " << _uuid;
+    }
+    return os.str();
+}
+
+int
+IceBT::AcceptorI::effectiveChannel() const
+{
+    return _addr.rc_channel;
+}
+
+IceBT::AcceptorI::AcceptorI(const EndpointIPtr& endpoint, const InstancePtr& instance, const string& adapterName,
+                            const string& addr, const string& uuid, const string& name, int channel) :
+    _endpoint(endpoint),
+    _instance(instance),
+    _adapterName(adapterName),
+    _uuid(uuid),
+    _name(name),
+    _serviceHandle(0)
+{
+    // TBD - Necessary?
+    //_backlog = instance->properties()->getPropertyAsIntWithDefault("IceBT.Backlog", 1);
+    _backlog = 1;
+
+    _addr.rc_family = AF_BLUETOOTH;
+    _addr.rc_channel = channel;
+
+    _adapter = IceUtilInternal::trim(addr);
+    if(_adapter.empty())
+    {
+        //
+        // If no address was specified, we use the first available BT adapter.
+        //
+        _adapter = _instance->engine()->getDefaultAdapterAddress();
+    }
+
+    _adapter = IceUtilInternal::toUpper(_adapter);
+
+    if(!parseDeviceAddress(_adapter, _addr.rc_bdaddr))
+    {
+        EndpointParseException ex(__FILE__, __LINE__);
+        ex.str = "invalid address value `" + _adapter + "' in endpoint " + endpoint->toString();
+        throw ex;
+    }
+
+    _fd = createSocket();
+    IceInternal::setBlock(_fd, false);
+}
+
+IceBT::AcceptorI::~AcceptorI()
+{
+    assert(_fd == INVALID_SOCKET);
+}
diff --git a/cpp/src/IceBT/AcceptorI.h b/cpp/src/IceBT/AcceptorI.h
new file mode 100644
index 00000000000..493fea17249
--- /dev/null
+++ b/cpp/src/IceBT/AcceptorI.h
@@ -0,0 +1,56 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_BT_ACCEPTOR_I_H
+#define ICE_BT_ACCEPTOR_I_H
+
+#include <Ice/TransceiverF.h>
+#include <Ice/Acceptor.h>
+#include <IceBT/InstanceF.h>
+#include <IceBT/Util.h>
+
+namespace IceBT
+{
+
+class AcceptorI : public IceInternal::Acceptor, public IceInternal::NativeInfo
+{
+public:
+
+    virtual IceInternal::NativeInfoPtr getNativeInfo();
+
+    virtual void close();
+    virtual IceInternal::EndpointIPtr listen();
+    virtual IceInternal::TransceiverPtr accept();
+    virtual std::string protocol() const;
+    virtual std::string toString() const;
+    virtual std::string toDetailedString() const;
+
+    int effectiveChannel() const;
+
+private:
+
+    AcceptorI(const EndpointIPtr&, const InstancePtr&, const std::string&, const std::string&, const std::string&,
+              const std::string&, int);
+    virtual ~AcceptorI();
+    friend class EndpointI;
+
+    EndpointIPtr _endpoint;
+    const InstancePtr _instance;
+    const std::string _adapterName;
+    const std::string _uuid;
+    const std::string _name;
+    std::string _adapter;
+    SocketAddress _addr;
+    Ice::Int _backlog;
+    unsigned int _serviceHandle;
+};
+
+}
+
+#endif
diff --git a/cpp/src/IceStorm/V31Format.ice b/cpp/src/IceBT/Config.h
index a3142420d1e..239c61af8b3 100644
--- a/cpp/src/IceStorm/V31Format.ice
+++ b/cpp/src/IceBT/Config.h
@@ -7,17 +7,22 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef ICE_BT_CONFIG_H
+#define ICE_BT_CONFIG_H
 
-[["cpp:header-ext:h"]]
+#include <Ice/Config.h>
+#include <Ice/Network.h>
 
-#include <IceStorm/LinkRecord.ice>
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/rfcomm.h>
 
-module IceStorm
+namespace IceBT
 {
 
-/** Dictionary of link name to link record. */
-dictionary<string, LinkRecord> LinkRecordDict;
+typedef bdaddr_t DeviceAddress;
 
-}; // End module IceStorm
+typedef sockaddr_rc SocketAddress;
 
+}
+
+#endif
diff --git a/cpp/src/IceBT/ConnectorI.cpp b/cpp/src/IceBT/ConnectorI.cpp
new file mode 100644
index 00000000000..d3808f52c73
--- /dev/null
+++ b/cpp/src/IceBT/ConnectorI.cpp
@@ -0,0 +1,138 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceBT/ConnectorI.h>
+#include <IceBT/EndpointI.h>
+#include <IceBT/Instance.h>
+#include <IceBT/TransceiverI.h>
+#include <IceBT/Util.h>
+
+#include <Ice/Communicator.h>
+#include <Ice/LocalException.h>
+#include <Ice/Network.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceBT;
+
+IceInternal::TransceiverPtr
+IceBT::ConnectorI::connect()
+{
+    //
+    // The plug-in may not be initialized.
+    //
+    if(!_instance->initialized())
+    {
+        PluginInitializationException ex(__FILE__, __LINE__);
+        ex.reason = "IceBT: plug-in is not initialized";
+        throw ex;
+    }
+
+    return new TransceiverI(_instance, new StreamSocket(_instance, _addr), _uuid);
+}
+
+Short
+IceBT::ConnectorI::type() const
+{
+    return _instance->type();
+}
+
+string
+IceBT::ConnectorI::toString() const
+{
+    return addrToString(_addr);
+}
+
+bool
+IceBT::ConnectorI::operator==(const IceInternal::Connector& r) const
+{
+    const ConnectorI* p = dynamic_cast<const ConnectorI*>(&r);
+    if(!p)
+    {
+        return false;
+    }
+
+    if(compareAddress(_addr, p->_addr) != 0)
+    {
+        return false;
+    }
+
+    if(_uuid != p->_uuid)
+    {
+        return false;
+    }
+
+    if(_timeout != p->_timeout)
+    {
+        return false;
+    }
+
+    if(_connectionId != p->_connectionId)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool
+IceBT::ConnectorI::operator!=(const IceInternal::Connector& r) const
+{
+    return !operator==(r);
+}
+
+bool
+IceBT::ConnectorI::operator<(const IceInternal::Connector& r) const
+{
+    const ConnectorI* p = dynamic_cast<const ConnectorI*>(&r);
+    if(!p)
+    {
+        return type() < r.type();
+    }
+
+    int rc = compareAddress(_addr, p->_addr);
+    if(rc < 0)
+    {
+        return true;
+    }
+    else if(rc > 0)
+    {
+        return false;
+    }
+
+    if(_uuid < p->_uuid)
+    {
+        return true;
+    }
+    else if(p->_uuid < _uuid)
+    {
+        return false;
+    }
+
+    if(_timeout < p->_timeout)
+    {
+        return true;
+    }
+    else if(p->_timeout < _timeout)
+    {
+        return false;
+    }
+
+    return _connectionId < p->_connectionId;
+}
+
+IceBT::ConnectorI::ConnectorI(const InstancePtr& instance, const SocketAddress& addr, const string& uuid, Int timeout,
+                              const string& connectionId) :
+    _instance(instance),
+    _addr(addr),
+    _uuid(uuid),
+    _timeout(timeout),
+    _connectionId(connectionId)
+{
+}
diff --git a/cpp/src/IceBT/ConnectorI.h b/cpp/src/IceBT/ConnectorI.h
new file mode 100644
index 00000000000..d1f7f41b8e6
--- /dev/null
+++ b/cpp/src/IceBT/ConnectorI.h
@@ -0,0 +1,50 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_BT_CONNECTOR_I_H
+#define ICE_BT_CONNECTOR_I_H
+
+#include <IceBT/Config.h>
+#include <IceBT/Engine.h>
+#include <IceBT/InstanceF.h>
+
+#include <Ice/TransceiverF.h>
+#include <Ice/Connector.h>
+
+namespace IceBT
+{
+
+class ConnectorI : public IceInternal::Connector
+{
+public:
+
+    virtual IceInternal::TransceiverPtr connect();
+
+    virtual Ice::Short type() const;
+    virtual std::string toString() const;
+
+    virtual bool operator==(const IceInternal::Connector&) const;
+    virtual bool operator!=(const IceInternal::Connector&) const;
+    virtual bool operator<(const IceInternal::Connector&) const;
+
+private:
+
+    ConnectorI(const InstancePtr&, const SocketAddress&, const std::string&, Ice::Int, const std::string&);
+    friend class EndpointI;
+
+    const InstancePtr _instance;
+    const SocketAddress _addr;
+    const std::string _uuid;
+    const Ice::Int _timeout;
+    const std::string _connectionId;
+};
+
+}
+
+#endif
diff --git a/cpp/src/IceBT/DBus.cpp b/cpp/src/IceBT/DBus.cpp
new file mode 100644
index 00000000000..9101e88bb60
--- /dev/null
+++ b/cpp/src/IceBT/DBus.cpp
@@ -0,0 +1,1352 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceBT/DBus.h>
+#include <IceUtil/Thread.h>
+#include <IceUtil/Mutex.h>
+#include <IceUtil/Monitor.h>
+
+#include <dbus/dbus.h>
+#include <stack>
+
+using namespace std;
+using namespace IceBT::DBus;
+
+namespace
+{
+
+class ErrorWrapper
+{
+public:
+
+    ErrorWrapper()
+    {
+        ::dbus_error_init(&err);
+    }
+
+    ~ErrorWrapper()
+    {
+        ::dbus_error_free(&err);
+    }
+
+    bool isSet() const
+    {
+        return ::dbus_error_is_set(&err);
+    }
+
+    DBusError err;
+};
+
+class ExceptionI : public IceBT::DBus::Exception
+{
+public:
+
+    ExceptionI(const ErrorWrapper& w)
+    {
+        init(w.err);
+    }
+
+    ExceptionI(const DBusError& err)
+    {
+        init(err);
+    }
+
+    ExceptionI(const string& s) :
+        Exception(s)
+    {
+    }
+
+    string reason;
+
+private:
+
+    void init(const DBusError& err)
+    {
+        assert(::dbus_error_is_set(&err));
+        reason = err.message;
+    }
+};
+
+class PrimitiveType : public Type
+{
+public:
+
+    PrimitiveType(Kind k) :
+        _kind(k)
+    {
+    }
+
+    virtual Kind getKind() const
+    {
+        return _kind;
+    }
+
+    virtual std::string getSignature() const
+    {
+        switch(_kind)
+        {
+        case KindBoolean:
+            return DBUS_TYPE_BOOLEAN_AS_STRING;
+        case KindByte:
+            return DBUS_TYPE_BYTE_AS_STRING;
+        case KindUint16:
+            return DBUS_TYPE_UINT16_AS_STRING;
+        case KindInt16:
+            return DBUS_TYPE_INT16_AS_STRING;
+        case KindUint32:
+            return DBUS_TYPE_UINT32_AS_STRING;
+        case KindInt32:
+            return DBUS_TYPE_INT32_AS_STRING;
+        case KindUint64:
+            return DBUS_TYPE_UINT64_AS_STRING;
+        case KindInt64:
+            return DBUS_TYPE_INT64_AS_STRING;
+        case KindDouble:
+            return DBUS_TYPE_DOUBLE_AS_STRING;
+        case KindString:
+            return DBUS_TYPE_STRING_AS_STRING;
+        case KindObjectPath:
+            return DBUS_TYPE_OBJECT_PATH_AS_STRING;
+        case KindSignature:
+            return DBUS_TYPE_SIGNATURE_AS_STRING;
+        case KindUnixFD:
+            return DBUS_TYPE_UNIX_FD_AS_STRING;
+        case KindInvalid:
+        case KindArray:
+        case KindVariant:
+        case KindStruct:
+        case KindDictEntry:
+        default:
+            assert(false);
+            return "";
+        }
+    }
+
+private:
+
+    Kind _kind;
+};
+
+class MessageI : public Message
+{
+public:
+
+    static MessagePtr wrap(DBusMessage* m)
+    {
+        return new MessageI(m, false);
+    }
+
+    static MessagePtr adopt(DBusMessage* m)
+    {
+        return new MessageI(m, true);
+    }
+
+    virtual ~MessageI()
+    {
+        ::dbus_message_unref(_message);
+    }
+
+    virtual bool isError() const
+    {
+        const int t = ::dbus_message_get_type(const_cast<DBusMessage*>(_message));
+        return t == DBUS_MESSAGE_TYPE_ERROR;
+    }
+
+    virtual string getErrorName() const
+    {
+        const char* name = ::dbus_message_get_error_name(const_cast<DBusMessage*>(_message));
+        return name ? name : string();
+    }
+
+    virtual void throwException()
+    {
+        assert(isError());
+
+        //
+        // Format the error name and any arguments into a string.
+        //
+        ostringstream ostr;
+        ostr << getErrorName();
+        ValuePtr v = read();
+        if(v)
+        {
+            ostr << ":" << endl << v;
+        }
+        throw ExceptionI(ostr.str());
+    }
+
+    virtual bool isSignal() const
+    {
+        const int t = ::dbus_message_get_type(const_cast<DBusMessage*>(_message));
+        return t == DBUS_MESSAGE_TYPE_SIGNAL;
+    }
+
+    virtual bool isMethodCall() const
+    {
+        const int t = ::dbus_message_get_type(const_cast<DBusMessage*>(_message));
+        return t == DBUS_MESSAGE_TYPE_METHOD_CALL;
+    }
+
+    virtual bool isMethodReturn() const
+    {
+        const int t = ::dbus_message_get_type(const_cast<DBusMessage*>(_message));
+        return t == DBUS_MESSAGE_TYPE_METHOD_RETURN;
+    }
+
+    virtual string getPath() const
+    {
+        const char* s = ::dbus_message_get_path(const_cast<DBusMessage*>(_message));
+        return s ? string(s) : string();
+    }
+
+    virtual string getInterface() const
+    {
+        const char* s = ::dbus_message_get_interface(const_cast<DBusMessage*>(_message));
+        return s ? string(s) : string();
+    }
+
+    virtual string getMember() const
+    {
+        const char* s = ::dbus_message_get_member(const_cast<DBusMessage*>(_message));
+        return s ? string(s) : string();
+    }
+
+    virtual string getDestination() const
+    {
+        const char* s = ::dbus_message_get_destination(const_cast<DBusMessage*>(_message));
+        return s ? string(s) : string();
+    }
+
+    virtual void write(const ValuePtr& v)
+    {
+        DBusMessageIter iter;
+        ::dbus_message_iter_init_append(_message, &iter);
+        writeValue(v, &iter);
+    }
+
+    virtual void write(const vector<ValuePtr>& v)
+    {
+        DBusMessageIter iter;
+        ::dbus_message_iter_init_append(_message, &iter);
+        for(vector<ValuePtr>::const_iterator p = v.begin(); p != v.end(); ++p)
+        {
+            writeValue(*p, &iter);
+        }
+    }
+
+    virtual bool checkTypes(const vector<TypePtr>& types) const
+    {
+        string msgSig = ::dbus_message_get_signature(_message);
+        string sig;
+        for(vector<TypePtr>::const_iterator p = types.begin(); p != types.end(); ++p)
+        {
+            sig += (*p)->getSignature();
+        }
+        return sig == msgSig;
+    }
+
+    virtual ValuePtr read()
+    {
+        //
+        // Read a single value.
+        //
+
+        TypePtr type = buildType(); // Build a type from the message's signature.
+        if(!type)
+        {
+            return 0;
+        }
+        assert(_iterators.empty());
+        _iterators.push(DBusMessageIter());
+        _iter = &_iterators.top();
+        ::dbus_message_iter_init(_message, _iter);
+        ValuePtr v = readValue(type);
+        assert(_iterators.size() == 1);
+        _iterators.pop();
+        return v;
+    }
+
+    virtual vector<ValuePtr> readAll()
+    {
+        vector<TypePtr> types = buildTypes(); // Build types from the message's signature.
+
+        assert(_iterators.empty());
+        _iterators.push(DBusMessageIter());
+        _iter = &_iterators.top();
+        ::dbus_message_iter_init(_message, _iter);
+
+        vector<ValuePtr> values;
+        for(vector<TypePtr>::iterator p = types.begin(); p != types.end(); ++p)
+        {
+            values.push_back(readValue(*p));
+            next();
+        }
+
+        assert(_iterators.size() == 1);
+        _iterators.pop();
+
+        return values;
+    }
+
+    DBusMessage* message()
+    {
+        return _message;
+    }
+
+private:
+
+    MessageI(DBusMessage* m, bool adopt) :
+        _message(m),
+        _iter(0)
+    {
+        assert(_message);
+        if(!adopt)
+        {
+            ::dbus_message_ref(m); // Bump the reference count.
+        }
+    }
+
+    vector<TypePtr> buildTypes()
+    {
+        vector<TypePtr> types;
+
+        string sig = ::dbus_message_get_signature(_message);
+
+        string::iterator p = sig.begin();
+        while(p != sig.end())
+        {
+            types.push_back(buildType(p));
+        }
+
+        return types;
+    }
+
+    TypePtr buildType()
+    {
+        string sig = ::dbus_message_get_signature(_message);
+        if(sig.empty())
+        {
+            return 0;
+        }
+        string::iterator p = sig.begin();
+        return buildType(p);
+    }
+
+    TypePtr buildType(string::iterator& iter)
+    {
+        string::value_type ch = *iter++;
+        switch(ch)
+        {
+            case DBUS_TYPE_BOOLEAN:
+            case DBUS_TYPE_BYTE:
+            case DBUS_TYPE_UINT16:
+            case DBUS_TYPE_INT16:
+            case DBUS_TYPE_UINT32:
+            case DBUS_TYPE_INT32:
+            case DBUS_TYPE_UINT64:
+            case DBUS_TYPE_INT64:
+            case DBUS_TYPE_DOUBLE:
+            case DBUS_TYPE_STRING:
+            case DBUS_TYPE_OBJECT_PATH:
+            case DBUS_TYPE_SIGNATURE:
+            case DBUS_TYPE_UNIX_FD:
+                return Type::getPrimitive(convertKind(ch));
+            case DBUS_TYPE_ARRAY:
+            {
+                TypePtr elem = buildType(iter);
+                return new ArrayType(elem);
+            }
+            case DBUS_TYPE_VARIANT:
+            {
+                return new VariantType;
+            }
+            case '(': // Struct
+            {
+                vector<TypePtr> types;
+                while(*iter != ')')
+                {
+                    types.push_back(buildType(iter));
+                }
+                assert(*iter == ')');
+                ++iter;
+                return new StructType(types);
+            }
+            case '{': // Dict entry
+            {
+                TypePtr key, value;
+                key = buildType(iter);
+                value = buildType(iter);
+                assert(*iter == '}');
+                ++iter;
+                return new DictEntryType(key, value);
+            }
+            case DBUS_TYPE_INVALID:
+                assert(false);
+                break;
+        }
+
+        return 0;
+    }
+
+    void writeValue(const ValuePtr& p, DBusMessageIter* iter)
+    {
+        switch(p->getType()->getKind())
+        {
+        case Type::KindBoolean:
+        {
+            BooleanValuePtr v = BooleanValuePtr::dynamicCast(p);
+            assert(v);
+            const dbus_bool_t b = v->v ? TRUE : FALSE;
+            ::dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &b);
+            break;
+        }
+        case Type::KindByte:
+        {
+            ByteValuePtr v = ByteValuePtr::dynamicCast(p);
+            assert(v);
+            ::dbus_message_iter_append_basic(iter, DBUS_TYPE_BYTE, &v->v);
+            break;
+        }
+        case Type::KindUint16:
+        {
+            Uint16ValuePtr v = Uint16ValuePtr::dynamicCast(p);
+            assert(v);
+            ::dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &v->v);
+            break;
+        }
+        case Type::KindInt16:
+        {
+            Int16ValuePtr v = Int16ValuePtr::dynamicCast(p);
+            assert(v);
+            ::dbus_message_iter_append_basic(iter, DBUS_TYPE_INT16, &v->v);
+            break;
+        }
+        case Type::KindUint32:
+        {
+            Uint32ValuePtr v = Uint32ValuePtr::dynamicCast(p);
+            assert(v);
+            ::dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &v->v);
+            break;
+        }
+        case Type::KindInt32:
+        {
+            Int32ValuePtr v = Int32ValuePtr::dynamicCast(p);
+            assert(v);
+            ::dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &v->v);
+            break;
+        }
+        case Type::KindUint64:
+        {
+            Uint64ValuePtr v = Uint64ValuePtr::dynamicCast(p);
+            assert(v);
+            ::dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT64, &v->v);
+            break;
+        }
+        case Type::KindInt64:
+        {
+            Int64ValuePtr v = Int64ValuePtr::dynamicCast(p);
+            assert(v);
+            ::dbus_message_iter_append_basic(iter, DBUS_TYPE_INT64, &v->v);
+            break;
+        }
+        case Type::KindDouble:
+        {
+            DoubleValuePtr v = DoubleValuePtr::dynamicCast(p);
+            assert(v);
+            ::dbus_message_iter_append_basic(iter, DBUS_TYPE_DOUBLE, &v->v);
+            break;
+        }
+        case Type::KindString:
+        {
+            StringValuePtr v = StringValuePtr::dynamicCast(p);
+            assert(v);
+            const char* s = v->v.c_str();
+            ::dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &s);
+            break;
+        }
+        case Type::KindObjectPath:
+        {
+            ObjectPathValuePtr v = ObjectPathValuePtr::dynamicCast(p);
+            assert(v);
+            const char* s = v->v.c_str();
+            ::dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &s);
+            break;
+        }
+        case Type::KindSignature:
+        {
+            SignatureValuePtr v = SignatureValuePtr::dynamicCast(p);
+            assert(v);
+            const char* s = v->v.c_str();
+            ::dbus_message_iter_append_basic(iter, DBUS_TYPE_SIGNATURE, &s);
+            break;
+        }
+        case Type::KindUnixFD:
+        {
+            UnixFDValuePtr v = UnixFDValuePtr::dynamicCast(p);
+            assert(v);
+            ::dbus_message_iter_append_basic(iter, DBUS_TYPE_UNIX_FD, &v->v);
+            break;
+        }
+        case Type::KindArray:
+        {
+            ArrayTypePtr t = ArrayTypePtr::dynamicCast(p->getType());
+            assert(t);
+            ArrayValuePtr arr = ArrayValuePtr::dynamicCast(p);
+            assert(arr);
+
+            string sig = t->elementType->getSignature();
+
+            DBusMessageIter sub;
+            if(!::dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, sig.c_str(), &sub))
+            {
+                throw ExceptionI("out of memory while calling dbus_message_iter_open_container");
+            }
+            for(vector<ValuePtr>::iterator q = arr->elements.begin(); q != arr->elements.end(); ++q)
+            {
+                writeValue(*q, &sub);
+            }
+            if(!::dbus_message_iter_close_container(iter, &sub))
+            {
+                throw ExceptionI("out of memory while calling dbus_message_iter_close_container");
+            }
+            break;
+        }
+        case Type::KindVariant:
+        {
+            VariantValuePtr v = VariantValuePtr::dynamicCast(p);
+            assert(v);
+
+            string sig = v->v->getType()->getSignature();
+
+            DBusMessageIter sub;
+            if(!::dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, sig.c_str(), &sub))
+            {
+                throw ExceptionI("out of memory while calling dbus_message_iter_open_container");
+            }
+            writeValue(v->v, &sub);
+            if(!::dbus_message_iter_close_container(iter, &sub))
+            {
+                throw ExceptionI("out of memory while calling dbus_message_iter_close_container");
+            }
+            break;
+        }
+        case Type::KindStruct:
+        {
+            StructValuePtr v = StructValuePtr::dynamicCast(p);
+            assert(v);
+
+            DBusMessageIter sub;
+            if(!::dbus_message_iter_open_container(iter, DBUS_TYPE_STRUCT, 0, &sub))
+            {
+                throw ExceptionI("out of memory while calling dbus_message_iter_open_container");
+            }
+            for(vector<ValuePtr>::iterator q = v->members.begin(); q != v->members.end(); ++q)
+            {
+                writeValue(*q, &sub);
+            }
+            if(!::dbus_message_iter_close_container(iter, &sub))
+            {
+                throw ExceptionI("out of memory while calling dbus_message_iter_close_container");
+            }
+            break;
+        }
+        case Type::KindDictEntry:
+        {
+            DictEntryValuePtr v = DictEntryValuePtr::dynamicCast(p);
+            assert(v);
+
+            DBusMessageIter sub;
+            if(!::dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY, 0, &sub))
+            {
+                throw ExceptionI("out of memory while calling dbus_message_iter_open_container");
+            }
+            writeValue(v->key, &sub);
+            writeValue(v->value, &sub);
+            if(!::dbus_message_iter_close_container(iter, &sub))
+            {
+                throw ExceptionI("out of memory while calling dbus_message_iter_close_container");
+            }
+            break;
+        }
+        case Type::KindInvalid:
+        default:
+            assert(false);
+            break;
+        }
+    }
+
+    void next()
+    {
+        ::dbus_message_iter_next(_iter);
+    }
+
+    static Type::Kind convertKind(int t)
+    {
+        switch(t)
+        {
+        case DBUS_TYPE_INVALID:
+            return Type::KindInvalid;
+        case DBUS_TYPE_BOOLEAN:
+            return Type::KindBoolean;
+        case DBUS_TYPE_BYTE:
+            return Type::KindByte;
+        case DBUS_TYPE_UINT16:
+            return Type::KindUint16;
+        case DBUS_TYPE_INT16:
+            return Type::KindInt16;
+        case DBUS_TYPE_UINT32:
+            return Type::KindUint32;
+        case DBUS_TYPE_INT32:
+            return Type::KindInt32;
+        case DBUS_TYPE_UINT64:
+            return Type::KindUint64;
+        case DBUS_TYPE_INT64:
+            return Type::KindInt64;
+        case DBUS_TYPE_DOUBLE:
+            return Type::KindDouble;
+        case DBUS_TYPE_STRING:
+            return Type::KindString;
+        case DBUS_TYPE_OBJECT_PATH:
+            return Type::KindObjectPath;
+        case DBUS_TYPE_SIGNATURE:
+            return Type::KindSignature;
+        case DBUS_TYPE_UNIX_FD:
+            return Type::KindUnixFD;
+        case DBUS_TYPE_ARRAY:
+            return Type::KindArray;
+        case DBUS_TYPE_VARIANT:
+            return Type::KindVariant;
+        case DBUS_TYPE_STRUCT:
+            return Type::KindStruct;
+        case DBUS_TYPE_DICT_ENTRY:
+            return Type::KindDictEntry;
+        default:
+            throw ExceptionI("unknown arg type");
+            return Type::KindInvalid;
+        }
+    }
+
+    Type::Kind currentKind() const
+    {
+        int t = ::dbus_message_iter_get_arg_type(const_cast<DBusMessageIter*>(_iter));
+        return convertKind(t);
+    }
+
+    ValuePtr readValue(const TypePtr& t)
+    {
+        switch(t->getKind())
+        {
+        case Type::KindInvalid:
+            assert(false);
+            return 0;
+        case Type::KindBoolean:
+        {
+            bool v;
+            ::dbus_message_iter_get_basic(_iter, &v);
+            return new BooleanValue(v);
+        }
+        case Type::KindByte:
+        {
+            unsigned char v;
+            ::dbus_message_iter_get_basic(_iter, &v);
+            return new ByteValue(v);
+        }
+        case Type::KindUint16:
+        {
+            unsigned short v;
+            ::dbus_message_iter_get_basic(_iter, &v);
+            return new Uint16Value(v);
+        }
+        case Type::KindInt16:
+        {
+            short v;
+            ::dbus_message_iter_get_basic(_iter, &v);
+            return new Int16Value(v);
+        }
+        case Type::KindUint32:
+        {
+            unsigned int v;
+            ::dbus_message_iter_get_basic(_iter, &v);
+            return new Uint32Value(v);
+        }
+        case Type::KindInt32:
+        {
+            int v;
+            ::dbus_message_iter_get_basic(_iter, &v);
+            return new Int32Value(v);
+        }
+        case Type::KindUint64:
+        {
+            unsigned long long v;
+            ::dbus_message_iter_get_basic(_iter, &v);
+            return new Uint64Value(v);
+        }
+        case Type::KindInt64:
+        {
+            long long v;
+            ::dbus_message_iter_get_basic(_iter, &v);
+            return new Int64Value(v);
+        }
+        case Type::KindDouble:
+        {
+            double v;
+            ::dbus_message_iter_get_basic(_iter, &v);
+            return new DoubleValue(v);
+        }
+        case Type::KindString:
+        {
+            char* str;
+            ::dbus_message_iter_get_basic(_iter, &str);
+            return new StringValue(str);
+        }
+        case Type::KindObjectPath:
+        {
+            char* str;
+            ::dbus_message_iter_get_basic(_iter, &str);
+            return new ObjectPathValue(str);
+        }
+        case Type::KindSignature:
+        {
+            char* str;
+            ::dbus_message_iter_get_basic(_iter, &str);
+            return new SignatureValue(str);
+        }
+        case Type::KindUnixFD:
+        {
+            unsigned int v;
+            ::dbus_message_iter_get_basic(_iter, &v);
+            return new UnixFDValue(v);
+        }
+        case Type::KindArray:
+        {
+            ArrayTypePtr arr = ArrayTypePtr::dynamicCast(t);
+            assert(arr);
+            pushIter();
+            ArrayValuePtr v = new ArrayValue(arr);
+            while(true)
+            {
+                Type::Kind k = currentKind();
+                if(k == Type::KindInvalid)
+                {
+                    break;
+                }
+                assert(k == arr->elementType->getKind());
+                v->elements.push_back(readValue(arr->elementType));
+                next();
+            }
+            popIter();
+            return v;
+        }
+        case Type::KindVariant:
+        {
+            pushIter();
+            //
+            // Get the type signature of this variant's value.
+            //
+            string sig = ::dbus_message_iter_get_signature(_iter);
+            string::iterator p = sig.begin();
+            TypePtr t = buildType(p);
+            VariantValuePtr v = new VariantValue;
+            v->v = readValue(t);
+            popIter();
+            return v;
+        }
+        case Type::KindStruct:
+        {
+            StructTypePtr st = StructTypePtr::dynamicCast(t);
+            assert(st);
+            pushIter();
+            StructValuePtr v = new StructValue(st);
+            for(vector<TypePtr>::iterator p = st->memberTypes.begin(); p != st->memberTypes.end(); ++p)
+            {
+                v->members.push_back(readValue(*p));
+                next();
+            }
+            popIter();
+            return v;
+        }
+        case Type::KindDictEntry:
+        {
+            DictEntryTypePtr dt = DictEntryTypePtr::dynamicCast(t);
+            assert(dt);
+            pushIter();
+            DictEntryValuePtr v = new DictEntryValue(dt);
+            v->key = readValue(dt->keyType);
+            next();
+            v->value = readValue(dt->valueType);
+            popIter();
+            return v;
+        }
+        default:
+            assert(false);
+            return 0;
+        }
+    }
+
+    void pushIter()
+    {
+        DBusMessageIter* parent = _iter;
+        _iterators.push(DBusMessageIter());
+        _iter = &_iterators.top();
+        ::dbus_message_iter_recurse(parent, _iter);
+    }
+
+    void popIter()
+    {
+        assert(_iterators.size() > 1);
+        _iterators.pop();
+        _iter = &_iterators.top();
+    }
+
+    DBusMessage* _message;
+    stack<DBusMessageIter> _iterators;
+    DBusMessageIter* _iter;
+};
+typedef IceUtil::Handle<MessageI> MessageIPtr;
+
+static void pendingCallCompletedCallback(DBusPendingCall*, void*);
+static void pendingCallFree(void*);
+
+class AsyncResultI : public AsyncResult
+{
+public:
+
+    AsyncResultI(DBusPendingCall* call, const AsyncCallbackPtr& cb) :
+        _call(call),
+        _callback(cb),
+        _status(StatusPending)
+    {
+        //
+        // Bump our refcount to ensure this object lives until the reply is received.
+        // The pendingFree function will decrement the refcount.
+        //
+        __incRef();
+
+        if(!::dbus_pending_call_set_notify(_call, pendingCallCompletedCallback, this, pendingCallFree))
+        {
+            ::dbus_pending_call_cancel(_call);
+            ::dbus_pending_call_unref(_call);
+            throw ExceptionI("dbus_pending_call_set_notify failed");
+        }
+
+        //
+        // There's a potential race condition with dbus_pending_call_set_notify. If the
+        // pending call is already completed when we call dbus_pending_call_set_notify,
+        // our callback will NOT be invoked. We manually check the completion status
+        // here and handle the reply if necessary.
+        //
+        bool complete;
+        {
+            IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+            complete = (::dbus_pending_call_get_completed(_call) && _status == StatusPending);
+        }
+
+        if(complete)
+        {
+            replyReceived();
+        }
+    }
+
+    ~AsyncResultI()
+    {
+        ::dbus_pending_call_unref(_call);
+    }
+
+    virtual bool isPending() const
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+        return _status == StatusPending;
+    }
+
+    virtual bool isComplete() const
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+        return _status == StatusComplete;
+    }
+
+    virtual MessagePtr waitUntilFinished() const
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+        while(_status == StatusPending)
+        {
+            _lock.wait();
+        }
+        return _reply;
+    }
+
+    virtual MessagePtr getReply() const
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+        return _reply;
+    }
+
+    virtual void setCallback(const AsyncCallbackPtr& cb)
+    {
+        bool call = false;
+
+        {
+            IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+            _callback = cb;
+            if(_status == StatusComplete)
+            {
+                call = true;
+            }
+        }
+
+        if(call)
+        {
+            try
+            {
+                cb->completed(this);
+            }
+            catch(...)
+            {
+            }
+        }
+    }
+
+    void replyReceived()
+    {
+        assert(::dbus_pending_call_get_completed(_call));
+
+        AsyncCallbackPtr cb;
+
+        {
+            IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+
+            //
+            // Make sure we haven't already handled the reply (see constructor).
+            //
+            if(_status == StatusPending)
+            {
+                DBusMessage* m = ::dbus_pending_call_steal_reply(_call);
+                assert(m);
+                _reply = MessageI::adopt(m);
+                _status = StatusComplete;
+                cb = _callback;
+                _lock.notifyAll();
+            }
+        }
+
+        if(cb)
+        {
+            try
+            {
+                cb->completed(this);
+            }
+            catch(...)
+            {
+            }
+        }
+    }
+
+private:
+
+    IceUtil::Monitor<IceUtil::Mutex> _lock;
+    DBusPendingCall* _call;
+    AsyncCallbackPtr _callback;
+
+    enum Status { StatusPending, StatusComplete };
+    Status _status;
+
+    MessagePtr _reply;
+};
+
+static void
+pendingCallCompletedCallback(DBusPendingCall*, void* userData)
+{
+    AsyncResultI* r = static_cast<AsyncResultI*>(userData);
+    assert(r);
+    r->replyReceived();
+}
+
+static void
+pendingCallFree(void* userData)
+{
+    AsyncResultI* r = static_cast<AsyncResultI*>(userData);
+    assert(r);
+    r->__decRef();
+}
+
+static DBusHandlerResult filterCallback(DBusConnection*, DBusMessage*, void*);
+static void freeConnection(void*);
+
+class ConnectionI;
+typedef IceUtil::Handle<ConnectionI> ConnectionIPtr;
+
+class ConnectionI : public Connection
+{
+public:
+
+    ConnectionI() :
+        _connection(0),
+        _closed(false)
+    {
+    }
+
+    virtual ~ConnectionI()
+    {
+        if(_connection)
+        {
+            ::dbus_connection_unref(_connection);
+        }
+    }
+
+    virtual void addFilter(const FilterPtr& f)
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+
+        _filters.push_back(f);
+    }
+
+    virtual void removeFilter(const FilterPtr& f)
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+
+        for(vector<FilterPtr>::iterator p = _filters.begin(); p != _filters.end(); ++p)
+        {
+            if(p->get() == f.get())
+            {
+                _filters.erase(p);
+                break;
+            }
+        }
+    }
+
+    virtual void addService(const string& path, const ServicePtr& s)
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+
+        map<string, ServicePtr>::iterator p = _services.find(path);
+        if(p != _services.end())
+        {
+            throw ExceptionI("service with path `" + path + "' already registered");
+        }
+        _services[path] = s;
+    }
+
+    virtual void removeService(const string& path)
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+
+        map<string, ServicePtr>::iterator p = _services.find(path);
+        if(p != _services.end())
+        {
+            _services.erase(p);
+        }
+    }
+
+    virtual AsyncResultPtr callAsync(const MessagePtr& m, const AsyncCallbackPtr& cb)
+    {
+        MessageIPtr mi = MessageIPtr::dynamicCast(m);
+        assert(mi);
+
+        DBusPendingCall* call;
+        if(!::dbus_connection_send_with_reply(_connection, mi->message(), &call, -1))
+        {
+            throw ExceptionI("dbus_connection_send_with_reply failed");
+        }
+        if(!call)
+        {
+            throw ExceptionI("dbus_connection_send_with_reply failed - disconnected?");
+        }
+        return new AsyncResultI(call, cb);
+    }
+
+    virtual void sendAsync(const MessagePtr& m)
+    {
+        MessageIPtr mi = MessageIPtr::dynamicCast(m);
+        assert(mi);
+
+        //
+        // D-Bus queues the message without blocking.
+        //
+        dbus_uint32_t serial;
+        if(!::dbus_connection_send(_connection, mi->message(), &serial))
+        {
+            throw ExceptionI("dbus_connection_send failed");
+        }
+    }
+
+    virtual void close()
+    {
+        ::dbus_connection_close(_connection);
+
+        //
+        // Send the "close" message.
+        //
+        while(::dbus_connection_dispatch(_connection) == DBUS_DISPATCH_DATA_REMAINS)
+            ;
+
+        {
+            IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+            _closed = true;
+            _services.clear();
+        }
+
+        _thread->getThreadControl().join();
+    }
+
+    void connect(bool system)
+    {
+        ErrorWrapper err;
+
+        _connection = ::dbus_bus_get_private(system ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, &err.err);
+        if(err.isSet())
+        {
+            throw ExceptionI(err);
+        }
+        assert(_connection);
+
+        ::dbus_connection_set_exit_on_disconnect(_connection, FALSE);
+
+        if(!::dbus_connection_add_filter(_connection, filterCallback, this, freeConnection))
+        {
+            throw ExceptionI("out of memory calling dbus_connection_add_filter");
+        }
+
+        //
+        // The filter function will only see the message types that we add below.
+        //
+        ::dbus_bus_add_match(_connection, "type='signal'", 0);
+        //::dbus_bus_add_match(_connection, "type='method_call'", 0);
+
+        __incRef(); // __decRef called in freeConnection.
+
+        _thread = new HelperThread(this);
+        _thread->start();
+    }
+
+    DBusConnection* connection()
+    {
+        return _connection;
+    }
+
+    DBusHandlerResult handleMessage(DBusMessage* m)
+    {
+        vector<FilterPtr> filters;
+        map<string, ServicePtr> services;
+        {
+            IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+            filters = _filters;
+            services = _services;
+        }
+
+        MessagePtr msg = MessageI::wrap(m);
+        for(vector<FilterPtr>::iterator p = filters.begin(); p != filters.end(); ++p)
+        {
+            try
+            {
+                if((*p)->handleMessage(this, msg))
+                {
+                    return DBUS_HANDLER_RESULT_HANDLED;
+                }
+            }
+            catch(...)
+            {
+                // Ignore.
+            }
+        }
+
+        if(msg->isMethodCall())
+        {
+            map<string, ServicePtr>::iterator p = services.find(msg->getPath());
+            if(p != _services.end())
+            {
+                try
+                {
+                    p->second->handleMethodCall(this, msg);
+                }
+                catch(...)
+                {
+                    // Ignore.
+                }
+                return DBUS_HANDLER_RESULT_HANDLED;
+            }
+        }
+
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
+
+private:
+
+    void run()
+    {
+        while(::dbus_connection_read_write_dispatch(_connection, 200))
+        {
+            IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+            if(_closed)
+            {
+                break;
+            }
+        }
+    }
+
+    class HelperThread : public IceUtil::Thread
+    {
+    public:
+
+        HelperThread(ConnectionI* con) :
+            _con(con)
+        {
+        }
+
+        void run()
+        {
+            _con->run();
+        }
+
+    private:
+
+        ConnectionI* _con;
+    };
+
+    friend class HelperThread;
+
+    DBusConnection* _connection;
+    IceUtil::ThreadPtr _thread;
+    IceUtil::Monitor<IceUtil::Mutex> _lock;
+    bool _closed;
+    vector<FilterPtr> _filters;
+    map<string, ServicePtr> _services;
+};
+
+static DBusHandlerResult
+filterCallback(DBusConnection*, DBusMessage* message, void* userData)
+{
+    ConnectionI* c = static_cast<ConnectionI*>(userData);
+    assert(c);
+    return c->handleMessage(message);
+}
+
+static void freeConnection(void* p)
+{
+    ConnectionI* c = static_cast<ConnectionI*>(p);
+    assert(c);
+    c->__decRef();
+}
+
+}
+
+TypePtr
+IceBT::DBus::Type::getPrimitive(Kind k)
+{
+    switch(k)
+    {
+    case KindBoolean:
+    case KindByte:
+    case KindUint16:
+    case KindInt16:
+    case KindUint32:
+    case KindInt32:
+    case KindUint64:
+    case KindInt64:
+    case KindDouble:
+    case KindString:
+    case KindObjectPath:
+    case KindSignature:
+    case KindUnixFD:
+        return new PrimitiveType(k);
+    case KindInvalid:
+    case KindArray:
+    case KindVariant:
+    case KindStruct:
+    case KindDictEntry:
+    default:
+        assert(false);
+        return 0;
+    }
+}
+
+string
+IceBT::DBus::ArrayType::getSignature() const
+{
+    string r = DBUS_TYPE_ARRAY_AS_STRING;
+    r += elementType->getSignature();
+    return r;
+}
+
+string
+IceBT::DBus::VariantType::getSignature() const
+{
+    return DBUS_TYPE_VARIANT_AS_STRING;
+}
+
+string
+IceBT::DBus::StructType::getSignature() const
+{
+    string r = "(";
+    for(vector<TypePtr>::const_iterator p = memberTypes.begin(); p != memberTypes.end(); ++p)
+    {
+        r += (*p)->getSignature();
+    }
+    r += ")";
+    return r;
+}
+
+string
+IceBT::DBus::DictEntryType::getSignature() const
+{
+    string r = "{";
+    r += keyType->getSignature();
+    r += valueType->getSignature();
+    r += "}";
+    return r;
+}
+
+MessagePtr
+IceBT::DBus::Message::createCall(const string& dest, const string& path, const string& iface, const string& method)
+{
+    assert(!path.empty() && !method.empty());
+    const char* sdest = dest.empty() ? 0 : dest.c_str();
+    const char* spath = path.c_str();
+    const char* siface = iface.empty() ? 0 : iface.c_str();
+    const char* smethod = method.c_str();
+    DBusMessage* m = ::dbus_message_new_method_call(sdest, spath, siface, smethod);
+    if(!m)
+    {
+        throw ExceptionI("failure creating DBus method call");
+    }
+    return MessageI::adopt(m);
+}
+
+MessagePtr
+IceBT::DBus::Message::createReturn(const MessagePtr& call)
+{
+    MessageIPtr c = MessageIPtr::dynamicCast(call);
+    assert(c);
+    DBusMessage* r = ::dbus_message_new_method_return(c->message());
+    if(!r)
+    {
+        throw ExceptionI("failure creating DBus method return");
+    }
+    return MessageI::adopt(r);
+}
+
+ConnectionPtr
+IceBT::DBus::Connection::getSystemBus()
+{
+    ConnectionI* conn = new ConnectionI;
+    conn->connect(true);
+    return conn;
+}
+
+ConnectionPtr
+IceBT::DBus::Connection::getSessionBus()
+{
+    ConnectionI* conn = new ConnectionI;
+    conn->connect(false);
+    return conn;
+}
+
+void
+IceBT::DBus::initThreads()
+{
+    ::dbus_threads_init_default();
+}
diff --git a/cpp/src/IceBT/DBus.h b/cpp/src/IceBT/DBus.h
new file mode 100644
index 00000000000..0ff914edac4
--- /dev/null
+++ b/cpp/src/IceBT/DBus.h
@@ -0,0 +1,607 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_BT_DBUS_H
+#define ICE_BT_DBUS_H
+
+#include <IceUtil/Shared.h>
+#include <Ice/Handle.h>
+
+using namespace std;
+
+namespace IceBT
+{
+namespace DBus
+{
+
+class Exception
+{
+public:
+
+    std::string reason;
+
+protected:
+
+    Exception() {}
+    Exception(const std::string& s) : reason(s) {}
+};
+
+//
+// Type is the base class for a hierarchy representing DBus data types.
+//
+class Type;
+typedef IceUtil::Handle<Type> TypePtr;
+
+class Type : public IceUtil::SimpleShared
+{
+public:
+
+    enum Kind
+    {
+        KindInvalid,
+        KindBoolean,
+        KindByte,
+        KindUint16,
+        KindInt16,
+        KindUint32,
+        KindInt32,
+        KindUint64,
+        KindInt64,
+        KindDouble,
+        KindString,
+        KindObjectPath,
+        KindSignature,
+        KindUnixFD,
+        KindArray,
+        KindVariant,
+        KindStruct,
+        KindDictEntry
+    };
+
+    static TypePtr getPrimitive(Kind);
+
+    virtual Kind getKind() const = 0;
+    virtual std::string getSignature() const = 0;
+
+protected:
+
+    Type() {}
+};
+
+class ArrayType : public Type
+{
+public:
+
+    ArrayType(const TypePtr& t) :
+        elementType(t)
+    {
+    }
+
+    virtual Kind getKind() const
+    {
+        return KindArray;
+    }
+
+    virtual std::string getSignature() const;
+
+    TypePtr elementType;
+};
+typedef IceUtil::Handle<ArrayType> ArrayTypePtr;
+
+class VariantType : public Type
+{
+public:
+
+    VariantType() {}
+
+    virtual Kind getKind() const
+    {
+        return KindVariant;
+    }
+
+    virtual std::string getSignature() const;
+};
+typedef IceUtil::Handle<VariantType> VariantTypePtr;
+
+class StructType : public Type
+{
+public:
+
+    StructType(const std::vector<TypePtr>& types) :
+        memberTypes(types)
+    {
+    }
+
+    virtual Kind getKind() const
+    {
+        return KindStruct;
+    }
+
+    virtual std::string getSignature() const;
+
+    std::vector<TypePtr> memberTypes;
+};
+typedef IceUtil::Handle<StructType> StructTypePtr;
+
+class DictEntryType : public Type
+{
+public:
+
+    DictEntryType(const TypePtr& k, const TypePtr& v) :
+        keyType(k),
+        valueType(v)
+    {
+    }
+
+    virtual Kind getKind() const
+    {
+        return KindDictEntry;
+    }
+
+    virtual std::string getSignature() const;
+
+    TypePtr keyType;
+    TypePtr valueType;
+};
+typedef IceUtil::Handle<DictEntryType> DictEntryTypePtr;
+
+//
+// Value is the base class of a hierarchy representing DBus data values.
+//
+class Value;
+typedef IceUtil::Handle<Value> ValuePtr;
+
+class Value : public IceUtil::SimpleShared
+{
+public:
+
+    virtual TypePtr getType() const = 0;
+
+    virtual ValuePtr clone() const = 0;
+
+    virtual std::string toString() const = 0;
+
+protected:
+
+    virtual void print(std::ostream&) = 0;
+
+    friend std::ostream& operator<<(std::ostream&, const ValuePtr&);
+};
+
+inline std::ostream&
+operator<<(std::ostream& ostr, const ValuePtr& v)
+{
+    if(v)
+    {
+        v->print(ostr);
+    }
+    else
+    {
+        ostr << "nil";
+    }
+    return ostr;
+}
+
+template<typename E, Type::Kind K>
+class PrimitiveValue : public Value
+{
+public:
+
+    PrimitiveValue() : v(E()), kind(K) {}
+    PrimitiveValue(const E& val) : v(val), kind(K) {}
+
+    virtual TypePtr getType() const
+    {
+        return Type::getPrimitive(kind);
+    }
+
+    virtual ValuePtr clone() const
+    {
+        return new PrimitiveValue(v);
+    }
+
+    virtual std::string toString() const
+    {
+        std::ostringstream out;
+        out << v;
+        return out.str();
+    }
+
+    E v;
+    Type::Kind kind;
+
+protected:
+
+    virtual void print(std::ostream& ostr)
+    {
+        ostr << v;
+    }
+};
+
+typedef PrimitiveValue<bool, Type::KindBoolean> BooleanValue;
+typedef IceUtil::Handle<BooleanValue> BooleanValuePtr;
+typedef PrimitiveValue<unsigned char, Type::KindByte> ByteValue;
+typedef IceUtil::Handle<ByteValue> ByteValuePtr;
+typedef PrimitiveValue<unsigned short, Type::KindUint16> Uint16Value;
+typedef IceUtil::Handle<Uint16Value> Uint16ValuePtr;
+typedef PrimitiveValue<short, Type::KindInt16> Int16Value;
+typedef IceUtil::Handle<Int16Value> Int16ValuePtr;
+typedef PrimitiveValue<unsigned int, Type::KindUint32> Uint32Value;
+typedef IceUtil::Handle<Uint32Value> Uint32ValuePtr;
+typedef PrimitiveValue<int, Type::KindInt32> Int32Value;
+typedef IceUtil::Handle<Int32Value> Int32ValuePtr;
+typedef PrimitiveValue<unsigned long long, Type::KindUint64> Uint64Value;
+typedef IceUtil::Handle<Uint64Value> Uint64ValuePtr;
+typedef PrimitiveValue<long long, Type::KindInt64> Int64Value;
+typedef IceUtil::Handle<Int64Value> Int64ValuePtr;
+typedef PrimitiveValue<double, Type::KindDouble> DoubleValue;
+typedef IceUtil::Handle<DoubleValue> DoubleValuePtr;
+typedef PrimitiveValue<string, Type::KindString> StringValue;
+typedef IceUtil::Handle<StringValue> StringValuePtr;
+typedef PrimitiveValue<string, Type::KindObjectPath> ObjectPathValue;
+typedef IceUtil::Handle<ObjectPathValue> ObjectPathValuePtr;
+typedef PrimitiveValue<string, Type::KindSignature> SignatureValue;
+typedef IceUtil::Handle<SignatureValue> SignatureValuePtr;
+typedef PrimitiveValue<unsigned int, Type::KindUnixFD> UnixFDValue;
+typedef IceUtil::Handle<UnixFDValue> UnixFDValuePtr;
+
+class VariantValue;
+typedef IceUtil::Handle<VariantValue> VariantValuePtr;
+
+class VariantValue : public Value
+{
+public:
+
+    VariantValue() : _type(new VariantType) {}
+
+    VariantValue(const ValuePtr& val) :
+        v(val),
+        _type(new VariantType)
+    {
+    }
+
+    virtual TypePtr getType() const
+    {
+        return _type;
+    }
+
+    virtual ValuePtr clone() const
+    {
+        return const_cast<VariantValue*>(this);
+    }
+
+    virtual std::string toString() const
+    {
+        return v ? v->toString() : "nil";
+    }
+
+    ValuePtr v;
+
+protected:
+
+    virtual void print(std::ostream& ostr)
+    {
+        ostr << v;
+    }
+
+private:
+
+    TypePtr _type;
+};
+
+class DictEntryValue;
+typedef IceUtil::Handle<DictEntryValue> DictEntryValuePtr;
+
+class DictEntryValue : public Value
+{
+public:
+
+    DictEntryValue(const DictEntryTypePtr& t) : _type(t) {}
+
+    DictEntryValue(const DictEntryTypePtr& t, const ValuePtr& k, const ValuePtr& v) :
+        key(k),
+        value(v),
+        _type(t)
+    {
+    }
+
+    virtual TypePtr getType() const
+    {
+        return _type;
+    }
+
+    virtual ValuePtr clone() const
+    {
+        DictEntryValuePtr r = new DictEntryValue(_type);
+        r->key = key->clone();
+        r->value = value->clone();
+        return r;
+    }
+
+    virtual std::string toString() const
+    {
+        std::ostringstream out;
+        out << key->toString() << "=" << value->toString();
+        return out.str();
+    }
+
+    ValuePtr key;
+    ValuePtr value;
+
+protected:
+
+    virtual void print(std::ostream& ostr)
+    {
+        ostr << '{' << key << ": " << value << '}' << endl;
+    }
+
+private:
+
+    DictEntryTypePtr _type;
+};
+
+class ArrayValue;
+typedef IceUtil::Handle<ArrayValue> ArrayValuePtr;
+
+class ArrayValue : public Value
+{
+public:
+
+    ArrayValue(const TypePtr& t) : _type(t) {}
+
+    virtual TypePtr getType() const
+    {
+        return _type;
+    }
+
+    virtual ValuePtr clone() const
+    {
+        ArrayValuePtr r = new ArrayValue(_type);
+        for(std::vector<ValuePtr>::const_iterator p = elements.begin(); p != elements.end(); ++p)
+        {
+            r->elements.push_back((*p)->clone());
+        }
+        return r;
+    }
+
+    virtual std::string toString() const
+    {
+        std::ostringstream out;
+        for(std::vector<ValuePtr>::const_iterator p = elements.begin(); p != elements.end(); ++p)
+        {
+            if(p != elements.begin())
+            {
+                out << ',';
+            }
+            out << (*p)->toString();
+        }
+        return out.str();
+    }
+
+    void toStringMap(std::map<std::string, ValuePtr>& m)
+    {
+        for(std::vector<ValuePtr>::const_iterator p = elements.begin(); p != elements.end(); ++p)
+        {
+            DictEntryValuePtr de = DictEntryValuePtr::dynamicCast(*p);
+            assert(de);
+            StringValuePtr s = StringValuePtr::dynamicCast(de->key);
+            assert(s);
+            m[s->v] = de->value;
+        }
+    }
+
+    std::vector<ValuePtr> elements;
+
+protected:
+
+    virtual void print(std::ostream& ostr)
+    {
+        for(std::vector<ValuePtr>::const_iterator p = elements.begin(); p != elements.end(); ++p)
+        {
+            ostr << *p << endl;
+        }
+    }
+
+private:
+
+    TypePtr _type;
+};
+
+class StructValue;
+typedef IceUtil::Handle<StructValue> StructValuePtr;
+
+class StructValue : public Value
+{
+public:
+
+    StructValue(const StructTypePtr& t) : _type(t) {}
+
+    virtual TypePtr getType() const
+    {
+        return _type;
+    }
+
+    virtual ValuePtr clone() const
+    {
+        StructValuePtr r = new StructValue(_type);
+        for(std::vector<ValuePtr>::const_iterator p = members.begin(); p != members.end(); ++p)
+        {
+            r->members.push_back((*p)->clone());
+        }
+        return r;
+    }
+
+    virtual std::string toString() const
+    {
+        std::ostringstream out;
+        for(std::vector<ValuePtr>::const_iterator p = members.begin(); p != members.end(); ++p)
+        {
+            if(p != members.begin())
+            {
+                out << ',';
+            }
+            out << (*p)->toString();
+        }
+        return out.str();
+    }
+
+    std::vector<ValuePtr> members;
+
+protected:
+
+    virtual void print(std::ostream& ostr)
+    {
+        for(std::vector<ValuePtr>::const_iterator p = members.begin(); p != members.end(); ++p)
+        {
+            ostr << *p << endl;
+        }
+    }
+
+private:
+
+    StructTypePtr _type;
+};
+
+//
+// Message encapsulates a DBus message. It only provides the functionality required by the IceBT transport.
+//
+class Message;
+typedef IceUtil::Handle<Message> MessagePtr;
+
+class Message : public IceUtil::Shared
+{
+public:
+
+    virtual bool isError() const = 0;
+    virtual std::string getErrorName() const = 0;
+    virtual void throwException() = 0;
+
+    virtual bool isSignal() const = 0;
+    virtual bool isMethodCall() const = 0;
+    virtual bool isMethodReturn() const = 0;
+
+    virtual std::string getPath() const = 0;
+    virtual std::string getInterface() const = 0;
+    virtual std::string getMember() const = 0;
+    virtual std::string getDestination() const = 0;
+
+    //
+    // Writing arguments.
+    //
+    virtual void write(const ValuePtr&) = 0;
+    virtual void write(const std::vector<ValuePtr>&) = 0;
+
+    //
+    // Reading arguments.
+    //
+    virtual bool checkTypes(const std::vector<TypePtr>&) const = 0;
+    virtual ValuePtr read() = 0;
+    virtual std::vector<ValuePtr> readAll() = 0;
+
+    static MessagePtr createCall(const string& dest, const string& path, const string& iface, const string& method);
+    static MessagePtr createReturn(const MessagePtr& call);
+};
+
+class AsyncResult;
+typedef IceUtil::Handle<AsyncResult> AsyncResultPtr;
+
+class AsyncCallback : public IceUtil::Shared
+{
+public:
+
+    virtual void completed(const AsyncResultPtr&) = 0;
+};
+typedef IceUtil::Handle<AsyncCallback> AsyncCallbackPtr;
+
+//
+// The result of an asynchronous DBus operation.
+//
+class AsyncResult : public IceUtil::Shared
+{
+public:
+
+    virtual bool isPending() const = 0;
+    virtual bool isComplete() const = 0;
+
+    virtual MessagePtr waitUntilFinished() const = 0;
+
+    virtual MessagePtr getReply() const = 0;
+
+    virtual void setCallback(const AsyncCallbackPtr&) = 0;
+};
+
+class Connection;
+typedef IceUtil::Handle<Connection> ConnectionPtr;
+
+//
+// Allows a subclass to intercept DBus messages.
+//
+class Filter : public IceUtil::Shared
+{
+public:
+
+    //
+    // Return true if message is handled or false otherwise.
+    //
+    virtual bool handleMessage(const ConnectionPtr&, const MessagePtr&) = 0;
+};
+typedef IceUtil::Handle<Filter> FilterPtr;
+
+//
+// Allows a subclass to receive DBus method invocations.
+//
+class Service : public IceUtil::Shared
+{
+public:
+
+    virtual void handleMethodCall(const ConnectionPtr&, const MessagePtr&) = 0;
+};
+typedef IceUtil::Handle<Service> ServicePtr;
+
+//
+// Encapsulates a DBus connection.
+//
+class Connection : public IceUtil::Shared
+{
+public:
+
+    static ConnectionPtr getSystemBus();
+    static ConnectionPtr getSessionBus();
+
+    virtual void addFilter(const FilterPtr&) = 0;
+    virtual void removeFilter(const FilterPtr&) = 0;
+
+    virtual void addService(const std::string&, const ServicePtr&) = 0;
+    virtual void removeService(const std::string&) = 0;
+
+    //
+    // Asynchronously invokes a method call. The returned AsyncResult can be used
+    // to determine completion status and obtain the reply, or supply a callback
+    // to be notified when the call completes.
+    //
+    virtual AsyncResultPtr callAsync(const MessagePtr&, const AsyncCallbackPtr& = 0) = 0;
+
+    //
+    // Sends a message without blocking. Use this to send signals and replies.
+    //
+    virtual void sendAsync(const MessagePtr&) = 0;
+
+    virtual void close() = 0;
+
+protected:
+
+    Connection() {}
+};
+
+void initThreads();
+
+}
+}
+
+#endif
diff --git a/cpp/src/IceBT/EndpointI.cpp b/cpp/src/IceBT/EndpointI.cpp
new file mode 100644
index 00000000000..5c0d31cc8ef
--- /dev/null
+++ b/cpp/src/IceBT/EndpointI.cpp
@@ -0,0 +1,763 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceBT/EndpointI.h>
+#include <IceBT/AcceptorI.h>
+#include <IceBT/ConnectorI.h>
+#include <IceBT/Engine.h>
+#include <IceBT/Instance.h>
+#include <IceBT/Util.h>
+
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
+#include <Ice/DefaultsAndOverrides.h>
+#include <Ice/HashUtil.h>
+#include <Ice/LocalException.h>
+#include <Ice/Logger.h>
+#include <Ice/Object.h>
+#include <Ice/Properties.h>
+#include <IceUtil/Random.h>
+#include <IceUtil/StringUtil.h>
+#include <IceUtil/UUID.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceBT;
+
+#ifndef ICE_CPP11_MAPPING
+IceUtil::Shared* IceBT::upCast(EndpointI* p) { return p; }
+#endif
+
+namespace
+{
+
+struct RandomNumberGenerator : public std::unary_function<ptrdiff_t, ptrdiff_t>
+{
+    ptrdiff_t operator()(ptrdiff_t d)
+    {
+        return IceUtilInternal::random(static_cast<int>(d));
+    }
+};
+
+}
+
+IceBT::EndpointI::EndpointI(const InstancePtr& instance, const string& addr, const string& uuid, const string& name,
+                            Int channel, Int timeout, const string& connectionId, bool compress) :
+    _instance(instance),
+    _addr(addr),
+    _uuid(uuid),
+    _name(name),
+    _channel(channel),
+    _timeout(timeout),
+    _connectionId(connectionId),
+    _compress(compress),
+    _hashValue(0),
+    _findPending(false)
+{
+    hashInit();
+}
+
+IceBT::EndpointI::EndpointI(const InstancePtr& instance) :
+    _instance(instance),
+    _channel(0),
+    _timeout(instance->defaultTimeout()),
+    _compress(false),
+    _hashValue(0),
+    _findPending(false)
+{
+}
+
+IceBT::EndpointI::EndpointI(const InstancePtr& instance, InputStream* s) :
+    _instance(instance),
+    _channel(0),
+    _timeout(-1),
+    _compress(false),
+    _hashValue(0),
+    _findPending(false)
+{
+    //
+    // _name and _channel are not marshaled.
+    //
+    s->read(const_cast<string&>(_addr), false);
+    s->read(const_cast<string&>(_uuid), false);
+    s->read(const_cast<Int&>(_timeout));
+    s->read(const_cast<bool&>(_compress));
+    hashInit();
+}
+
+void
+IceBT::EndpointI::streamWriteImpl(OutputStream* s) const
+{
+    //
+    // _name and _channel are not marshaled.
+    //
+    s->write(_addr, false);
+    s->write(_uuid, false);
+    s->write(_timeout);
+    s->write(_compress);
+}
+
+Ice::Short
+IceBT::EndpointI::type() const
+{
+    return _instance->type();
+}
+
+const string&
+IceBT::EndpointI::protocol() const
+{
+    return _instance->protocol();
+}
+
+Int
+IceBT::EndpointI::timeout() const
+{
+    return _timeout;
+}
+
+IceInternal::EndpointIPtr
+IceBT::EndpointI::timeout(Int timeout) const
+{
+    if(timeout == _timeout)
+    {
+        return shared_from_this();
+    }
+    else
+    {
+        return ICE_MAKE_SHARED(EndpointI, _instance, _addr, _uuid, _name, _channel, timeout, _connectionId, _compress);
+    }
+}
+
+const string&
+IceBT::EndpointI::connectionId() const
+{
+    return _connectionId;
+}
+
+IceInternal::EndpointIPtr
+IceBT::EndpointI::connectionId(const string& connectionId) const
+{
+    if(connectionId == _connectionId)
+    {
+        return shared_from_this();
+    }
+    else
+    {
+        return ICE_MAKE_SHARED(EndpointI, _instance, _addr, _uuid, _name, _channel, _timeout, connectionId, _compress);
+    }
+}
+
+bool
+IceBT::EndpointI::compress() const
+{
+    return _compress;
+}
+
+IceInternal::EndpointIPtr
+IceBT::EndpointI::compress(bool compress) const
+{
+    if(compress == _compress)
+    {
+        return shared_from_this();
+    }
+    else
+    {
+        return ICE_MAKE_SHARED(EndpointI, _instance, _addr, _uuid, _name, _channel, _timeout, _connectionId, compress);
+    }
+}
+
+bool
+IceBT::EndpointI::datagram() const
+{
+    return false;
+}
+
+bool
+IceBT::EndpointI::secure() const
+{
+    return _instance->secure();
+}
+
+IceInternal::TransceiverPtr
+IceBT::EndpointI::transceiver() const
+{
+    return 0;
+}
+
+void
+IceBT::EndpointI::connectors_async(EndpointSelectionType selType, const IceInternal::EndpointI_connectorsPtr& cb) const
+{
+    IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+
+    if(!_findPending)
+    {
+        assert(_callbacks.empty());
+        const_cast<bool&>(_findPending) = true;
+        if(_instance->traceLevel() > 1)
+        {
+            ostringstream ostr;
+            ostr << "searching for service " << _uuid << " at " << _addr;
+            _instance->logger()->trace(_instance->traceCategory(), ostr.str());
+        }
+        _instance->engine()->findService(_addr, _uuid, new FindCallbackI(shared_from_this(), selType));
+    }
+
+    const_cast<vector<IceInternal::EndpointI_connectorsPtr>&>(_callbacks).push_back(cb);
+}
+
+IceInternal::AcceptorPtr
+IceBT::EndpointI::acceptor(const string& adapterName) const
+{
+    return new AcceptorI(shared_from_this(), _instance, adapterName, _addr, _uuid, _name, _channel);
+}
+
+vector<IceInternal::EndpointIPtr>
+IceBT::EndpointI::expand() const
+{
+    //
+    // Nothing to do here.
+    //
+    vector<IceInternal::EndpointIPtr> endps;
+    endps.push_back(shared_from_this());
+    return endps;
+}
+
+bool
+IceBT::EndpointI::equivalent(const IceInternal::EndpointIPtr& endpoint) const
+{
+    const EndpointI* btEndpointI = dynamic_cast<const EndpointI*>(endpoint.get());
+    if(!btEndpointI)
+    {
+        return false;
+    }
+    return btEndpointI->type() == type() && btEndpointI->_addr == _addr && btEndpointI->_uuid == _uuid;
+}
+
+bool
+#ifdef ICE_CPP11_MAPPING
+IceBT::EndpointI::operator==(const Ice::Endpoint& r) const
+#else
+IceBT::EndpointI::operator==(const Ice::LocalObject& r) const
+#endif
+{
+    const EndpointI* p = dynamic_cast<const EndpointI*>(&r);
+    if(!p)
+    {
+        return false;
+    }
+
+    if(this == p)
+    {
+        return true;
+    }
+
+    if(_addr != p->_addr)
+    {
+        return false;
+    }
+
+    if(_uuid != p->_uuid)
+    {
+        return false;
+    }
+
+    if(_connectionId != p->_connectionId)
+    {
+        return false;
+    }
+
+    if(_channel != p->_channel)
+    {
+        return false;
+    }
+
+    if(_timeout != p->_timeout)
+    {
+        return false;
+    }
+
+    if(_compress != p->_compress)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool
+#ifdef ICE_CPP11_MAPPING
+IceBT::EndpointI::operator<(const Ice::Endpoint& r) const
+#else
+IceBT::EndpointI::operator<(const Ice::LocalObject& r) const
+#endif
+{
+    const EndpointI* p = dynamic_cast<const EndpointI*>(&r);
+    if(!p)
+    {
+        const IceInternal::EndpointI* e = dynamic_cast<const IceInternal::EndpointI*>(&r);
+        if(!e)
+        {
+            return false;
+        }
+        return type() < e->type();
+    }
+
+    if(this == p)
+    {
+        return false;
+    }
+
+    if(type() < p->type())
+    {
+        return true;
+    }
+    else if(p->type() < type())
+    {
+        return false;
+    }
+
+    if(_addr < p->_addr)
+    {
+        return true;
+    }
+    else if(p->_addr < _addr)
+    {
+        return false;
+    }
+
+    if(_uuid < p->_uuid)
+    {
+        return true;
+    }
+    else if(p->_uuid < _uuid)
+    {
+        return false;
+    }
+
+    if(_connectionId < p->_connectionId)
+    {
+        return true;
+    }
+    else if(p->_connectionId < _connectionId)
+    {
+        return false;
+    }
+
+    if(_channel < p->_channel)
+    {
+        return true;
+    }
+    else if(p->_channel < _channel)
+    {
+        return false;
+    }
+
+    if(_timeout < p->_timeout)
+    {
+        return true;
+    }
+    else if(p->_timeout < _timeout)
+    {
+        return false;
+    }
+
+    if(!_compress && p->_compress)
+    {
+        return true;
+    }
+    else if(p->_compress < _compress)
+    {
+        return false;
+    }
+
+    return false;
+}
+
+Ice::Int
+IceBT::EndpointI::hash() const
+{
+    return _hashValue;
+}
+
+string
+IceBT::EndpointI::options() const
+{
+    //
+    // WARNING: Certain features, such as proxy validation in Glacier2,
+    // depend on the format of proxy strings. Changes to toString() and
+    // methods called to generate parts of the reference string could break
+    // these features. Please review for all features that depend on the
+    // format of proxyToString() before changing this and related code.
+    //
+    ostringstream s;
+
+    if(!_addr.empty())
+    {
+        s << " -a ";
+        bool addQuote = _addr.find(':') != string::npos;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+        s << _addr;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+    }
+
+    if(!_uuid.empty())
+    {
+        s << " -u ";
+        bool addQuote = _uuid.find(':') != string::npos;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+        s << _uuid;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+    }
+
+    if(_channel > 0)
+    {
+        s << " -c " << _channel;
+    }
+
+    if(_timeout == -1)
+    {
+        s << " -t infinite";
+    }
+    else
+    {
+        s << " -t " << _timeout;
+    }
+
+    if(_compress)
+    {
+        s << " -z";
+    }
+
+    return s.str();
+}
+
+Ice::EndpointInfoPtr
+IceBT::EndpointI::getInfo() const
+{
+    EndpointInfoPtr info = ICE_MAKE_SHARED(EndpointInfoI, shared_from_this());
+    info->addr = _addr;
+    info->uuid = _uuid;
+    return info;
+}
+
+void
+IceBT::EndpointI::initWithOptions(vector<string>& args, bool oaEndpoint)
+{
+    IceInternal::EndpointI::initWithOptions(args);
+
+    if(_addr.empty())
+    {
+        const_cast<string&>(_addr) = _instance->defaultHost();
+    }
+
+    if(_addr.empty() || _addr == "*")
+    {
+        if(oaEndpoint)
+        {
+            //
+            // getDefaultAdapterAddress can throw BluetoothException.
+            //
+            const_cast<string&>(_addr) = _instance->engine()->getDefaultAdapterAddress();
+        }
+        else
+        {
+            Ice::EndpointParseException ex(__FILE__, __LINE__);
+            ex.str = "a device address must be specified using the -a option or Ice.Default.Host";
+            throw ex;
+        }
+    }
+
+    if(_name.empty())
+    {
+        const_cast<string&>(_name) = "Ice Service";
+    }
+
+    if(_uuid.empty())
+    {
+        if(oaEndpoint)
+        {
+            //
+            // Generate a UUID for object adapters that don't specify one.
+            //
+            const_cast<string&>(_uuid) = IceUtil::generateUUID();
+        }
+        else
+        {
+            Ice::EndpointParseException ex(__FILE__, __LINE__);
+            ex.str = "a UUID must be specified using the -u option";
+            throw ex;
+        }
+    }
+
+    if(_channel < 0)
+    {
+        const_cast<Int&>(_channel) = 0;
+    }
+
+    if(!oaEndpoint && _channel != 0)
+    {
+        Ice::EndpointParseException ex(__FILE__, __LINE__);
+        ex.str = "the -c option can only be used for object adapter endpoints";
+        throw ex;
+    }
+
+    hashInit();
+}
+
+IceBT::EndpointIPtr
+IceBT::EndpointI::endpoint(const AcceptorIPtr& acceptor) const
+{
+    return ICE_MAKE_SHARED(EndpointI, _instance, _addr, _uuid, _name, acceptor->effectiveChannel(), _timeout, _connectionId,
+                           _compress);
+}
+
+void
+IceBT::EndpointI::hashInit()
+{
+    Int h = 5381;
+    IceInternal::hashAdd(h, _addr);
+    IceInternal::hashAdd(h, _uuid);
+    IceInternal::hashAdd(h, _timeout);
+    IceInternal::hashAdd(h, _connectionId);
+    IceInternal::hashAdd(h, _compress);
+    const_cast<Int&>(_hashValue) = h;
+}
+
+bool
+IceBT::EndpointI::checkOption(const string& option, const string& argument, const string& endpoint)
+{
+    string arg = IceUtilInternal::trim(argument);
+    if(option == "-a")
+    {
+        if(arg.empty())
+        {
+            Ice::EndpointParseException ex(__FILE__, __LINE__);
+            ex.str = "no argument provided for -a option in endpoint " + endpoint;
+            throw ex;
+        }
+        if(arg != "*" && !isValidDeviceAddress(arg))
+        {
+            Ice::EndpointParseException ex(__FILE__, __LINE__);
+            ex.str = "invalid argument provided for -a option in endpoint " + endpoint;
+            throw ex;
+        }
+        const_cast<string&>(_addr) = arg;
+    }
+    else if(option == "-u")
+    {
+        if(arg.empty())
+        {
+            Ice::EndpointParseException ex(__FILE__, __LINE__);
+            ex.str = "no argument provided for -u option in endpoint " + endpoint;
+            throw ex;
+        }
+        const_cast<string&>(_uuid) = arg;
+    }
+    else if(option == "-c")
+    {
+        if(arg.empty())
+        {
+            EndpointParseException ex(__FILE__, __LINE__);
+            ex.str = "no argument provided for -c option in endpoint " + endpoint;
+            throw ex;
+        }
+
+        istringstream t(argument);
+        if(!(t >> const_cast<Int&>(_channel)) || !t.eof() || _channel < 0 || _channel > 30)
+        {
+            EndpointParseException ex(__FILE__, __LINE__);
+            ex.str = "invalid channel value `" + arg + "' in endpoint " + endpoint;
+            throw ex;
+        }
+    }
+    else if(option == "-t")
+    {
+        if(arg.empty())
+        {
+            EndpointParseException ex(__FILE__, __LINE__);
+            ex.str = "no argument provided for -t option in endpoint " + endpoint;
+            throw ex;
+        }
+
+        if(arg == "infinite")
+        {
+            const_cast<Int&>(_timeout) = -1;
+        }
+        else
+        {
+            istringstream t(argument);
+            if(!(t >> const_cast<Int&>(_timeout)) || !t.eof() || _timeout < 1)
+            {
+                EndpointParseException ex(__FILE__, __LINE__);
+                ex.str = "invalid timeout value `" + arg + "' in endpoint " + endpoint;
+                throw ex;
+            }
+        }
+    }
+    else if(option == "-z")
+    {
+        if(!arg.empty())
+        {
+            EndpointParseException ex(__FILE__, __LINE__);
+            ex.str = "unexpected argument `" + arg + "' provided for -z option in " + endpoint;
+            throw ex;
+        }
+        const_cast<bool&>(_compress) = true;
+    }
+    else if(option == "--name")
+    {
+        if(arg.empty())
+        {
+            Ice::EndpointParseException ex(__FILE__, __LINE__);
+            ex.str = "no argument provided for --name option in endpoint " + endpoint;
+            throw ex;
+        }
+        const_cast<string&>(_name) = arg;
+    }
+    else
+    {
+        return false;
+    }
+    return true;
+}
+
+void
+IceBT::EndpointI::findCompleted(const vector<int>& channels, EndpointSelectionType selType)
+{
+    assert(!channels.empty());
+
+    vector<IceInternal::ConnectorPtr> connectors;
+    for(vector<int>::const_iterator p = channels.begin(); p != channels.end(); ++p)
+    {
+        connectors.push_back(new ConnectorI(_instance, createAddr(_addr, *p), _uuid, _timeout, _connectionId));
+    }
+
+    if(selType == Ice::Random && connectors.size() > 1)
+    {
+        RandomNumberGenerator rng;
+        random_shuffle(connectors.begin(), connectors.end(), rng);
+    }
+
+    vector<IceInternal::EndpointI_connectorsPtr> callbacks;
+
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+        assert(!_callbacks.empty());
+        callbacks.swap(_callbacks);
+        _findPending = false;
+    }
+
+    for(vector<IceInternal::EndpointI_connectorsPtr>::iterator p = callbacks.begin(); p != callbacks.end(); ++p)
+    {
+        (*p)->connectors(connectors);
+    }
+}
+
+void
+IceBT::EndpointI::findException(const LocalException& ex)
+{
+    vector<IceInternal::EndpointI_connectorsPtr> callbacks;
+
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+        assert(!_callbacks.empty());
+        callbacks.swap(_callbacks);
+        _findPending = false;
+    }
+
+    for(vector<IceInternal::EndpointI_connectorsPtr>::iterator p = callbacks.begin(); p != callbacks.end(); ++p)
+    {
+        (*p)->exception(ex);
+    }
+}
+
+IceBT::EndpointInfoI::EndpointInfoI(const EndpointIPtr& endpoint) : _endpoint(endpoint)
+{
+}
+
+IceBT::EndpointInfoI::~EndpointInfoI()
+{
+}
+
+Ice::Short
+IceBT::EndpointInfoI::type() const
+{
+    return _endpoint->type();
+}
+
+bool
+IceBT::EndpointInfoI::datagram() const
+{
+    return _endpoint->datagram();
+}
+
+bool
+IceBT::EndpointInfoI::secure() const
+{
+    return _endpoint->secure();
+}
+
+IceBT::EndpointFactoryI::EndpointFactoryI(const InstancePtr& instance) : _instance(instance)
+{
+}
+
+IceBT::EndpointFactoryI::~EndpointFactoryI()
+{
+}
+
+Short
+IceBT::EndpointFactoryI::type() const
+{
+    return _instance->type();
+}
+
+string
+IceBT::EndpointFactoryI::protocol() const
+{
+    return _instance->protocol();
+}
+
+IceInternal::EndpointIPtr
+IceBT::EndpointFactoryI::create(vector<string>& args, bool oaEndpoint) const
+{
+    EndpointIPtr endpt = ICE_MAKE_SHARED(EndpointI, _instance);
+    endpt->initWithOptions(args, oaEndpoint);
+    return endpt;
+}
+
+IceInternal::EndpointIPtr
+IceBT::EndpointFactoryI::read(InputStream* s) const
+{
+    return ICE_MAKE_SHARED(EndpointI, _instance, s);
+}
+
+void
+IceBT::EndpointFactoryI::destroy()
+{
+    _instance = 0;
+}
+
+IceInternal::EndpointFactoryPtr
+IceBT::EndpointFactoryI::clone(const IceInternal::ProtocolInstancePtr& instance,
+                               const IceInternal::EndpointFactoryPtr&) const
+{
+    return new EndpointFactoryI(new Instance(_instance->engine(), instance->type(), instance->protocol()));
+}
diff --git a/cpp/src/IceBT/EndpointI.h b/cpp/src/IceBT/EndpointI.h
new file mode 100644
index 00000000000..f0d2433d122
--- /dev/null
+++ b/cpp/src/IceBT/EndpointI.h
@@ -0,0 +1,156 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_BT_ENDPOINT_I_H
+#define ICE_BT_ENDPOINT_I_H
+
+#include <Ice/EndpointI.h>
+#include <Ice/EndpointFactory.h>
+#include <IceBT/Config.h>
+#include <IceBT/EndpointInfo.h>
+#include <IceBT/Engine.h>
+#include <IceBT/InstanceF.h>
+#include <IceUtil/Thread.h>
+
+namespace IceBT
+{
+
+class EndpointI : public IceInternal::EndpointI, public Ice::EnableSharedFromThis<EndpointI>
+{
+public:
+
+    EndpointI(const InstancePtr&, const std::string&, const std::string&, const std::string&, Ice::Int,
+              Ice::Int, const std::string&, bool);
+    EndpointI(const InstancePtr&);
+    EndpointI(const InstancePtr&, Ice::InputStream*);
+
+    virtual void streamWriteImpl(Ice::OutputStream*) const;
+    virtual Ice::Short type() const;
+    virtual const std::string& protocol() const;
+    virtual Ice::Int timeout() const;
+    virtual IceInternal::EndpointIPtr timeout(Ice::Int) const;
+    virtual const std::string& connectionId() const;
+    virtual IceInternal::EndpointIPtr connectionId(const std::string&) const;
+    virtual bool compress() const;
+    virtual IceInternal::EndpointIPtr compress(bool) const;
+    virtual bool datagram() const;
+    virtual bool secure() const;
+    virtual IceInternal::TransceiverPtr transceiver() const;
+    virtual void connectors_async(Ice::EndpointSelectionType, const IceInternal::EndpointI_connectorsPtr&) const;
+    virtual IceInternal::AcceptorPtr acceptor(const std::string&) const;
+    virtual std::vector<IceInternal::EndpointIPtr> expand() const;
+    virtual bool equivalent(const IceInternal::EndpointIPtr&) const;
+
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const Ice::Endpoint&) const;
+    virtual bool operator<(const Ice::Endpoint&) const;
+#else
+    virtual bool operator==(const Ice::LocalObject&) const;
+    virtual bool operator<(const Ice::LocalObject&) const;
+#endif
+
+    virtual Ice::Int hash() const;
+
+    virtual std::string options() const;
+
+    Ice::EndpointInfoPtr getInfo() const;
+
+    void initWithOptions(std::vector<std::string>&, bool);
+
+    EndpointIPtr endpoint(const AcceptorIPtr&) const;
+
+private:
+
+    void hashInit();
+    bool checkOption(const std::string&, const std::string&, const std::string&);
+
+    void findCompleted(const std::vector<int>&, Ice::EndpointSelectionType);
+    void findException(const Ice::LocalException&);
+
+    class FindCallbackI : public FindServiceCallback
+    {
+    public:
+
+        FindCallbackI(const EndpointIPtr& e, Ice::EndpointSelectionType selType) :
+            _endpoint(e),
+            _selType(selType)
+        {
+        }
+
+        virtual void completed(const std::vector<int>& channels)
+        {
+            _endpoint->findCompleted(channels, _selType);
+        }
+
+        virtual void exception(const Ice::LocalException& ex)
+        {
+            _endpoint->findException(ex);
+        }
+
+        EndpointIPtr _endpoint;
+        Ice::EndpointSelectionType _selType;
+    };
+    friend class FindCallbackI;
+
+    const InstancePtr _instance;
+    const std::string _addr;
+    const std::string _uuid;
+    const std::string _name;
+    const Ice::Int _channel;
+    const Ice::Int _timeout;
+    const std::string _connectionId;
+    const bool _compress;
+    const Ice::Int _hashValue;
+    IceUtil::Monitor<IceUtil::Mutex> _lock;
+    bool _findPending;
+    std::vector<IceInternal::EndpointI_connectorsPtr> _callbacks;
+};
+
+class EndpointInfoI : public EndpointInfo
+{
+public:
+
+    EndpointInfoI(const EndpointIPtr&);
+    virtual ~EndpointInfoI();
+
+    virtual Ice::Short type() const;
+    virtual bool datagram() const;
+    virtual bool secure() const;
+
+private:
+
+    const EndpointIPtr _endpoint;
+};
+
+class EndpointFactoryI : public IceInternal::EndpointFactory
+{
+public:
+
+    virtual ~EndpointFactoryI();
+
+    virtual Ice::Short type() const;
+    virtual std::string protocol() const;
+    virtual IceInternal::EndpointIPtr create(std::vector<std::string>&, bool) const;
+    virtual IceInternal::EndpointIPtr read(Ice::InputStream*) const;
+    virtual void destroy();
+
+    virtual IceInternal::EndpointFactoryPtr clone(const IceInternal::ProtocolInstancePtr&,
+                                                  const IceInternal::EndpointFactoryPtr&) const;
+
+private:
+
+    EndpointFactoryI(const InstancePtr&);
+    friend class PluginI;
+
+    InstancePtr _instance;
+};
+
+}
+
+#endif
diff --git a/cpp/src/IceBT/Engine.cpp b/cpp/src/IceBT/Engine.cpp
new file mode 100644
index 00000000000..ff970db0f63
--- /dev/null
+++ b/cpp/src/IceBT/Engine.cpp
@@ -0,0 +1,1017 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceBT/Engine.h>
+#include <IceBT/DBus.h>
+#include <IceBT/Util.h>
+#include <Ice/LocalException.h>
+#include <IceUtil/StringUtil.h>
+#include <IceUtil/Thread.h>
+#include <IceUtil/UUID.h>
+#include <IceXML/Parser.h>
+
+#include <stack>
+
+using namespace std;
+using namespace Ice;
+using namespace IceBT;
+
+IceUtil::Shared* IceBT::upCast(IceBT::Engine* p) { return p; }
+
+typedef map<string, DBus::VariantValuePtr> VariantMap;
+
+namespace
+{
+
+void extractProperties(const DBus::ValuePtr& v, VariantMap& vm)
+{
+    //
+    // The given value is a dictionary structured like this:
+    //
+    //   Key: Property name
+    //   Value: Property value (variant)
+    //
+
+    assert(v->getType()->getKind() == DBus::Type::KindArray);
+    DBus::ArrayValuePtr props = DBus::ArrayValuePtr::dynamicCast(v);
+    for(vector<DBus::ValuePtr>::const_iterator s = props->elements.begin(); s != props->elements.end(); ++s)
+    {
+        assert((*s)->getType()->getKind() == DBus::Type::KindDictEntry);
+        DBus::DictEntryValuePtr pe = DBus::DictEntryValuePtr::dynamicCast(*s);
+        assert(pe->key->getType()->getKind() == DBus::Type::KindString);
+        DBus::StringValuePtr propName = DBus::StringValuePtr::dynamicCast(pe->key);
+        assert(pe->value->getType()->getKind() == DBus::Type::KindVariant);
+        vm[propName->v] = DBus::VariantValuePtr::dynamicCast(pe->value);
+    }
+}
+
+}
+
+namespace IceBT
+{
+
+//
+// Engine delegates to BluetoothService.
+//
+class BluetoothService : public DBus::Filter
+{
+public:
+
+    typedef map<string, VariantMap> InterfacePropertiesMap;
+
+    BluetoothService() :
+        _destroyed(false)
+    {
+        DBus::initThreads();
+
+        try
+        {
+            //
+            // Block while we establish a DBus connection.
+            //
+            _dbusConnection = DBus::Connection::getSystemBus();
+        }
+        catch(const DBus::Exception& ex)
+        {
+            throw BluetoothException(__FILE__, __LINE__, ex.reason);
+        }
+
+        _dbusConnection->addFilter(this);
+
+        try
+        {
+            //
+            // Use a call DefaultAdapter() to verify that the Bluetooth daemon is present and
+            // uses the expected version (BlueZ 4). If the system is running BlueZ 5, this call
+            // will return the error org.freedesktop.DBus.Error.UnknownMethod.
+            //
+            call("/", "org.bluez.Manager", "DefaultAdapter");
+        }
+        catch(const DBus::Exception& ex)
+        {
+            if(ex.reason.find("UnknownMethod") != string::npos)
+            {
+                throw BluetoothException(__FILE__, __LINE__, "Bluetooth daemon uses an unsupported version");
+            }
+            else
+            {
+                throw BluetoothException(__FILE__, __LINE__, ex.reason);
+            }
+        }
+    }
+
+    //
+    // From DBus::Filter.
+    //
+    virtual bool handleMessage(const DBus::ConnectionPtr&, const DBus::MessagePtr& msg)
+    {
+        if(!msg->isSignal())
+        {
+            return false; // Not handled.
+        }
+
+        string intf = msg->getInterface();
+        string member = msg->getMember();
+
+        if(intf == "org.bluez.Adapter" && member == "DeviceFound")
+        {
+            //
+            // The DeviceFound signal contains two values: 
+            //
+            //   STRING address
+            //   DICT<STRING,VARIANT> properties
+            //
+            vector<DBus::ValuePtr> values = msg->readAll();
+            assert(values.size() == 2);
+            DBus::StringValuePtr addr = DBus::StringValuePtr::dynamicCast(values[0]);
+            assert(addr);
+            VariantMap props;
+            extractProperties(values[1], props);
+
+#ifdef ICE_CPP11_MAPPING
+            vector<function<void(const string&, const PropertyMap&)>> callbacks;
+#else
+            vector<DiscoveryCallbackPtr> callbacks;
+#endif
+
+            {
+                IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+#ifdef ICE_CPP11_MAPPING
+                auto p = _discoveryCallbacks.find(msg->getPath());
+#else
+                map<string, vector<DiscoveryCallbackPtr> >::iterator p = _discoveryCallbacks.find(msg->getPath());
+#endif
+                if(p != _discoveryCallbacks.end())
+                {
+                    callbacks = p->second;
+                }
+            }
+
+            if(!callbacks.empty())
+            {
+                PropertyMap pm; // Convert to string-string map.
+                for(VariantMap::const_iterator p = props.begin(); p != props.end(); ++p)
+                {
+                    pm[p->first] = p->second->toString();
+                }
+#ifdef ICE_CPP11_MAPPING
+                for(const auto& discovered : callbacks)
+                {
+                    try
+                    {
+                        discovered(addr->v, pm);
+                    }
+                    catch(...)
+                    {
+                    }
+                }
+#else
+                for(vector<DiscoveryCallbackPtr>::iterator p = callbacks.begin(); p != callbacks.end(); ++p)
+                {
+                    try
+                    {
+                        (*p)->discovered(addr->v, pm);
+                    }
+                    catch(...)
+                    {
+                    }
+                }
+#endif
+            }
+
+            return true;
+        }
+        else if(intf == "org.bluez.Adapter" && member == "PropertyChanged")
+        {
+            //
+            // The PropertyChanged signal contains two values: 
+            //
+            //   STRING name
+            //   VARIANT value
+            //
+            vector<DBus::ValuePtr> values = msg->readAll();
+            assert(values.size() == 2);
+            DBus::StringValuePtr name = DBus::StringValuePtr::dynamicCast(values[0]);
+            assert(name);
+            if(name->v == "Discovering")
+            {
+                DBus::VariantValuePtr v = DBus::VariantValuePtr::dynamicCast(values[1]);
+                assert(v);
+                DBus::BooleanValuePtr b = DBus::BooleanValuePtr::dynamicCast(v->v);
+                assert(b);
+                if(!b->v)
+                {
+                    IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+
+#ifdef ICE_CPP11_MAPPING
+                    auto p = _discoveryCallbacks.find(msg->getPath());
+#else
+                    map<string, vector<DiscoveryCallbackPtr> >::iterator p = _discoveryCallbacks.find(msg->getPath());
+#endif
+                    if(p != _discoveryCallbacks.end())
+                    {
+                        _discoveryCallbacks.erase(p);
+                    }
+                }
+            }
+            return false;
+        }
+
+        return false;
+    }
+
+    string getDefaultAdapterAddress() const
+    {
+        string path = getDefaultAdapter();
+        VariantMap props = getAdapterProperties(path);
+
+        VariantMap::const_iterator i = props.find("Address");
+        if(i != props.end())
+        {
+            DBus::StringValuePtr str = DBus::StringValuePtr::dynamicCast(i->second->v);
+            assert(str);
+            return IceUtilInternal::toUpper(str->v);
+        }
+
+        throw BluetoothException(__FILE__, __LINE__, "no default Bluetooth adapter found");
+    }
+
+    bool adapterExists(const string& addr) const
+    {
+        string path = findAdapter(addr);
+        return !path.empty();
+    }
+
+    unsigned int addService(const string& addr, const string& name, const string& uuid, int channel)
+    {
+        string path = findAdapter(addr);
+
+        if(path.empty())
+        {
+            throw BluetoothException(__FILE__, __LINE__, "no Bluetooth adapter found matching address " + addr);
+        }
+
+        //
+        // Compose an XML record.
+        //
+        ostringstream ostr;
+        ostr << "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" << endl
+             << "<record>" << endl
+             << "    <attribute id=\"0x0001\">" << endl // UUID
+             << "        <sequence>" << endl
+             << "            <uuid value=\"" << uuid << "\" />" << endl
+             << "        </sequence>" << endl
+             << "    </attribute>" << endl
+             << "    <attribute id=\"0x0004\">" << endl
+             << "        <sequence>" << endl
+             << "            <sequence>" << endl
+             << "                <uuid value=\"0x0100\" />" << endl // L2CAP
+             << "            </sequence>" << endl
+             << "            <sequence>" << endl
+             << "                <uuid value=\"0x0003\" />" << endl // RFCOMM channel
+             << "                <uint8 value=\"0x" << hex << channel << dec << "\" />" << endl
+             << "            </sequence>" << endl
+             << "        </sequence>" << endl
+             << "    </attribute>" << endl
+             << "    <attribute id=\"0x0005\">" << endl
+             << "        <sequence>" << endl
+             << "            <uuid value=\"0x1002\" />" << endl
+             << "        </sequence>" << endl
+             << "    </attribute>" << endl;
+        if(!name.empty())
+        {
+             ostr << "    <attribute id=\"0x0100\">" << endl
+                  << "        <text value=\"" << name << "\" />" << endl
+                  << "    </attribute>" << endl;
+        }
+        ostr << "</record>";
+
+        try
+        {
+            DBus::MessagePtr reply = call(path, "org.bluez.Service", "AddRecord", new DBus::StringValue(ostr.str()));
+            DBus::ValuePtr v = reply->read();
+            DBus::Uint32ValuePtr handle = DBus::Uint32ValuePtr::dynamicCast(v);
+            return handle->v;
+        }
+        catch(const DBus::Exception& ex)
+        {
+            throw BluetoothException(__FILE__, __LINE__, ex.reason);
+        }
+    }
+
+    void findService(const string& addr, const string& uuid, const FindServiceCallbackPtr& cb)
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+
+        if(_destroyed)
+        {
+            cb->exception(CommunicatorDestroyedException(__FILE__, __LINE__));
+        }
+        else
+        {
+            IceUtil::ThreadPtr t = new FindServiceThread(this, addr, uuid, cb);
+            _threads.push_back(t);
+            t->start();
+        }
+    }
+
+    void removeService(const string& addr, unsigned int handle)
+    {
+        string path = findAdapter(addr);
+
+        if(path.empty())
+        {
+            throw BluetoothException(__FILE__, __LINE__, "no Bluetooth adapter found matching address " + addr);
+        }
+
+        try
+        {
+            call(path, "org.bluez.Service", "RemoveRecord", new DBus::Uint32Value(handle));
+        }
+        catch(const DBus::Exception& ex)
+        {
+            if(ex.reason.find("DoesNotExist") != string::npos)
+            {
+                throw BluetoothException(__FILE__, __LINE__, ex.reason);
+            }
+        }
+    }
+
+#ifdef ICE_CPP11_MAPPING
+    void startDiscovery(const string& addr, function<void(const string&, const PropertyMap&)> cb)
+#else
+    void startDiscovery(const string& addr, const DiscoveryCallbackPtr& cb)
+#endif
+    {
+        string path;
+        if(addr.empty())
+        {
+            path = getDefaultAdapter();
+        }
+        else
+        {
+            path = findAdapter(addr);
+        }
+
+        if(path.empty())
+        {
+            throw BluetoothException(__FILE__, __LINE__, "no Bluetooth adapter found matching address " + addr);
+        }
+
+        {
+            IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+
+#ifdef ICE_CPP11_MAPPING
+            auto p = _discoveryCallbacks.find(path);
+            if(p == _discoveryCallbacks.end())
+            {
+                _discoveryCallbacks[path] = vector<function<void(const string&, const PropertyMap&)>>();
+            }
+            _discoveryCallbacks[path].push_back(move(cb));
+#else
+            map<string, vector<DiscoveryCallbackPtr> >::iterator p = _discoveryCallbacks.find(path);
+            if(p == _discoveryCallbacks.end())
+            {
+                _discoveryCallbacks[path] = vector<DiscoveryCallbackPtr>();
+            }
+            _discoveryCallbacks[path].push_back(cb);
+#endif
+        }
+
+        try
+        {
+            call(path, "org.bluez.Adapter", "StartDiscovery");
+        }
+        catch(const DBus::Exception& ex)
+        {
+            throw BluetoothException(__FILE__, __LINE__, ex.reason);
+        }
+    }
+
+    void stopDiscovery(const string& addr)
+    {
+        string path;
+        if(addr.empty())
+        {
+            path = getDefaultAdapter();
+        }
+        else
+        {
+            path = findAdapter(addr);
+        }
+
+        if(path.empty())
+        {
+            throw BluetoothException(__FILE__, __LINE__, "no Bluetooth adapter found matching address " + addr);
+        }
+
+        try
+        {
+            call(path, "org.bluez.Adapter", "StopDiscovery");
+        }
+        catch(const DBus::Exception& ex)
+        {
+            throw BluetoothException(__FILE__, __LINE__, ex.reason);
+        }
+    }
+
+    void destroy()
+    {
+        vector<IceUtil::ThreadPtr> threads;
+
+        {
+            IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+
+            _destroyed = true;
+            threads.swap(_threads);
+        }
+
+        for(vector<IceUtil::ThreadPtr>::iterator p = threads.begin(); p != threads.end(); ++p)
+        {
+            (*p)->getThreadControl().join();
+        }
+
+        if(_dbusConnection)
+        {
+            try
+            {
+                _dbusConnection->close();
+            }
+            catch(const DBus::Exception& ex)
+            {
+            }
+        }
+    }
+
+    string getDefaultAdapter() const
+    {
+        try
+        {
+            //
+            // The call to DefaultAdapter returns OBJ_PATH.
+            //
+            DBus::MessagePtr reply = call("/", "org.bluez.Manager", "DefaultAdapter");
+            DBus::ValuePtr v = reply->read();
+            DBus::ObjectPathValuePtr path = DBus::ObjectPathValuePtr::dynamicCast(v);
+            assert(path);
+            return path->v;
+        }
+        catch(const DBus::Exception& ex)
+        {
+            if(ex.reason.find("NoSuchAdapter") == string::npos)
+            {
+                throw BluetoothException(__FILE__, __LINE__, ex.reason);
+            }
+        }
+
+        return string();
+    }
+
+    string findAdapter(const string& addr) const
+    {
+        try
+        {
+            //
+            // The call to FindAdapter returns OBJ_PATH.
+            //
+            DBus::MessagePtr reply = call("/", "org.bluez.Manager", "FindAdapter", new DBus::StringValue(addr));
+            DBus::ValuePtr v = reply->read();
+            DBus::ObjectPathValuePtr path = DBus::ObjectPathValuePtr::dynamicCast(v);
+            assert(path);
+            return path->v;
+        }
+        catch(const DBus::Exception& ex)
+        {
+            if(ex.reason.find("NoSuchAdapter") == string::npos)
+            {
+                throw BluetoothException(__FILE__, __LINE__, ex.reason);
+            }
+        }
+
+        return string();
+    }
+
+    VariantMap getAdapterProperties(const string& path) const
+    {
+        //
+        // The call to GetProperties returns
+        //
+        //   DICT<STRING,VARIANT> properties
+        //
+        DBus::MessagePtr reply = call(path, "org.bluez.Adapter", "GetProperties");
+        DBus::ValuePtr v = reply->read();
+        VariantMap props;
+        extractProperties(v, props);
+        return props;
+    }
+
+    IceXML::NodePtr findChild(const IceXML::NodePtr& parent, const string& name) const
+    {
+        IceXML::NodeList l = parent->getChildren();
+        for(IceXML::NodeList::iterator p = l.begin(); p != l.end(); ++p)
+        {
+            if((*p)->getName() == name)
+            {
+                return *p;
+            }
+        }
+
+        return 0;
+    }
+
+    IceXML::NodePtr findAttribute(const IceXML::NodePtr& record, int id) const
+    {
+        IceXML::NodeList l = record->getChildren();
+        for(IceXML::NodeList::iterator p = l.begin(); p != l.end(); ++p)
+        {
+            if((*p)->getName() == "attribute")
+            {
+                string sid = (*p)->getAttribute("id");
+                int i;
+                if(sscanf(sid.c_str(), "%x", &i) == 1 && i == id)
+                {
+                    return *p;
+                }
+            }
+        }
+
+        return 0;
+    }
+
+    IceXML::NodePtr findSequence(const IceXML::NodePtr& parent, const string& uuid) const
+    {
+        IceXML::NodeList l = parent->getChildren();
+        for(IceXML::NodeList::iterator p = l.begin(); p != l.end(); ++p)
+        {
+            if((*p)->getName() == "sequence")
+            {
+                IceXML::NodePtr u = findChild(*p, "uuid");
+                if(u)
+                {
+                    string val = u->getAttribute("value");
+                    if(IceUtilInternal::toUpper(val) == IceUtilInternal::toUpper(uuid))
+                    {
+                        return *p;
+                    }
+                }
+
+                //
+                // Recursively search for nested <sequence> elements.
+                //
+                IceXML::NodePtr n = findSequence(*p, uuid);
+                if(n)
+                {
+                    return n;
+                }
+            }
+        }
+
+        return 0;
+    }
+
+    IceXML::NodePtr findSequence(const IceXML::NodePtr& parent, int uuid) const
+    {
+        IceXML::NodeList l = parent->getChildren();
+        for(IceXML::NodeList::iterator p = l.begin(); p != l.end(); ++p)
+        {
+            if((*p)->getName() == "sequence")
+            {
+                IceXML::NodePtr u = findChild(*p, "uuid");
+                if(u)
+                {
+                    string val = u->getAttribute("value");
+                    int i;
+                    if(sscanf(val.c_str(), "%x", &i) == 1 && i == uuid)
+                    {
+                        return *p;
+                    }
+                }
+
+                //
+                // Recursively search for nested <sequence> elements.
+                //
+                IceXML::NodePtr n = findSequence(*p, uuid);
+                if(n)
+                {
+                    return n;
+                }
+            }
+        }
+
+        return 0;
+    }
+
+    DBus::MessagePtr call(const string& path, const string& intf, const string& member,
+                          const DBus::ValuePtr& arg = 0) const
+    {
+        DBus::MessagePtr msg = DBus::Message::createCall("org.bluez", path, intf, member);
+        if(arg)
+        {
+            msg->write(arg);
+        }
+        DBus::AsyncResultPtr r = _dbusConnection->callAsync(msg);
+        DBus::MessagePtr reply = r->waitUntilFinished();
+        if(reply->isError())
+        {
+            reply->throwException();
+        }
+        return reply;
+    }
+
+    void runFindService(const IceUtil::ThreadPtr& thread, const string& addr, const string& uuid,
+                        const FindServiceCallbackPtr& cb)
+    {
+        vector<int> channels;
+        bool failed = false;
+
+        try
+        {
+            const string a = IceUtilInternal::toUpper(addr);
+            const string adapter = getDefaultAdapter();
+
+            string devicePath;
+            bool first = true;
+
+            while(devicePath.empty())
+            {
+                try
+                {
+                    DBus::MessagePtr reply = call(adapter, "org.bluez.Adapter", "FindDevice", new DBus::StringValue(a));
+                    DBus::ValuePtr v = reply->read();
+                    DBus::ObjectPathValuePtr path = DBus::ObjectPathValuePtr::dynamicCast(v);
+                    assert(path);
+                    devicePath = path->v;
+                }
+                catch(const DBus::Exception& ex)
+                {
+                    if(ex.reason.find("DoesNotExist") != string::npos)
+                    {
+                        if(first)
+                        {
+                            first = false;
+                            try
+                            {
+                                DBus::MessagePtr reply = call(adapter, "org.bluez.Adapter", "CreateDevice",
+                                                              new DBus::StringValue(a));
+                                DBus::ValuePtr v = reply->read();
+                                DBus::ObjectPathValuePtr path = DBus::ObjectPathValuePtr::dynamicCast(v);
+                                assert(path);
+                                devicePath = path->v;
+                            }
+                            catch(const DBus::Exception&)
+                            {
+                                // Try FindDevice one more time.
+                            }
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        throw BluetoothException(__FILE__, __LINE__, ex.reason);
+                    }
+                }
+            }
+
+            if(devicePath.empty())
+            {
+                //
+                // Couldn't get the object path for the device.
+                //
+                throw BluetoothException(__FILE__, __LINE__, "unable to create device for address " + addr);
+            }
+
+            DBus::ValuePtr services;
+
+            for(int iter = 0; iter < 50; ++iter)
+            {
+                {
+                    IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+
+                    if(_destroyed)
+                    {
+                        throw CommunicatorDestroyedException(__FILE__, __LINE__);
+                    }
+                }
+
+                try
+                {
+                    //
+                    // Try to call DiscoverServices on the device to get the XML service records.
+                    // The return value is a DICT<UINT32, STRING>.
+                    //
+                    DBus::MessagePtr reply = call(devicePath, "org.bluez.Device", "DiscoverServices",
+                                                  new DBus::StringValue(""));
+                    services = reply->read();
+                    break;
+                }
+                catch(const DBus::Exception& ex)
+                {
+                    if(ex.reason.find("InProgress") == string::npos)
+                    {
+                        throw BluetoothException(__FILE__, __LINE__, ex.reason);
+                    }
+
+                    //
+                    // Another call to DiscoverServices is already in progress for the target device.
+                    // Sleep a little and try again.
+                    //
+                    IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(100));
+                }
+            }
+
+            if(!services)
+            {
+                throw BluetoothException(__FILE__, __LINE__, "query for services failed for address " + addr);
+            }
+
+            //
+            // The returned dictionary contains an XML record for each service advertised by the
+            // remote device. We have to parse the XML and look for certain elements. Specifically,
+            // we're looking for a UUID that matches the one supplied by the caller. If we find
+            // that, we look in the same record for an RFCOMM channel.
+            //
+            IceXML::DocumentPtr doc;
+            assert(services->getType()->getKind() == DBus::Type::KindArray);
+            DBus::ArrayValuePtr d = DBus::ArrayValuePtr::dynamicCast(services);
+            for(vector<DBus::ValuePtr>::const_iterator p = d->elements.begin(); p != d->elements.end(); ++p)
+            {
+                assert((*p)->getType()->getKind() == DBus::Type::KindDictEntry);
+                DBus::DictEntryValuePtr pe = DBus::DictEntryValuePtr::dynamicCast(*p);
+                assert(pe->value->getType()->getKind() == DBus::Type::KindString);
+                DBus::StringValuePtr rec = DBus::StringValuePtr::dynamicCast(pe->value);
+
+                try
+                {
+                    //
+                    // This is what we're processing:
+                    //
+                    // <record>
+                    //     <attribute id="0x0001">
+                    //         <sequence>
+                    //             <uuid value="f6d289b4-1596-4294-ac34-f08e8adbfe5b" />
+                    //         </sequence>
+                    //     </attribute>
+                    //     <attribute id="0x0004">
+                    //         <sequence>
+                    //             <sequence>
+                    //                 <uuid value="0x0100" />
+                    //             </sequence>
+                    //             <sequence>
+                    //                 <uuid value="0x0003" />
+                    //                 <uint8 value="0x01" />
+                    //             </sequence>
+                    //         </sequence>
+                    //     </attribute>
+                    //     ...
+                    // </record>
+                    //
+
+                    istringstream istr(rec->v);
+                    doc = IceXML::Parser::parse(istr);
+                    IceXML::NodePtr record = findChild(doc, "record");
+                    if(!record)
+                    {
+                        throw BluetoothException(__FILE__, __LINE__, "malformed XML - can't find <record>");
+                    }
+
+                    //
+                    // Attribute 0x0001 holds the UUID. See if it matches the target UUID.
+                    //
+                    IceXML::NodePtr attrib = findAttribute(record, 1);
+                    IceXML::NodePtr seq;
+                    if(attrib)
+                    {
+                        seq = findSequence(attrib, uuid);
+                    }
+                    if(seq)
+                    {
+                        //
+                        // We found a matching service UUID. Now look for the RFCOMM channel in the
+                        // protocol descriptor list.
+                        //
+                        attrib = findAttribute(record, 4);
+                        if(attrib)
+                        {
+                            seq = findSequence(attrib, 3);
+                            if(seq)
+                            {
+                                IceXML::NodePtr ch = findChild(seq, "uint8");
+                                if(ch)
+                                {
+                                    string val = ch->getAttribute("value");
+                                    int channel;
+                                    if(sscanf(val.c_str(), "%x", &channel) == 1)
+                                    {
+                                        channels.push_back(channel);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                catch(const IceXML::ParserException& ex)
+                {
+                    if(doc)
+                    {
+                        doc->destroy();
+                    }
+                    ostringstream ostr;
+                    ostr << ex.reason() << endl << rec->v;
+                    throw BluetoothException(__FILE__, __LINE__, ostr.str());
+                }
+                catch(...)
+                {
+                    if(doc)
+                    {
+                        doc->destroy();
+                    }
+                    throw;
+                }
+            }
+
+            if(doc)
+            {
+                doc->destroy();
+            }
+
+            {
+                IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+
+                if(_destroyed)
+                {
+                    throw CommunicatorDestroyedException(__FILE__, __LINE__);
+                }
+            }
+        }
+        catch(const DBus::Exception& ex)
+        {
+            cb->exception(BluetoothException(__FILE__, __LINE__, ex.reason));
+            failed = true;
+        }
+        catch(const LocalException& ex)
+        {
+            cb->exception(ex);
+            failed = true;
+        }
+        catch(const std::exception& ex)
+        {
+            cb->exception(UnknownException(__FILE__, __LINE__, ex.what()));
+            failed = true;
+        }
+        catch(...)
+        {
+            cb->exception(UnknownException(__FILE__, __LINE__, "unknown C++ exception"));
+            failed = true;
+        }
+
+        if(!failed)
+        {
+            if(channels.empty())
+            {
+                //
+                // No service found for the UUID at the remote address. We treat this as if the
+                // server is not running.
+                //
+                cb->exception(ConnectFailedException(__FILE__, __LINE__, ECONNREFUSED));
+            }
+            else
+            {
+                cb->completed(channels);
+            }
+        }
+
+        {
+            IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_lock);
+
+            vector<IceUtil::ThreadPtr>::iterator p = find(_threads.begin(), _threads.end(), thread);
+            if(p != _threads.end())
+            {
+                _threads.erase(p);
+            }
+        }
+    }
+
+    class FindServiceThread : public IceUtil::Thread
+    {
+    public:
+
+        FindServiceThread(const BluetoothServicePtr& service, const string& addr, const string& uuid,
+                          const FindServiceCallbackPtr& cb) :
+            _service(service),
+            _addr(addr),
+            _uuid(uuid),
+            _cb(cb)
+        {
+        }
+
+        virtual void run()
+        {
+            _service->runFindService(this, _addr, _uuid, _cb);
+        }
+
+        BluetoothServicePtr _service;
+        string _addr;
+        string _uuid;
+        FindServiceCallbackPtr _cb;
+    };
+
+    IceUtil::Monitor<IceUtil::Mutex> _lock;
+    bool _destroyed;
+    DBus::ConnectionPtr _dbusConnection;
+    vector<IceUtil::ThreadPtr> _threads;
+#ifdef ICE_CPP11_MAPPING
+    map<string, vector<function<void(const string&, const PropertyMap&)>>> _discoveryCallbacks;
+#else
+    map<string, vector<DiscoveryCallbackPtr> > _discoveryCallbacks;
+#endif
+};
+
+}
+
+IceUtil::Shared* IceBT::upCast(IceBT::BluetoothService* p) { return p; }
+
+IceBT::Engine::Engine(const Ice::CommunicatorPtr& communicator) :
+    _communicator(communicator),
+    _initialized(false)
+{
+}
+
+Ice::CommunicatorPtr
+IceBT::Engine::communicator() const
+{
+    return _communicator;
+}
+
+void
+IceBT::Engine::initialize()
+{
+    _service = new BluetoothService;
+    _initialized = true;
+}
+
+bool
+IceBT::Engine::initialized() const
+{
+    return _initialized;
+}
+
+string
+IceBT::Engine::getDefaultAdapterAddress() const
+{
+    return _service->getDefaultAdapterAddress();
+}
+
+bool
+IceBT::Engine::adapterExists(const string& addr) const
+{
+    return _service->adapterExists(addr);
+}
+
+unsigned int
+IceBT::Engine::addService(const string& address, const string& name, const string& uuid, int channel)
+{
+    return _service->addService(address, name, uuid, channel);
+}
+
+void
+IceBT::Engine::findService(const string& address, const string& uuid, const FindServiceCallbackPtr& cb)
+{
+    _service->findService(address, uuid, cb);
+}
+
+void
+IceBT::Engine::removeService(const string& address, unsigned int handle)
+{
+    _service->removeService(address, handle);
+}
+
+void
+#ifdef ICE_CPP11_MAPPING
+IceBT::Engine::startDiscovery(const string& address, function<void(const string&, const PropertyMap&)> cb)
+#else
+IceBT::Engine::startDiscovery(const string& address, const DiscoveryCallbackPtr& cb)
+#endif
+{
+    _service->startDiscovery(address, cb);
+}
+
+void
+IceBT::Engine::stopDiscovery(const string& address)
+{
+    _service->stopDiscovery(address);
+}
+
+void
+IceBT::Engine::destroy()
+{
+    _service->destroy();
+}
diff --git a/cpp/src/IceBT/Engine.h b/cpp/src/IceBT/Engine.h
new file mode 100644
index 00000000000..1b674e24aa6
--- /dev/null
+++ b/cpp/src/IceBT/Engine.h
@@ -0,0 +1,83 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_BT_ENGINE_H
+#define ICE_BT_ENGINE_H
+
+#include <IceBT/EngineF.h>
+#include <IceBT/Config.h>
+#include <IceBT/Plugin.h>
+#include <IceBT/Types.h>
+#include <Ice/CommunicatorF.h>
+
+namespace IceBT
+{
+
+class FindServiceCallback : public IceUtil::Shared
+{
+public:
+
+    virtual void completed(const std::vector<int>&) = 0;
+    virtual void exception(const Ice::LocalException&) = 0;
+};
+typedef IceUtil::Handle<FindServiceCallback> FindServiceCallbackPtr;
+
+//
+// Engine encapsulates all Bluetooth activities.
+//
+class Engine : public IceUtil::Shared
+{
+public:
+
+    Engine(const Ice::CommunicatorPtr&);
+
+    Ice::CommunicatorPtr communicator() const;
+
+    void initialize();
+    bool initialized() const;
+
+    std::string getDefaultAdapterAddress() const;
+    bool adapterExists(const std::string&) const;
+
+    //
+    // Blocks while we register a service with the Bluetooth daemon. Returns a
+    // handle to the service that can be passed to removeService().
+    //
+    unsigned int addService(const std::string&, const std::string&, const std::string&, int);
+
+    //
+    // Asynchronously looks for a service at the given target device with the given UUID.
+    //
+    void findService(const std::string&, const std::string&, const FindServiceCallbackPtr&);
+
+    //
+    // Removes a service added by addService().
+    //
+    void removeService(const std::string&, unsigned int);
+
+#ifdef ICE_CPP11_MAPPING
+    void startDiscovery(const std::string&, std::function<void(const std::string&, const PropertyMap&)>);
+#else
+    void startDiscovery(const std::string&, const DiscoveryCallbackPtr&);
+#endif
+    void stopDiscovery(const std::string&);
+
+    void destroy();
+
+private:
+
+    const Ice::CommunicatorPtr _communicator;
+    bool _initialized;
+    IceUtil::Monitor<IceUtil::Mutex> _lock;
+    BluetoothServicePtr _service;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Ice/winrt/StreamF.h b/cpp/src/IceBT/EngineF.h
index 295b6a45728..2999d97e5b8 100644
--- a/cpp/src/Ice/winrt/StreamF.h
+++ b/cpp/src/IceBT/EngineF.h
@@ -7,22 +7,22 @@
 //
 // **********************************************************************
 
-#ifndef ICE_WINRT_STREAM_F_H
-#define ICE_WINRT_STREAM_F_H
+#ifndef ICE_BT_ENGINE_F_H
+#define ICE_BT_ENGINE_F_H
 
 #include <IceUtil/Shared.h>
 #include <Ice/Handle.h>
 
-namespace IceInternal
+namespace IceBT
 {
 
-class StreamEndpointI;
-ICE_API IceUtil::Shared* upCast(StreamEndpointI*);
-typedef IceInternal::Handle<StreamEndpointI> StreamEndpointIPtr;
+class Engine;
+IceUtil::Shared* upCast(Engine*);
+typedef IceInternal::Handle<Engine> EnginePtr;
 
-class StreamAcceptor;
-ICE_API IceUtil::Shared* upCast(StreamAcceptor*);
-typedef IceInternal::Handle<StreamAcceptor> StreamAcceptorPtr;
+class BluetoothService;
+IceUtil::Shared* upCast(BluetoothService*);
+typedef IceInternal::Handle<BluetoothService> BluetoothServicePtr;
 
 }
 
diff --git a/cpp/src/IceBT/Instance.cpp b/cpp/src/IceBT/Instance.cpp
new file mode 100644
index 00000000000..4e8f68406e7
--- /dev/null
+++ b/cpp/src/IceBT/Instance.cpp
@@ -0,0 +1,33 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceBT/Instance.h>
+#include <IceBT/Engine.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceBT;
+
+IceUtil::Shared* IceBT::upCast(IceBT::Instance* p) { return p; }
+
+IceBT::Instance::Instance(const EnginePtr& engine, Short type, const string& protocol) :
+    ProtocolInstance(engine->communicator(), type, protocol, true),
+    _engine(engine)
+{
+}
+
+IceBT::Instance::~Instance()
+{
+}
+
+bool
+IceBT::Instance::initialized() const
+{
+    return _engine->initialized();
+}
diff --git a/cpp/src/IceBT/Instance.h b/cpp/src/IceBT/Instance.h
new file mode 100644
index 00000000000..08f4bce68b6
--- /dev/null
+++ b/cpp/src/IceBT/Instance.h
@@ -0,0 +1,41 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_BT_INSTANCE_H
+#define ICE_BT_INSTANCE_H
+
+#include <IceBT/InstanceF.h>
+#include <IceBT/EngineF.h>
+#include <Ice/ProtocolInstance.h>
+
+namespace IceBT
+{
+
+class Instance : public IceInternal::ProtocolInstance
+{
+public:
+
+    Instance(const EnginePtr&, Ice::Short, const std::string&);
+    virtual ~Instance();
+
+    EnginePtr engine() const
+    {
+        return _engine;
+    }
+
+    bool initialized() const;
+
+private:
+
+    const EnginePtr _engine;
+};
+
+}
+
+#endif
diff --git a/cpp/src/IceBT/InstanceF.h b/cpp/src/IceBT/InstanceF.h
new file mode 100644
index 00000000000..b35c8b765f8
--- /dev/null
+++ b/cpp/src/IceBT/InstanceF.h
@@ -0,0 +1,37 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_BT_INSTANCE_F_H
+#define ICE_BT_INSTANCE_F_H
+
+#include <IceUtil/Shared.h>
+#include <Ice/Handle.h>
+
+namespace IceBT
+{
+
+class Instance;
+IceUtil::Shared* upCast(Instance*);
+typedef IceInternal::Handle<Instance> InstancePtr;
+
+class EndpointI;
+#ifdef ICE_CPP11_MAPPING
+typedef std::shared_ptr<EndpointI> EndpointIPtr;
+#else
+IceUtil::Shared* upCast(EndpointI*);
+typedef IceInternal::Handle<EndpointI> EndpointIPtr;
+#endif
+
+class AcceptorI;
+IceUtil::Shared* upCast(AcceptorI*);
+typedef IceInternal::Handle<AcceptorI> AcceptorIPtr;
+
+}
+
+#endif
diff --git a/cpp/src/IceBT/Makefile.mk b/cpp/src/IceBT/Makefile.mk
new file mode 100644
index 00000000000..a46db4ec937
--- /dev/null
+++ b/cpp/src/IceBT/Makefile.mk
@@ -0,0 +1,22 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+ifneq ($(filter debian ubuntu,$(linux_id)),)
+
+$(project)_libraries	:= IceBT
+
+IceBT_targetdir		:= $(libdir)
+IceBT_dependencies	:= IceXML Ice
+IceBT_cppflags  	:= -DICEBT_API_EXPORTS $(shell pkg-config --cflags dbus-1)
+IceBT_system_libs	= $(IceSSL_system_libs) $(shell pkg-config --libs dbus-1)
+IceBT_sliceflags	:= --include-dir IceBT --dll-export ICESSL_API
+
+projects += $(project)
+
+endif
diff --git a/cpp/src/IceBT/PluginI.cpp b/cpp/src/IceBT/PluginI.cpp
new file mode 100644
index 00000000000..c8f2882bbfb
--- /dev/null
+++ b/cpp/src/IceBT/PluginI.cpp
@@ -0,0 +1,105 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceBT/PluginI.h>
+#include <IceBT/EndpointI.h>
+#include <IceBT/Engine.h>
+#include <IceBT/Instance.h>
+#include <IceBT/Util.h>
+
+#include <Ice/LocalException.h>
+#include <Ice/ProtocolPluginFacade.h>
+#include <Ice/ProtocolInstance.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceBT;
+
+void
+IceBT::BluetoothException::ice_print(ostream& out) const
+{
+    Exception::ice_print(out);
+    out << ":\nbluetooth exception: `" << reason << "'";
+}
+
+//
+// Plug-in factory function.
+//
+extern "C"
+{
+
+ICE_BT_API Ice::Plugin*
+createIceBT(const CommunicatorPtr& communicator, const string& /*name*/, const StringSeq& /*args*/)
+{
+    return new PluginI(communicator);
+}
+
+}
+
+namespace Ice
+{
+
+ICE_BT_API void
+registerIceBT(bool loadOnInitialize)
+{
+    Ice::registerPluginFactory("IceBT", createIceBT, loadOnInitialize);
+}
+
+}
+
+//
+// Plugin implementation.
+//
+IceBT::PluginI::PluginI(const Ice::CommunicatorPtr& com) :
+    _engine(new Engine(com))
+{
+    IceInternal::ProtocolPluginFacadePtr pluginFacade = IceInternal::getProtocolPluginFacade(com);
+
+    //
+    // Register the endpoint factory. We have to do this now, rather
+    // than in initialize, because the communicator may need to
+    // interpret proxies before the plug-in is fully initialized.
+    //
+    pluginFacade->addEndpointFactory(new EndpointFactoryI(new Instance(_engine, BTEndpointType, "bt")));
+
+    IceInternal::EndpointFactoryPtr sslFactory = pluginFacade->getEndpointFactory(SSLEndpointType);
+    if(sslFactory)
+    {
+        InstancePtr instance = new Instance(_engine, BTSEndpointType, "bts");
+        pluginFacade->addEndpointFactory(sslFactory->clone(instance, new EndpointFactoryI(instance)));
+    }
+}
+
+void
+IceBT::PluginI::initialize()
+{
+    _engine->initialize();
+}
+
+void
+IceBT::PluginI::destroy()
+{
+    _engine->destroy();
+}
+
+void
+#ifdef ICE_CPP11_MAPPING
+IceBT::PluginI::startDiscovery(const string& address, function<void(const string&, const PropertyMap&)> cb)
+#else
+IceBT::PluginI::startDiscovery(const string& address, const DiscoveryCallbackPtr& cb)
+#endif
+{
+    _engine->startDiscovery(address, cb);
+}
+
+void
+IceBT::PluginI::stopDiscovery(const string& address)
+{
+    _engine->stopDiscovery(address);
+}
diff --git a/cpp/src/IceBT/PluginI.h b/cpp/src/IceBT/PluginI.h
new file mode 100644
index 00000000000..aa846e01891
--- /dev/null
+++ b/cpp/src/IceBT/PluginI.h
@@ -0,0 +1,49 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_BT_PLUGIN_I_H
+#define ICE_BT_PLUGIN_I_H
+
+#include <Ice/CommunicatorF.h>
+#include <IceBT/Plugin.h>
+#include <IceBT/EngineF.h>
+
+namespace IceBT
+{
+
+class PluginI : public Plugin
+{
+public:
+
+    PluginI(const Ice::CommunicatorPtr&);
+
+    //
+    // From Ice::Plugin.
+    //
+    virtual void initialize();
+    virtual void destroy();
+
+    //
+    // From IceBT::Plugin.
+    //
+#ifdef ICE_CPP11_MAPPING
+    virtual void startDiscovery(const std::string&, std::function<void(const std::string&, const PropertyMap&)>);
+#else
+    virtual void startDiscovery(const std::string&, const DiscoveryCallbackPtr&);
+#endif
+    virtual void stopDiscovery(const std::string&);
+
+private:
+
+    EnginePtr _engine;
+};
+
+}
+
+#endif
diff --git a/cpp/src/IceBT/StreamSocket.cpp b/cpp/src/IceBT/StreamSocket.cpp
new file mode 100644
index 00000000000..ba4b27ca57f
--- /dev/null
+++ b/cpp/src/IceBT/StreamSocket.cpp
@@ -0,0 +1,308 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceBT/StreamSocket.h>
+#include <IceBT/EndpointInfo.h>
+#include <IceBT/Instance.h>
+#include <IceBT/Util.h>
+
+#include <Ice/LoggerUtil.h>
+#include <Ice/Properties.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceBT;
+
+IceBT::StreamSocket::StreamSocket(const InstancePtr& instance, const SocketAddress& addr) :
+    IceInternal::NativeInfo(createSocket()),
+    _instance(instance),
+    _addr(addr),
+    _state(StateNeedConnect)
+{
+    init();
+    if(doConnect(_fd, _addr))
+    {
+        _state = StateConnected;
+    }
+    _desc = fdToString(_fd);
+}
+
+IceBT::StreamSocket::StreamSocket(const InstancePtr& instance, SOCKET fd) :
+    IceInternal::NativeInfo(fd),
+    _instance(instance),
+    _state(StateConnected)
+{
+    init();
+    _desc = fdToString(fd);
+}
+
+IceBT::StreamSocket::~StreamSocket()
+{
+    assert(_fd == INVALID_SOCKET);
+}
+
+IceInternal::SocketOperation
+IceBT::StreamSocket::connect(IceInternal::Buffer& readBuffer, IceInternal::Buffer& writeBuffer)
+{
+    if(_state == StateNeedConnect)
+    {
+        _state = StateConnectPending;
+        return IceInternal::SocketOperationConnect;
+    }
+    else if(_state <= StateConnectPending)
+    {
+        doFinishConnect(_fd);
+        _desc = fdToString(_fd);
+        _state = StateConnected;
+    }
+
+    assert(_state == StateConnected);
+    return IceInternal::SocketOperationNone;
+}
+
+bool
+IceBT::StreamSocket::isConnected()
+{
+    return _state == StateConnected;
+}
+
+size_t
+IceBT::StreamSocket::getSendPacketSize(size_t length)
+{
+    return length;
+}
+
+size_t
+IceBT::StreamSocket::getRecvPacketSize(size_t length)
+{
+    return length;
+}
+
+void
+IceBT::StreamSocket::setBufferSize(int rcvSize, int sndSize)
+{
+    assert(_fd != INVALID_SOCKET);
+
+    if(rcvSize > 0)
+    {
+        //
+        // Try to set the buffer size. The kernel will silently adjust
+        // the size to an acceptable value. Then read the size back to
+        // get the size that was actually set.
+        //
+        IceInternal::setRecvBufferSize(_fd, rcvSize);
+        int size = IceInternal::getRecvBufferSize(_fd);
+        if(size > 0 && size < rcvSize)
+        {
+            //
+            // Warn if the size that was set is less than the requested size and
+            // we have not already warned.
+            //
+            IceInternal::BufSizeWarnInfo winfo = _instance->getBufSizeWarn(BTEndpointType);
+            if(!winfo.rcvWarn || rcvSize != winfo.rcvSize)
+            {
+                Ice::Warning out(_instance->logger());
+                out << "BT receive buffer size: requested size of " << rcvSize << " adjusted to " << size;
+                _instance->setRcvBufSizeWarn(BTEndpointType, rcvSize);
+            }
+        }
+    }
+
+    if(sndSize > 0)
+    {
+        //
+        // Try to set the buffer size. The kernel will silently adjust
+        // the size to an acceptable value. Then read the size back to
+        // get the size that was actually set.
+        //
+        IceInternal::setSendBufferSize(_fd, sndSize);
+        int size = IceInternal::getSendBufferSize(_fd);
+        if(size > 0 && size < sndSize)
+        {
+            // Warn if the size that was set is less than the requested size and
+            // we have not already warned.
+            IceInternal::BufSizeWarnInfo winfo = _instance->getBufSizeWarn(BTEndpointType);
+            if(!winfo.sndWarn || sndSize != winfo.sndSize)
+            {
+                Ice::Warning out(_instance->logger());
+                out << "BT send buffer size: requested size of " << sndSize << " adjusted to " << size;
+                _instance->setSndBufSizeWarn(BTEndpointType, sndSize);
+            }
+        }
+    }
+}
+
+IceInternal::SocketOperation
+IceBT::StreamSocket::read(IceInternal::Buffer& buf)
+{
+    buf.i += read(reinterpret_cast<char*>(&*buf.i), buf.b.end() - buf.i);
+    return buf.i != buf.b.end() ? IceInternal::SocketOperationRead : IceInternal::SocketOperationNone;
+}
+
+IceInternal::SocketOperation
+IceBT::StreamSocket::write(IceInternal::Buffer& buf)
+{
+    buf.i += write(reinterpret_cast<const char*>(&*buf.i), buf.b.end() - buf.i);
+    return buf.i != buf.b.end() ? IceInternal::SocketOperationWrite : IceInternal::SocketOperationNone;
+}
+
+ssize_t
+IceBT::StreamSocket::read(char* buf, size_t length)
+{
+    assert(_fd != INVALID_SOCKET);
+
+    size_t packetSize = length;
+    ssize_t read = 0;
+
+    while(length > 0)
+    {
+        ssize_t ret = ::recv(_fd, buf, packetSize, 0);
+        if(ret == 0)
+        {
+            Ice::ConnectionLostException ex(__FILE__, __LINE__);
+            ex.error = 0;
+            throw ex;
+        }
+        else if(ret == SOCKET_ERROR)
+        {
+            if(IceInternal::interrupted())
+            {
+                continue;
+            }
+
+            if(IceInternal::noBuffers() && packetSize > 1024)
+            {
+                packetSize /= 2;
+                continue;
+            }
+
+            if(IceInternal::wouldBlock())
+            {
+                return read;
+            }
+
+            if(IceInternal::connectionLost())
+            {
+                Ice::ConnectionLostException ex(__FILE__, __LINE__);
+                ex.error = IceInternal::getSocketErrno();
+                throw ex;
+            }
+            else
+            {
+                Ice::SocketException ex(__FILE__, __LINE__);
+                ex.error = IceInternal::getSocketErrno();
+                throw ex;
+            }
+        }
+
+        buf += ret;
+        read += ret;
+        length -= ret;
+
+        if(packetSize > length)
+        {
+            packetSize = length;
+        }
+    }
+    return read;
+}
+
+ssize_t
+IceBT::StreamSocket::write(const char* buf, size_t length)
+{
+    assert(_fd != INVALID_SOCKET);
+
+    size_t packetSize = length;
+
+    ssize_t sent = 0;
+    while(length > 0)
+    {
+        ssize_t ret = ::send(_fd, buf, packetSize, 0);
+        if(ret == 0)
+        {
+            Ice::ConnectionLostException ex(__FILE__, __LINE__);
+            ex.error = 0;
+            throw ex;
+        }
+        else if(ret == SOCKET_ERROR)
+        {
+            if(IceInternal::interrupted())
+            {
+                continue;
+            }
+
+            if(IceInternal::noBuffers() && packetSize > 1024)
+            {
+                packetSize /= 2;
+                continue;
+            }
+
+            if(IceInternal::wouldBlock())
+            {
+                return sent;
+            }
+
+            if(IceInternal::connectionLost())
+            {
+                Ice::ConnectionLostException ex(__FILE__, __LINE__);
+                ex.error = IceInternal::getSocketErrno();
+                throw ex;
+            }
+            else
+            {
+                Ice::SocketException ex(__FILE__, __LINE__);
+                ex.error = IceInternal::getSocketErrno();
+                throw ex;
+            }
+        }
+
+        buf += ret;
+        sent += ret;
+        length -= ret;
+
+        if(packetSize > length)
+        {
+            packetSize = length;
+        }
+    }
+    return sent;
+}
+
+void
+IceBT::StreamSocket::close()
+{
+    assert(_fd != INVALID_SOCKET);
+    try
+    {
+        IceInternal::closeSocket(_fd);
+        _fd = INVALID_SOCKET;
+    }
+    catch(const Ice::SocketException&)
+    {
+        _fd = INVALID_SOCKET;
+        throw;
+    }
+}
+
+const string&
+IceBT::StreamSocket::toString() const
+{
+    return _desc;
+}
+
+void
+IceBT::StreamSocket::init()
+{
+    IceInternal::setBlock(_fd, false);
+
+    Int rcvSize = _instance->properties()->getPropertyAsInt("IceBT.RcvSize");
+    Int sndSize = _instance->properties()->getPropertyAsInt("IceBT.SndSize");
+
+    setBufferSize(rcvSize, sndSize);
+}
diff --git a/cpp/src/IceBT/StreamSocket.h b/cpp/src/IceBT/StreamSocket.h
new file mode 100644
index 00000000000..f618d7f1324
--- /dev/null
+++ b/cpp/src/IceBT/StreamSocket.h
@@ -0,0 +1,68 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_BT_STREAM_SOCKET_H
+#define ICE_BT_STREAM_SOCKET_H
+
+#include <IceBT/Config.h>
+#include <IceBT/InstanceF.h>
+
+#include <IceUtil/Shared.h>
+#include <Ice/Network.h>
+#include <Ice/Buffer.h>
+
+namespace IceBT
+{
+
+class StreamSocket : public IceInternal::NativeInfo
+{
+public:
+
+    StreamSocket(const InstancePtr&, const SocketAddress&);
+    StreamSocket(const InstancePtr&, SOCKET);
+    virtual ~StreamSocket();
+
+    IceInternal::SocketOperation connect(IceInternal::Buffer&, IceInternal::Buffer&);
+    bool isConnected();
+    size_t getSendPacketSize(size_t);
+    size_t getRecvPacketSize(size_t);
+
+    void setBufferSize(int rcvSize, int sndSize);
+
+    IceInternal::SocketOperation read(IceInternal::Buffer&);
+    IceInternal::SocketOperation write(IceInternal::Buffer&);
+
+    ssize_t read(char*, size_t);
+    ssize_t write(const char*, size_t);
+
+    void close();
+    const std::string& toString() const;
+
+private:
+
+    void init();
+
+    enum State
+    {
+        StateNeedConnect,
+        StateConnectPending,
+        StateConnected
+    };
+
+    const InstancePtr _instance;
+    SocketAddress _addr;
+    State _state;
+    std::string _desc;
+};
+typedef IceUtil::Handle<StreamSocket> StreamSocketPtr;
+
+}
+
+#endif
+
diff --git a/cpp/src/IceBT/TransceiverI.cpp b/cpp/src/IceBT/TransceiverI.cpp
new file mode 100644
index 00000000000..4a3f4005803
--- /dev/null
+++ b/cpp/src/IceBT/TransceiverI.cpp
@@ -0,0 +1,122 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceBT/TransceiverI.h>
+#include <IceBT/ConnectionInfo.h>
+#include <IceBT/Engine.h>
+#include <IceBT/Instance.h>
+#include <IceBT/Util.h>
+
+#include <Ice/Connection.h>
+#include <Ice/LocalException.h>
+
+#include <IceUtil/DisableWarnings.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceBT;
+
+IceInternal::NativeInfoPtr
+IceBT::TransceiverI::getNativeInfo()
+{
+    return _stream;
+}
+
+IceInternal::SocketOperation
+IceBT::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& writeBuffer)
+{
+    return _stream->connect(readBuffer, writeBuffer);
+}
+
+IceInternal::SocketOperation
+#ifdef ICE_CPP11_MAPPING
+IceBT::TransceiverI::closing(bool initiator, exception_ptr)
+#else
+IceBT::TransceiverI::closing(bool initiator, const Ice::LocalException&)
+#endif
+{
+    //
+    // If we are initiating the connection closure, wait for the peer
+    // to close the TCP/IP connection. Otherwise, close immediately.
+    //
+    return initiator ? IceInternal::SocketOperationRead : IceInternal::SocketOperationNone;
+}
+
+void
+IceBT::TransceiverI::close()
+{
+    _stream->close();
+}
+
+IceInternal::SocketOperation
+IceBT::TransceiverI::write(IceInternal::Buffer& buf)
+{
+    return _stream->write(buf);
+}
+
+IceInternal::SocketOperation
+IceBT::TransceiverI::read(IceInternal::Buffer& buf)
+{
+    return _stream->read(buf);
+}
+
+string
+IceBT::TransceiverI::protocol() const
+{
+    return _instance->protocol();
+}
+
+string
+IceBT::TransceiverI::toString() const
+{
+    return _stream->toString();
+}
+
+string
+IceBT::TransceiverI::toDetailedString() const
+{
+    return toString();
+}
+
+Ice::ConnectionInfoPtr
+IceBT::TransceiverI::getInfo() const
+{
+    IceBT::ConnectionInfoPtr info = ICE_MAKE_SHARED(IceBT::ConnectionInfo);
+    fdToAddressAndChannel(_stream->fd(), info->localAddress, info->localChannel, info->remoteAddress,
+                          info->remoteChannel);
+    if(_stream->fd() != INVALID_SOCKET)
+    {
+        info->rcvSize = IceInternal::getRecvBufferSize(_stream->fd());
+        info->sndSize = IceInternal::getSendBufferSize(_stream->fd());
+    }
+    info->uuid = _uuid;
+    return info;
+}
+
+void
+IceBT::TransceiverI::checkSendSize(const IceInternal::Buffer&)
+{
+}
+
+void
+IceBT::TransceiverI::setBufferSize(int rcvSize, int sndSize)
+{
+    _stream->setBufferSize(rcvSize, sndSize);
+}
+
+IceBT::TransceiverI::TransceiverI(const InstancePtr& instance, const StreamSocketPtr& stream, const string& uuid) :
+    _instance(instance),
+    _stream(stream),
+    _uuid(uuid)
+{
+}
+
+IceBT::TransceiverI::~TransceiverI()
+{
+}
diff --git a/cpp/src/IceBT/TransceiverI.h b/cpp/src/IceBT/TransceiverI.h
new file mode 100644
index 00000000000..dee886dffb3
--- /dev/null
+++ b/cpp/src/IceBT/TransceiverI.h
@@ -0,0 +1,61 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_BT_TRANSCEIVER_H
+#define ICE_BT_TRANSCEIVER_H
+
+#include <IceBT/InstanceF.h>
+#include <IceBT/StreamSocket.h>
+
+#include <Ice/Transceiver.h>
+
+namespace IceBT
+{
+
+class ConnectorI;
+class AcceptorI;
+
+class TransceiverI : public IceInternal::Transceiver
+{
+public:
+
+    virtual IceInternal::NativeInfoPtr getNativeInfo();
+
+    virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&);
+#ifdef ICE_CPP11_MAPPING
+    virtual IceInternal::SocketOperation closing(bool, std::exception_ptr);
+#else
+    virtual IceInternal::SocketOperation closing(bool, const Ice::LocalException&);
+#endif
+    virtual void close();
+    virtual IceInternal::SocketOperation write(IceInternal::Buffer&);
+    virtual IceInternal::SocketOperation read(IceInternal::Buffer&);
+    virtual std::string protocol() const;
+    virtual std::string toString() const;
+    virtual std::string toDetailedString() const;
+    virtual Ice::ConnectionInfoPtr getInfo() const;
+    virtual void checkSendSize(const IceInternal::Buffer&);
+    virtual void setBufferSize(int rcvSize, int sndSize);
+
+private:
+
+    TransceiverI(const InstancePtr&, const StreamSocketPtr&, const std::string&);
+    virtual ~TransceiverI();
+
+    friend class ConnectorI;
+    friend class AcceptorI;
+
+    const InstancePtr _instance;
+    const StreamSocketPtr _stream;
+    const std::string _uuid;
+};
+
+}
+
+#endif
diff --git a/cpp/src/IceBT/Util.cpp b/cpp/src/IceBT/Util.cpp
new file mode 100644
index 00000000000..3953de2bd58
--- /dev/null
+++ b/cpp/src/IceBT/Util.cpp
@@ -0,0 +1,390 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceBT/Util.h>
+
+#include <Ice/LocalException.h>
+#include <Ice/Network.h>
+#include <IceUtil/StringUtil.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceBT;
+
+bool
+IceBT::isValidDeviceAddress(const string& str)
+{
+    //
+    // Format is 01:23:45:67:89:0A
+    //
+
+    if(str.size() != 17 || str[2] != ':' || str[5] != ':' || str[8] != ':' || str[11] != ':' || str[14] != ':')
+    {
+        return false;
+    }
+
+    for(string::size_type i = 0; i < str.size(); i += 3)
+    {
+        if(!isxdigit(str[i]) || !isxdigit(str[i + 1]))
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool
+IceBT::parseDeviceAddress(const string& str, DeviceAddress& addr)
+{
+    uint8_t b0, b1, b2, b3, b4, b5;
+
+    if(isValidDeviceAddress(str) &&
+       sscanf(str.c_str(), "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", &b5, &b4, &b3, &b2, &b1, &b0) == 6)
+    {
+        addr.b[0] = b0;
+        addr.b[1] = b1;
+        addr.b[2] = b2;
+        addr.b[3] = b3;
+        addr.b[4] = b4;
+        addr.b[5] = b5;
+        return true;
+    }
+
+    return false;
+}
+
+string
+IceBT::formatDeviceAddress(const DeviceAddress& addr)
+{
+    char buf[64];
+    sprintf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", addr.b[5], addr.b[4], addr.b[3], addr.b[2], addr.b[1],
+            addr.b[0]);
+    return IceUtilInternal::toUpper(string(buf));
+}
+
+string
+IceBT::addrToString(const string& addr, Int channel)
+{
+    ostringstream ostr;
+    ostr << addr << '#' << channel;
+    return ostr.str();
+}
+
+string
+IceBT::addrToString(const SocketAddress& addr)
+{
+    return addrToString(formatDeviceAddress(addr.rc_bdaddr), addr.rc_channel);
+}
+
+SocketAddress
+IceBT::createAddr(const string& addr, Ice::Int channel)
+{
+    SocketAddress ret;
+    ret.rc_family = AF_BLUETOOTH;
+    ret.rc_channel = static_cast<uint8_t>(channel);
+    parseDeviceAddress(addr, ret.rc_bdaddr);
+    return ret;
+}
+
+SOCKET
+IceBT::createSocket()
+{
+    SOCKET fd = ::socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
+    if(fd == INVALID_SOCKET)
+    {
+        SocketException ex(__FILE__, __LINE__);
+        ex.error = errno;
+        throw ex;
+    }
+    return fd;
+}
+
+bool
+IceBT::doConnect(SOCKET fd, const SocketAddress& addr)
+{
+    int size = sizeof(SocketAddress);
+    assert(size != 0);
+
+repeatConnect:
+    if(::connect(fd, reinterpret_cast<const struct sockaddr*>(&addr), size) == SOCKET_ERROR)
+    {
+        if(IceInternal::interrupted())
+        {
+            goto repeatConnect;
+        }
+
+        if(IceInternal::connectInProgress())
+        {
+            return false;
+        }
+
+        IceInternal::closeSocketNoThrow(fd);
+        if(IceInternal::connectionRefused())
+        {
+            ConnectionRefusedException ex(__FILE__, __LINE__);
+            ex.error = IceInternal::getSocketErrno();
+            throw ex;
+        }
+        else if(IceInternal::connectFailed())
+        {
+            ConnectFailedException ex(__FILE__, __LINE__);
+            ex.error = IceInternal::getSocketErrno();
+            throw ex;
+        }
+        else
+        {
+            SocketException ex(__FILE__, __LINE__);
+            ex.error = IceInternal::getSocketErrno();
+            throw ex;
+        }
+    }
+    return true;
+}
+
+void
+IceBT::doFinishConnect(SOCKET fd)
+{
+    //
+    // Note: we don't close the socket if there's an exception. It's the responsibility
+    // of the caller to do so.
+    //
+
+    int val;
+    socklen_t len = static_cast<socklen_t>(sizeof(int));
+    if(::getsockopt(fd, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&val), &len) == SOCKET_ERROR)
+    {
+        SocketException ex(__FILE__, __LINE__);
+        ex.error = IceInternal::getSocketErrno();
+        throw ex;
+    }
+
+    if(val > 0)
+    {
+        errno = val;
+        if(IceInternal::connectionRefused())
+        {
+            ConnectionRefusedException ex(__FILE__, __LINE__);
+            ex.error = IceInternal::getSocketErrno();
+            throw ex;
+        }
+        else if(IceInternal::connectFailed())
+        {
+            ConnectFailedException ex(__FILE__, __LINE__);
+            ex.error = IceInternal::getSocketErrno();
+            throw ex;
+        }
+        else
+        {
+            SocketException ex(__FILE__, __LINE__);
+            ex.error = IceInternal::getSocketErrno();
+            throw ex;
+        }
+    }
+}
+
+SocketAddress
+IceBT::doBind(SOCKET fd, const SocketAddress& addr)
+{
+    if(addr.rc_channel <= 0)
+    {
+        //
+        // Find an available by channel by looping over the valid channel numbers (1-30) until bind succeeds.
+        //
+        SocketAddress tmp = addr;
+        for(tmp.rc_channel = 1; tmp.rc_channel <= 30; ++tmp.rc_channel)
+        {
+            if(::bind(fd, reinterpret_cast<const struct sockaddr*>(&tmp), sizeof(SocketAddress)) == 0)
+            {
+                break;
+            }
+        }
+        if(tmp.rc_channel > 30)
+        {
+            IceInternal::closeSocketNoThrow(fd);
+            SocketException ex(__FILE__, __LINE__);
+            ex.error = errno;
+            throw ex;
+        }
+    }
+    else
+    {
+        if(::bind(fd, reinterpret_cast<const struct sockaddr*>(&addr), sizeof(SocketAddress)) == SOCKET_ERROR)
+        {
+            IceInternal::closeSocketNoThrow(fd);
+            SocketException ex(__FILE__, __LINE__);
+            ex.error = errno;
+            throw ex;
+        }
+    }
+
+    SocketAddress local;
+    socklen_t len = static_cast<socklen_t>(sizeof(SocketAddress));
+#  ifdef NDEBUG
+    getsockname(fd, reinterpret_cast<struct sockaddr*>(&local), &len);
+#  else
+    int ret = getsockname(fd, reinterpret_cast<struct sockaddr*>(&local), &len);
+    assert(ret != SOCKET_ERROR);
+#  endif
+    return local;
+}
+
+SOCKET
+IceBT::doAccept(SOCKET fd)
+{
+    int ret;
+
+repeatAccept:
+    if((ret = ::accept(fd, 0, 0)) == INVALID_SOCKET)
+    {
+        if(IceInternal::acceptInterrupted())
+        {
+            goto repeatAccept;
+        }
+
+        SocketException ex(__FILE__, __LINE__);
+        ex.error = errno;
+        throw ex;
+    }
+
+    return ret;
+}
+
+namespace
+{
+
+void
+fdToLocalAddress(SOCKET fd, SocketAddress& addr)
+{
+    socklen_t len = static_cast<socklen_t>(sizeof(sockaddr_rc));
+    if(::getsockname(fd, reinterpret_cast<struct sockaddr*>(&addr), &len) == SOCKET_ERROR)
+    {
+        IceInternal::closeSocketNoThrow(fd);
+        SocketException ex(__FILE__, __LINE__);
+        ex.error = IceInternal::getSocketErrno();
+        throw ex;
+    }
+}
+
+bool
+fdToRemoteAddress(SOCKET fd, SocketAddress& addr)
+{
+    socklen_t len = static_cast<socklen_t>(sizeof(sockaddr_rc));
+    if(::getpeername(fd, reinterpret_cast<struct sockaddr*>(&addr), &len) == SOCKET_ERROR)
+    {
+        if(IceInternal::notConnected())
+        {
+            return false;
+        }
+        else
+        {
+            IceInternal::closeSocketNoThrow(fd);
+            SocketException ex(__FILE__, __LINE__);
+            ex.error = IceInternal::getSocketErrno();
+            throw ex;
+        }
+    }
+
+    return true;
+}
+
+string
+addressesToString(const SocketAddress& localAddr, const SocketAddress& remoteAddr, bool peerConnected)
+{
+    ostringstream s;
+    s << "local address = " << addrToString(localAddr);
+    if(peerConnected)
+    {
+        s << "\nremote address = " << addrToString(remoteAddr);
+    }
+    else
+    {
+        s << "\nremote address = <not connected>";
+    }
+    return s.str();
+}
+
+void
+addrToAddressAndChannel(const SocketAddress& addr, string& address, int& channel)
+{
+    address = formatDeviceAddress(addr.rc_bdaddr);
+    channel = addr.rc_channel;
+}
+
+}
+
+string
+IceBT::fdToString(SOCKET fd)
+{
+    if(fd == INVALID_SOCKET)
+    {
+        return "<closed>";
+    }
+
+    SocketAddress localAddr;
+    fdToLocalAddress(fd, localAddr);
+
+    SocketAddress remoteAddr;
+    bool peerConnected = fdToRemoteAddress(fd, remoteAddr);
+
+    return addressesToString(localAddr, remoteAddr, peerConnected);
+}
+
+void
+IceBT::fdToAddressAndChannel(SOCKET fd, string& localAddress, int& localChannel, string& remoteAddress,
+                             int& remoteChannel)
+{
+    if(fd == INVALID_SOCKET)
+    {
+        localAddress.clear();
+        remoteAddress.clear();
+        localChannel = -1;
+        remoteChannel = -1;
+        return;
+    }
+
+    SocketAddress localAddr;
+    fdToLocalAddress(fd, localAddr);
+    addrToAddressAndChannel(localAddr, localAddress, localChannel);
+
+    SocketAddress remoteAddr;
+    if(fdToRemoteAddress(fd, remoteAddr))
+    {
+        addrToAddressAndChannel(remoteAddr, remoteAddress, remoteChannel);
+    }
+    else
+    {
+        remoteAddress.clear();
+        remoteChannel = -1;
+    }
+}
+
+int
+IceBT::compareAddress(const SocketAddress& addr1, const SocketAddress& addr2)
+{
+    if(addr1.rc_family < addr2.rc_family)
+    {
+        return -1;
+    }
+    else if(addr2.rc_family < addr1.rc_family)
+    {
+        return 1;
+    }
+
+    if(addr1.rc_channel < addr2.rc_channel)
+    {
+        return -1;
+    }
+    else if(addr2.rc_channel < addr1.rc_channel)
+    {
+        return 1;
+    }
+
+    return ::memcmp(&addr1.rc_bdaddr, &addr2.rc_bdaddr, sizeof(bdaddr_t));
+}
diff --git a/cpp/src/IceBT/Util.h b/cpp/src/IceBT/Util.h
new file mode 100644
index 00000000000..29cd8ff9518
--- /dev/null
+++ b/cpp/src/IceBT/Util.h
@@ -0,0 +1,40 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_BT_UTIL_H
+#define ICE_BT_UTIL_H
+
+#include <IceBT/Config.h>
+#include <IceBT/Types.h>
+
+#include <Ice/Network.h>
+
+namespace IceBT
+{
+
+bool isValidDeviceAddress(const std::string&);
+bool parseDeviceAddress(const std::string&, DeviceAddress&);
+std::string formatDeviceAddress(const DeviceAddress&);
+
+std::string addrToString(const std::string&, Ice::Int);
+std::string addrToString(const SocketAddress&);
+SocketAddress createAddr(const std::string&, Ice::Int);
+
+SOCKET createSocket();
+bool doConnect(SOCKET, const SocketAddress&);
+void doFinishConnect(SOCKET);
+SocketAddress doBind(SOCKET, const SocketAddress&);
+SOCKET doAccept(SOCKET);
+std::string fdToString(SOCKET);
+void fdToAddressAndChannel(SOCKET, std::string&, int&, std::string&, int&);
+int compareAddress(const SocketAddress&, const SocketAddress&);
+
+}
+
+#endif
diff --git a/cpp/src/IceBox/.depend.mak b/cpp/src/IceBox/.depend.mak
deleted file mode 100755
index 2d4c6b79cb0..00000000000
--- a/cpp/src/IceBox/.depend.mak
+++ /dev/null
@@ -1,569 +0,0 @@
-
-IceBox.h: \
-    "$(slicedir)\IceBox\IceBox.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/CommunicatorF.ice" \
-    "$(slicedir)/Ice/PropertiesF.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice"
-
-Service.obj: \
-	Service.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "ServiceManagerI.h" \
-    "$(includedir)\IceBox\IceBox.h" \
-    "$(includedir)\IceBox\Config.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-
-ServiceManagerI.obj: \
-	ServiceManagerI.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Ice\DynamicLibrary.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "..\..\src\Ice\Instance.h" \
-    "..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\src\Ice\RouterInfoF.h" \
-    "..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\src\Ice\RetryQueueF.h" \
-    "..\..\src\Ice\NetworkF.h" \
-    "..\..\src\Ice\NetworkProxyF.h" \
-    "..\..\src\Ice\ImplicitContextI.h" \
-    "ServiceManagerI.h" \
-    "$(includedir)\IceBox\IceBox.h" \
-    "$(includedir)\IceBox\Config.h" \
-
-Admin.obj: \
-	Admin.cpp \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceBox\IceBox.h" \
-    "$(includedir)\IceBox\Config.h" \
-
-IceBox.obj: \
-	IceBox.cpp \
-    "$(includedir)\IceBox\IceBox.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceBox\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-
-Exception.obj: \
-	Exception.cpp \
-    "$(includedir)\IceBox\IceBox.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceBox\Config.h" \
diff --git a/cpp/src/IceBox/.gitignore b/cpp/src/IceBox/.gitignore
deleted file mode 100644
index c483621af47..00000000000
--- a/cpp/src/IceBox/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
-IceBox.cpp
-IceBox.h
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index a619bf6546f..c7c76bac161 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -92,7 +92,7 @@ Client::run(int argc, char* argv[])
     }
 
 
-    ObjectPrx base = communicator()->propertyToProxy("IceBoxAdmin.ServiceManager.Proxy");
+    ObjectPrxPtr base = communicator()->propertyToProxy("IceBoxAdmin.ServiceManager.Proxy");
 
     if(base == 0)
     {
@@ -133,7 +133,7 @@ Client::run(int argc, char* argv[])
         base = communicator()->stringToProxy(managerProxy);
     }
 
-    IceBox::ServiceManagerPrx manager = IceBox::ServiceManagerPrx::checkedCast(base);
+    IceBox::ServiceManagerPrxPtr manager = ICE_CHECKED_CAST(IceBox::ServiceManagerPrx, base);
     if(!manager)
     {
         cerr << appName() << ": `" << base << "' is not an IceBox::ServiceManager" << endl;
diff --git a/cpp/src/IceBox/Exception.cpp b/cpp/src/IceBox/Exception.cpp
index 1828f76765c..757749f36bf 100644
--- a/cpp/src/IceBox/Exception.cpp
+++ b/cpp/src/IceBox/Exception.cpp
@@ -7,7 +7,6 @@
 //
 // **********************************************************************
 
-#define ICE_BOX_API_EXPORTS
 #include <IceBox/IceBox.h>
 
 using namespace std;
diff --git a/cpp/src/IceBox/IceBox.rc b/cpp/src/IceBox/IceBox.rc
index 394ba232d4d..4e8d190e3c0 100644
--- a/cpp/src/IceBox/IceBox.rc
+++ b/cpp/src/IceBox/IceBox.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icebox36d\0"
- #define ORIGINALFILENAME "icebox36d.dll\0"
+ #define INTERNALNAME "icebox37a2d\0"
+ #define ORIGINALFILENAME "icebox37a2d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icebox36\0"
- #define ORIGINALFILENAME "icebox36.dll\0"
+ #define INTERNALNAME "icebox37a2\0"
+ #define ORIGINALFILENAME "icebox37a2.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceBox C++ Library\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBoxAdmin.rc b/cpp/src/IceBox/IceBoxAdmin.rc
index 3bf1d1ddf6b..14cdd6eaf65 100644
--- a/cpp/src/IceBox/IceBoxAdmin.rc
+++ b/cpp/src/IceBox/IceBoxAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceBox Admin\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "iceboxadmin\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "iceboxadmin.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBoxExe.rc b/cpp/src/IceBox/IceBoxExe.rc
index 50a02cf3821..a6f5ea4da03 100644
--- a/cpp/src/IceBox/IceBoxExe.rc
+++ b/cpp/src/IceBox/IceBoxExe.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceBox C++ Server\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile
deleted file mode 100644
index acacecfc27a..00000000000
--- a/cpp/src/IceBox/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME	= $(call mklibfilename,IceBox,$(VERSION))
-SONAME    	= $(call mksoname,IceBox,$(SOVERSION))
-LIBNAME		= $(call mklibname,IceBox)
-
-SERVER		= $(bindir)/icebox$(binsuffix)
-ADMIN		= $(bindir)/iceboxadmin
-
-LIBTARGETS 	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-TARGETS   	= $(LIBTARGETS) $(SERVER) $(ADMIN)
-
-SLICE_OBJS      = IceBox.o
-
-LIB_OBJS	= Exception.o \
-		  $(SLICE_OBJS)
-
-SOBJS		= Service.o \
-		  ServiceManagerI.o
-
-AOBJS		= Admin.o
-
-OBJS		= $(LIB_OBJS) \
-		  $(SOBJS) \
-		  $(AOBJS)
-
-HDIR		= $(headerdir)/IceBox
-SDIR		= $(slicedir)/IceBox
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I.. $(CPPFLAGS)
-SLICE2CPPFLAGS	:= --checksum --ice --dll-export ICE_BOX_API --include-dir IceBox $(SLICE2CPPFLAGS)
-LINKWITH	:= $(BZIP2_RPATH_LINK) -lIce -lIceUtil
-
-$(libdir)/$(LIBFILENAME): $(LIB_OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(LIB_OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	@mkdir -p $(libdir)$(cpp11libdirsuffix)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-
-$(SERVER): $(SOBJS) $(LIBTARGETS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) -lIceBox $(LIBS)
-
-$(ADMIN): $(AOBJS) $(LIBTARGETS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(AOBJS) -lIceBox $(LIBS)
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
-	$(call installprogram,$(SERVER),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/icebox.1,$(DESTDIR)$(install_mandir))
-	$(call installprogram,$(ADMIN),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/iceboxadmin.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak
deleted file mode 100644
index 637d63b6874..00000000000
--- a/cpp/src/IceBox/Makefile.mak
+++ /dev/null
@@ -1,104 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME		= $(top_srcdir)\lib\icebox$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icebox$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-SERVER_D	= $(top_srcdir)\bin\iceboxd.exe
-SERVER_R	= $(top_srcdir)\bin\icebox.exe
-
-SERVER		= $(top_srcdir)\bin\icebox$(LIBSUFFIX).exe
-
-ADMIN		= $(top_srcdir)\bin\iceboxadmin.exe
-
-TARGETS		= $(LIBNAME) $(DLLNAME) $(SERVER) $(ADMIN)
-
-SLICE_OBJS      = .\IceBox.obj
-
-LIB_OBJS	= $(SLICE_OBJS) \
-		  .\Exception.obj
-
-SOBJS		= .\Service.obj \
-		  .\ServiceManagerI.obj
-
-AOBJS		= .\Admin.obj
-
-OBJS		= $(SOBJS) \
-		  $(AOBJS) \
-		  $(LIB_OBJS)
-
-HDIR		= $(headerdir)\IceBox
-SDIR		= $(slicedir)\IceBox
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-SLICE2CPPFLAGS	= --checksum --ice --dll-export ICE_BOX_API --include-dir IceBox $(SLICE2CPPFLAGS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-SPDBFLAGS       = /pdb:$(SERVER:.exe=.pdb)
-APDBFLAGS       = /pdb:$(ADMIN:.exe=.pdb)
-!endif
-
-RES_FILE        = IceBox.res
-SRES_FILE       = IceBoxExe.res
-ARES_FILE       = IceBoxAdmin.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(LIB_OBJS) IceBox.res
-	$(LINK) $(BASE):0x26000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(LIB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-$(SERVER): $(SOBJS) IceBoxExe.res
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
-		$(SRES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-$(ADMIN): $(AOBJS) IceBoxAdmin.res
-	$(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
-		$(ARES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	-del /q IceBox.cpp $(HDIR)\IceBox.h
-	-del /q $(SERVER_D:.exe=.*) $(SERVER_R:.exe=.*)
-	-del /q $(ADMIN:.exe=.*)
-	-del /q IceBox.res IceBoxAdmin.res IceBoxExe.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-	copy $(SERVER) "$(install_bindir)"
-	copy $(ADMIN) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-	copy $(SERVER:.exe=.pdb) "$(install_bindir)"
-	copy $(ADMIN:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/IceBox/Makefile.mk b/cpp/src/IceBox/Makefile.mk
new file mode 100644
index 00000000000..15d0798d6bd
--- /dev/null
+++ b/cpp/src/IceBox/Makefile.mk
@@ -0,0 +1,26 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries 	:= IceBox
+$(project)_programs	:= icebox iceboxadmin
+$(project)_dependencies	:= Ice
+$(project)_sliceflags	:= --include-dir IceBox --dll-export ICEBOX_API
+
+IceBox_targetdir	:= $(libdir)
+IceBox_sources	    	:= $(slicedir)/IceBox/IceBox.ice $(currentdir)/Exception.cpp
+
+icebox_targetdir	:= $(bindir)
+icebox_sources	    	:= $(currentdir)/Service.cpp $(currentdir)/ServiceManagerI.cpp
+icebox_dependencies 	:= IceBox
+
+iceboxadmin_targetdir	:= $(bindir)
+iceboxadmin_sources	:= $(currentdir)/Admin.cpp
+iceboxadmin_dependencies:= IceBox
+
+projects += $(project)
diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp
index f93cc30f414..bbfb78c86c7 100644
--- a/cpp/src/IceBox/Service.cpp
+++ b/cpp/src/IceBox/Service.cpp
@@ -100,7 +100,7 @@ IceBox::IceBoxService::start(int argc, char* argv[], int& status)
         return false;
     }
 
-    _serviceManager = new ServiceManagerI(communicator(), argc, argv);
+    _serviceManager = ICE_MAKE_SHARED(ServiceManagerI, communicator(), argc, argv);
 
     return _serviceManager->start();
 }
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index 695b2bf47c1..ed4af718a91 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -77,7 +77,9 @@ IceBox::ServiceManagerI::ServiceManagerI(CommunicatorPtr communicator, int& argc
     _pendingStatusChanges(false),
     _traceServiceObserver(0)
 {
+#ifndef ICE_CPP11_MAPPING
     const_cast<CallbackPtr&>(_observerCompletedCB) = newCallback(this, &ServiceManagerI::observerCompleted);
+#endif
     _logger = _communicator->getLogger();
 
     PropertiesPtr props = _communicator->getProperties();
@@ -118,7 +120,7 @@ IceBox::ServiceManagerI::getSliceChecksums(const Current&) const
 }
 
 void
-IceBox::ServiceManagerI::startService(const string& name, const Current&)
+IceBox::ServiceManagerI::startService(ICE_IN(string) name, const Current&)
 {
     ServiceInfo info;
     {
@@ -194,7 +196,7 @@ IceBox::ServiceManagerI::startService(const string& name, const Current&)
 }
 
 void
-IceBox::ServiceManagerI::stopService(const string& name, const Current&)
+IceBox::ServiceManagerI::stopService(ICE_IN(string) name, const Current&)
 {
     ServiceInfo info;
     {
@@ -270,7 +272,7 @@ IceBox::ServiceManagerI::stopService(const string& name, const Current&)
 }
 
 void
-IceBox::ServiceManagerI::addObserver(const ServiceObserverPrx& observer, const Current&)
+IceBox::ServiceManagerI::addObserver(ICE_IN(ServiceObserverPrxPtr) observer, const Current&)
 {
     //
     // Null observers and duplicate registrations are ignored
@@ -297,7 +299,11 @@ IceBox::ServiceManagerI::addObserver(const ServiceObserverPrx& observer, const C
 
         if(activeServices.size() > 0)
         {
+#ifdef ICE_CPP11_MAPPING
+            observer->servicesStartedAsync(activeServices, nullptr, makeObserverCompletedCallback(observer));
+#else
             observer->begin_servicesStarted(activeServices, _observerCompletedCB);
+#endif
         }
     }
 }
@@ -313,7 +319,7 @@ IceBox::ServiceManagerI::start()
 {
     try
     {
-        ServiceManagerPtr obj = this;
+        ServiceManagerPtr obj = ICE_SHARED_FROM_THIS;
         PropertiesPtr properties = _communicator->getProperties();
 
         //
@@ -470,7 +476,7 @@ IceBox::ServiceManagerI::start()
         //
         try
         {
-            _communicator->addAdminFacet(this, "IceBox.ServiceManager");
+            _communicator->addAdminFacet(ICE_SHARED_FROM_THIS, "IceBox.ServiceManager");
             _communicator->getAdmin();
         }
         catch(const ObjectAdapterDeactivatedException&)
@@ -672,7 +678,7 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint,
         SERVICE_FACTORY factory = reinterpret_cast<SERVICE_FACTORY>(sym);
         try
         {
-            info.service = factory(_communicator);
+            info.service = ServicePtr(factory(_communicator));
         }
         catch(const FailureException&)
         {
@@ -902,8 +908,76 @@ IceBox::ServiceManagerI::stopAll()
 
     servicesStopped(stoppedServices, _observers);
 
+#ifndef ICE_CPP11_MAPPING
     _observerCompletedCB = 0; // Break cyclic reference count.
+#endif
+}
+
+#ifdef ICE_CPP11_MAPPING
+
+function<void(exception_ptr)>
+IceBox::ServiceManagerI::makeObserverCompletedCallback(const shared_ptr<ServiceObserverPrx>& observer)
+{
+    auto self = weak_from_this();
+    return [self, observer](exception_ptr ex)
+        {
+            auto s = self.lock();
+            if(s)
+            {
+                s->observerCompleted(observer, ex);
+            }
+        };
+}
+void
+IceBox::ServiceManagerI::servicesStarted(const vector<string>& services, const set<shared_ptr<ServiceObserverPrx>>& observers)
+{
+    if(services.size() > 0)
+    {
+        for(auto p : observers)
+        {
+            p->servicesStartedAsync(services, nullptr, makeObserverCompletedCallback(p));
+        }
+    }
+}
+
+void
+IceBox::ServiceManagerI::servicesStopped(const vector<string>& services, const set<shared_ptr<ServiceObserverPrx>>& observers)
+{
+    if(services.size() > 0)
+    {
+        for(auto p : observers)
+        {
+            p->servicesStoppedAsync(services, nullptr, makeObserverCompletedCallback(p));
+        }
+    }
+}
+
+void
+IceBox::ServiceManagerI::observerRemoved(const shared_ptr<ServiceObserverPrx>& observer, exception_ptr err)
+{
+    if(_traceServiceObserver >= 1)
+    {
+        try
+        {
+            rethrow_exception(err);
+        }
+        catch(const CommunicatorDestroyedException&)
+        {
+            //
+            // CommunicatorDestroyedException may occur during shutdown. The observer notification has
+            // been sent, but the communicator was destroyed before the reply was received. We do not
+            // log a message for this exception.
+            //
+        }
+        catch(const exception& ex)
+        {
+            Trace out(_logger, "IceBox.ServiceObserver");
+            out << "Removed service observer " << _communicator->proxyToString(observer)
+                << "\nafter catching " << ex.what();
+        }
+    }
 }
+#else
 
 void
 IceBox::ServiceManagerI::servicesStarted(const vector<string>& services, const set<ServiceObserverPrx>& observers)
@@ -947,6 +1021,7 @@ IceBox::ServiceManagerI::observerRemoved(const ServiceObserverPrx& observer, con
         }
     }
 }
+#endif
 
 Ice::PropertiesPtr
 IceBox::ServiceManagerI::createServiceProperties(const string& service)
@@ -981,6 +1056,24 @@ IceBox::ServiceManagerI::createServiceProperties(const string& service)
     return properties;
 }
 
+#ifdef ICE_CPP11_MAPPING
+void
+ServiceManagerI::observerCompleted(const shared_ptr<ServiceObserverPrx>& observer, exception_ptr ex)
+{
+    IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
+    //
+    // It's possible to remove several times the same observer, e.g. multiple concurrent
+    // requests that fail
+    //
+    auto p = _observers.find(observer);
+    if(p != _observers.end())
+    {
+        auto observer = *p;
+        _observers.erase(p);
+        observerRemoved(observer, ex);
+    }
+}
+#else
 void
 ServiceManagerI::observerCompleted(const Ice::AsyncResultPtr& result)
 {
@@ -1006,6 +1099,7 @@ ServiceManagerI::observerCompleted(const Ice::AsyncResultPtr& result)
         }
      }
 }
+#endif
 
 void
 IceBox::ServiceManagerI::destroyServiceCommunicator(const string& service, const CommunicatorPtr& communicator)
diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h
index cfb419aa3cd..7107056e509 100644
--- a/cpp/src/IceBox/ServiceManagerI.h
+++ b/cpp/src/IceBox/ServiceManagerI.h
@@ -19,7 +19,9 @@
 namespace IceBox
 {
 
-class ServiceManagerI : public ServiceManager, public IceUtil::Monitor<IceUtil::Mutex>
+class ServiceManagerI : public ServiceManager, 
+                        public IceUtil::Monitor<IceUtil::Mutex>,
+                        public Ice::EnableSharedFromThis<ServiceManagerI>
 {
 public:
 
@@ -28,10 +30,10 @@ public:
 
     virtual Ice::SliceChecksumDict getSliceChecksums(const Ice::Current&) const;
 
-    virtual void startService(const std::string&, const ::Ice::Current&);
-    virtual void stopService(const std::string&, const ::Ice::Current&);
+    virtual void startService(ICE_IN(std::string), const ::Ice::Current&);
+    virtual void stopService(ICE_IN(std::string), const ::Ice::Current&);
 
-    virtual void addObserver(const ServiceObserverPrx&, const Ice::Current&);
+    virtual void addObserver(ICE_IN(ServiceObserverPrxPtr), const Ice::Current&);
 
     virtual void shutdown(const ::Ice::Current&);
 
@@ -40,7 +42,11 @@ public:
     bool start();
     void stop();
 
+#ifdef ICE_CPP11_MAPPING
+    void observerCompleted(const std::shared_ptr<ServiceObserverPrx>&, std::exception_ptr);
+#else
     void observerCompleted(const Ice::AsyncResultPtr&);
+#endif
 
 private:
 
@@ -66,9 +72,15 @@ private:
     void start(const std::string&, const std::string&, const ::Ice::StringSeq&);
     void stopAll();
 
-    void servicesStarted(const std::vector<std::string>&, const std::set<ServiceObserverPrx>&);
-    void servicesStopped(const std::vector<std::string>&, const std::set<ServiceObserverPrx>&);
+    void servicesStarted(const std::vector<std::string>&, const std::set<ServiceObserverPrxPtr>&);
+    void servicesStopped(const std::vector<std::string>&, const std::set<ServiceObserverPrxPtr>&);
+
+#ifdef ICE_CPP11_MAPPING
+    std::function<void(std::exception_ptr)> makeObserverCompletedCallback(const std::shared_ptr<ServiceObserverPrx>&);
+    void observerRemoved(const std::shared_ptr<ServiceObserverPrx>&, std::exception_ptr);
+#else
     void observerRemoved(const ServiceObserverPrx&, const std::exception&);
+#endif
 
     Ice::PropertiesPtr createServiceProperties(const std::string&);
     void destroyServiceCommunicator(const std::string&, const Ice::CommunicatorPtr&);
@@ -85,12 +97,13 @@ private:
     std::vector<ServiceInfo> _services;
     bool _pendingStatusChanges;
 
-    std::set<ServiceObserverPrx> _observers;
+    std::set<ServiceObserverPrxPtr> _observers;
     int _traceServiceObserver;
+#ifndef ICE_CPP11_MAPPING
     ::Ice::CallbackPtr _observerCompletedCB;
+#endif
 };
-
-typedef IceUtil::Handle<ServiceManagerI> ServiceManagerIPtr;
+ICE_DEFINE_PTR(ServiceManagerIPtr, ServiceManagerI);
 
 }
 
diff --git a/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj b/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj
new file mode 100644
index 00000000000..1d85e8e24e9
--- /dev/null
+++ b/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{96161748-CE5E-4548-BC1D-AFD2F137A1DC}</ProjectGuid>
+    <RootNamespace>IceBox</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.cpp11.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemGroup>
+    <ClCompile Include="..\..\Service.cpp" />
+    <ClCompile Include="..\..\ServiceManagerI.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\ServiceManagerI.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceBoxExe.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj.filters b/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj.filters
new file mode 100644
index 00000000000..33855e07e80
--- /dev/null
+++ b/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj.filters
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{c50f6f00-874d-4385-a28f-a4eaed2d1453}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{550b5072-9ef7-47b7-aa9a-b0402092674b}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4acb87da-1ee1-43fb-a602-f720db05cd45}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Service.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ServiceManagerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\ServiceManagerI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceBoxExe.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj b/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj
new file mode 100644
index 00000000000..c19ce9ecde0
--- /dev/null
+++ b/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}</ProjectGuid>
+    <RootNamespace>IceBox</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+
+  <ItemGroup>
+    <ResourceCompile Include="../../IceBoxExe.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="../../ServiceManagerI.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Service.cpp" />
+    <ClCompile Include="..\..\ServiceManagerI.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj.filters b/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj.filters
new file mode 100644
index 00000000000..4b2dd72bf80
--- /dev/null
+++ b/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj.filters
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{14d0e3d8-4c48-44fc-893b-2f9e6509decb}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{0f91bab7-5a8e-4f70-8d9c-6b1c30fb7ba8}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{e6a87327-f991-473f-8e1d-a802823a79f5}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="../../IceBoxExe.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="../../ServiceManagerI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\ServiceManagerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Service.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj
new file mode 100644
index 00000000000..368e80a82db
--- /dev/null
+++ b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{1B745EA3-C97A-41BB-8E6F-64AAE992BE55}</ProjectGuid>
+    <RootNamespace>IceBox</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceBoxAdmin.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Admin.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj.filters b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj.filters
new file mode 100644
index 00000000000..d83819a2171
--- /dev/null
+++ b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{fccde6dd-4f8f-4dbe-9bb0-ae4be09ad2c3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{a82bcfb5-1b38-4a92-8e78-03320b5bd081}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{7e36ec62-3e0c-4873-8b87-8c96c16c7cf2}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceBoxAdmin.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Admin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj b/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj
new file mode 100644
index 00000000000..6acfc2ab55e
--- /dev/null
+++ b/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4F8DD63C-3359-42F2-A6A8-80F7D55593AC}</ProjectGuid>
+    <RootNamespace>IceBox</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.cpp11.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>icebox$(IceSoVersion)++11d</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>icebox$(IceSoVersion)++11d</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetName>icebox$(IceSoVersion)++11</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>icebox$(IceSoVersion)++11</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceBox\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceBox</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderDLLExport>ICE_BOX_API</IceBuilderDLLExport>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>;ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceBox.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceBox\IceBox.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Exception.cpp" />
+    <ClCompile Include="Win32\Debug\IceBox.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceBox.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceBox.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceBox.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceBox\IceBox.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceBox\IceBox.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceBox\IceBox.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceBox\IceBox.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceBox\Config.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj.filters b/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj.filters
new file mode 100644
index 00000000000..9147e2579df
--- /dev/null
+++ b/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj.filters
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{fe706a83-f7c0-414b-9066-8f505b496c17}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{f1740024-30e3-43ac-8d2a-e53d871d4855}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{950f9a47-b724-47d3-aedf-702395d5ed1b}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{2e66cd0c-e5f4-4607-9eff-416366abd01a}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{e0a0e4ff-c010-4502-87d5-84289f4c5d74}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{c9dab923-b562-4940-9bf2-496116270bb2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{fb3d8fc2-89c8-4a93-9fbd-16daad40cfdf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{06cbdc9b-f7b5-467c-9ca7-e655ad6e9c58}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{3dd772c9-c7d3-4cc6-b05a-aa298b346591}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{69c221db-d6f1-41b4-9cd8-76a57742c97e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{43f6a95b-c02e-4958-9b6e-e0f6346aed51}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{8f458818-81f2-486c-8aee-33b208d9a178}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{cfff3ea0-4e96-4c3b-b2a1-9f38d8f2492b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{0ccc023b-3644-415f-860f-8e358c680580}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{ff5c68c3-18cf-4d01-b540-98e37d7912af}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{7cd8ec76-fa21-40fc-a9f6-b371a67d0ac6}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceBox.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceBox\IceBox.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Exception.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceBox.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceBox.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceBox.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceBox.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\IceBox\Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceBox\IceBox.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceBox\IceBox.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceBox\IceBox.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceBox\IceBox.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj
new file mode 100644
index 00000000000..f4166edcc46
--- /dev/null
+++ b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{588F90CA-62AC-4101-83FC-19AB9DB6B509}</ProjectGuid>
+    <RootNamespace>IceBox</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>icebox$(IceSoVersion)d</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>icebox$(IceSoVersion)d</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetName>icebox$(IceSoVersion)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>icebox$(IceSoVersion)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceBox\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceBox</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderDLLExport>ICE_BOX_API</IceBuilderDLLExport>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceBox.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceBox\IceBox.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Exception.cpp" />
+    <ClCompile Include="Win32\Debug\IceBox.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceBox.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceBox.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceBox.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceBox\IceBox.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceBox\IceBox.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceBox\IceBox.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceBox\IceBox.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceBox\Config.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj.filters b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj.filters
new file mode 100644
index 00000000000..9869a6afc29
--- /dev/null
+++ b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj.filters
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{16fe5a16-4c1f-4744-a027-b65285798e89}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{0fb8c781-92ed-48bc-99e0-77377ad8de2d}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{5708ffda-4b52-47de-9526-0ee9c65a0cf6}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Resources">
+      <UniqueIdentifier>{7d67c05f-eb36-475b-8202-bf12a66b96ea}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{89224a95-891d-4a3d-8451-7c10008c93a8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{884f3cc9-ac30-4c20-81e1-1a8323abfc33}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{7ba80332-c4fd-4ed6-9337-d6b8d6e34440}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{a342ad70-776b-434e-bd4b-67a1b1869cf8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{e4f59326-89f7-414f-ade9-b3f596be0988}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{939eff4a-17c7-4624-abde-f8924907b010}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{b7be1d68-8842-4511-b64c-36380f3abb12}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{283c9267-83ed-40b7-bc7a-b7969aa0309e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{a92244cc-94f4-4a05-b23f-e170d9d4605e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{c41bb75e-519d-4012-a214-274d4bcef057}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{51c73dd2-880a-4c8b-80d1-73b166522ce9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{06521905-c627-44c7-924c-3abaf3d436c7}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceBox.rc">
+      <Filter>Resources</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceBox\IceBox.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Exception.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceBox.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceBox.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceBox.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceBox.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\IceBox\Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceBox\IceBox.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceBox\IceBox.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceBox\IceBox.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceBox\IceBox.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceDB/IceDB.cpp b/cpp/src/IceDB/IceDB.cpp
new file mode 100644
index 00000000000..8f4d5316909
--- /dev/null
+++ b/cpp/src/IceDB/IceDB.cpp
@@ -0,0 +1,508 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceDB/IceDB.h>
+#include <Ice/Initialize.h>
+
+#include <lmdb.h>
+
+using namespace IceDB;
+using namespace std;
+
+LMDBException::LMDBException(const char* file, int line, int err) :
+    IceUtil::Exception(file, line),
+    _error(err)
+{
+}
+
+#ifndef ICE_CPP11_COMPILER
+LMDBException::~LMDBException() throw()
+{
+}
+#endif
+
+string
+LMDBException::ice_id() const
+{
+    return "::IceDB::LMDBException";
+}
+
+void
+LMDBException::ice_print(ostream& out) const
+{
+    IceUtil::Exception::ice_print(out);
+    out << ": " << mdb_strerror(_error);
+}
+
+#ifndef ICE_CPP11_MAPPING
+LMDBException*
+LMDBException::ice_clone() const
+{
+    return new LMDBException(*this);
+}
+#endif
+
+void
+LMDBException::ice_throw() const
+{
+    throw *this;
+}
+
+int
+LMDBException::error() const
+{
+    return _error;
+}
+
+KeyTooLongException::KeyTooLongException(const char* file, int line, size_t size) :
+    IceUtil::Exception(file, line),
+    _size(size)
+{
+}
+
+#ifndef ICE_CPP11_COMPILER
+KeyTooLongException::~KeyTooLongException() throw()
+{
+}
+#endif
+
+string
+KeyTooLongException::ice_id() const
+{
+    return "::IceDB::KeyTooLongException";
+}
+
+void
+KeyTooLongException::ice_print(ostream& out) const
+{
+    IceUtil::Exception::ice_print(out);
+    out << ": ";
+    if(_size > 0)
+    {
+        out << "Key size = " << _size << ", ";
+    }
+    out << "Max size = " << maxKeySize;
+}
+
+#ifndef ICE_CPP11_MAPPING
+KeyTooLongException*
+KeyTooLongException::ice_clone() const
+{
+    return new KeyTooLongException(*this);
+}
+#endif
+
+void
+KeyTooLongException::ice_throw() const
+{
+    throw *this;
+}
+
+BadEnvException::BadEnvException(const char* file, int line, size_t size) :
+    IceUtil::Exception(file, line),
+    _size(size)
+{
+}
+
+#ifndef ICE_CPP11_COMPILER
+BadEnvException::~BadEnvException() throw()
+{
+}
+#endif
+
+string
+BadEnvException::ice_id() const
+{
+    return "::IceDB::BadEnvException";
+}
+
+void
+BadEnvException::ice_print(ostream& out) const
+{
+    IceUtil::Exception::ice_print(out);
+    out << ": LMDB env max key size = " << _size;
+    out << ", IceDB max key size = " << maxKeySize;
+}
+
+#ifndef ICE_CPP11_MAPPING
+BadEnvException*
+BadEnvException::ice_clone() const
+{
+    return new BadEnvException(*this);
+}
+#endif
+
+void
+BadEnvException::ice_throw() const
+{
+    throw *this;
+}
+
+
+Env::Env(const string& path, MDB_dbi maxDbs, size_t mapSize, unsigned int maxReaders)
+{
+    int rc = mdb_env_create(&_menv);
+    if(rc != MDB_SUCCESS)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+
+    if(maxDbs != 0)
+    {
+        rc = mdb_env_set_maxdbs(_menv, maxDbs);
+        if(rc != MDB_SUCCESS)
+        {
+            throw LMDBException(__FILE__, __LINE__, rc);
+        }
+    }
+
+    if(mapSize != 0)
+    {
+        // Make sure the map size is a multiple of the page size
+        size_t pageSize;
+#ifdef _WIN32
+        SYSTEM_INFO si;
+        GetSystemInfo(&si);
+        pageSize = si.dwPageSize;
+#else
+        pageSize = sysconf(_SC_PAGESIZE);
+#endif
+        size_t remainder = mapSize % pageSize;
+        if(remainder != 0)
+        {
+            mapSize = mapSize + pageSize - remainder;
+        }
+        rc = mdb_env_set_mapsize(_menv, mapSize);
+        if(rc != MDB_SUCCESS)
+        {
+            throw LMDBException(__FILE__, __LINE__, rc);
+        }
+    }
+
+    if(maxReaders != 0)
+    {
+        rc = mdb_env_set_maxreaders(_menv, maxReaders);
+        if(rc != MDB_SUCCESS)
+        {
+            throw LMDBException(__FILE__, __LINE__, rc);
+        }
+    }
+
+    rc = mdb_env_open(_menv, path.c_str(), 0, 0644);
+    if(rc != MDB_SUCCESS)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+
+    size_t envMaxKeySize = mdb_env_get_maxkeysize(_menv);
+    if(maxKeySize > envMaxKeySize)
+    {
+        throw BadEnvException(__FILE__, __LINE__, envMaxKeySize);
+    }
+}
+
+Env::~Env()
+{
+    close();
+}
+
+void
+Env::close()
+{
+    if(_menv != 0)
+    {
+        mdb_env_close(_menv);
+        _menv = 0;
+    }
+}
+
+MDB_env*
+Env::menv() const
+{
+    return _menv;
+}
+
+Txn::Txn(const Env& env, unsigned int flags)
+{
+    const int rc = mdb_txn_begin(env.menv(), 0, flags, &_mtxn);
+    if(rc != MDB_SUCCESS)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+}
+
+Txn::~Txn()
+{
+    rollback();
+}
+
+void
+Txn::commit()
+{
+    const int rc = mdb_txn_commit(_mtxn);
+    _mtxn = 0;
+    if(rc != MDB_SUCCESS)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+}
+
+void
+Txn::rollback()
+{
+    if(_mtxn != 0)
+    {
+        mdb_txn_abort(_mtxn);
+        _mtxn = 0;
+    }
+}
+
+MDB_txn*
+Txn::mtxn() const
+{
+    return _mtxn;
+}
+
+ReadOnlyTxn::~ReadOnlyTxn()
+{
+    // Out of line to avoid weak vtable
+}
+
+ReadOnlyTxn::ReadOnlyTxn(const Env& env) :
+    Txn(env, MDB_RDONLY)
+{
+}
+
+void
+ReadOnlyTxn::reset()
+{
+    mdb_txn_reset(_mtxn);
+}
+
+void
+ReadOnlyTxn::renew()
+{
+    const int rc = mdb_txn_renew(_mtxn);
+    if(rc != MDB_SUCCESS)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+}
+
+ReadWriteTxn::~ReadWriteTxn()
+{
+    // Out of line to avoid weak vtable
+}
+
+ReadWriteTxn::ReadWriteTxn(const Env& env) :
+    Txn(env, 0)
+{
+}
+
+DbiBase::DbiBase(const Txn& txn, const std::string& name, unsigned int flags, MDB_cmp_func* cmp)
+{
+    int rc = mdb_dbi_open(txn.mtxn(), name.c_str(), flags, &_mdbi);
+    if(rc != MDB_SUCCESS)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+    if(cmp != 0)
+    {
+        rc = mdb_set_compare(txn.mtxn(), _mdbi, cmp);
+        if(rc != MDB_SUCCESS)
+        {
+            throw LMDBException(__FILE__, __LINE__, rc);
+        }
+    }
+}
+
+DbiBase::DbiBase() :
+    _mdbi(0)
+{
+}
+
+DbiBase::~DbiBase()
+{
+}
+
+void
+DbiBase::clear(const ReadWriteTxn& txn)
+{
+    const int rc = mdb_drop(txn.mtxn(), _mdbi, 0);
+    if (rc != MDB_SUCCESS)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+}
+
+MDB_dbi
+DbiBase::mdbi() const
+{
+    return _mdbi;
+}
+
+bool
+DbiBase::get(const Txn& txn, MDB_val* key, MDB_val* data) const
+{
+    assert(key->mv_size <= maxKeySize);
+
+    const int rc = mdb_get(txn.mtxn(), _mdbi, key, data);
+    if(rc != MDB_SUCCESS && rc != MDB_NOTFOUND)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+    return rc == MDB_SUCCESS;
+}
+
+void
+DbiBase::put(const ReadWriteTxn& txn, MDB_val* key, MDB_val* data, unsigned int flags)
+{
+    assert(key->mv_size <= maxKeySize);
+
+    const int rc = mdb_put(txn.mtxn(), _mdbi, key, data, flags);
+    if(rc != MDB_SUCCESS)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+}
+
+bool
+DbiBase::find(const Txn& txn, MDB_val* key) const
+{
+    MDB_val data;
+    return get(txn, key, &data);
+}
+
+bool
+DbiBase::del(const ReadWriteTxn& txn, MDB_val* key, MDB_val* data)
+{
+    assert(key->mv_size <= maxKeySize);
+
+    const int rc = mdb_del(txn.mtxn(), _mdbi, key, data);
+    if (rc != MDB_SUCCESS && rc != MDB_NOTFOUND)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+    return rc == MDB_SUCCESS;
+}
+
+CursorBase::CursorBase(MDB_dbi dbi, const Txn& txn, bool readOnly) :
+    _readOnly(readOnly)
+{
+    const int rc = mdb_cursor_open(txn.mtxn(), dbi, &_mcursor);
+    if(rc != MDB_SUCCESS)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+}
+
+CursorBase::~CursorBase()
+{
+    if(_readOnly)
+    {
+        close();
+    }
+}
+
+void
+CursorBase::close()
+{
+    if(_mcursor != 0)
+    {
+        mdb_cursor_close(_mcursor);
+        _mcursor = 0;
+    }
+}
+
+MDB_cursor*
+CursorBase::mcursor() const
+{
+    return _mcursor;
+}
+
+bool
+CursorBase::get(MDB_val* key, MDB_val* data, MDB_cursor_op op)
+{
+    const int rc = mdb_cursor_get(_mcursor, key, data, op);
+    if(rc != MDB_SUCCESS && rc != MDB_NOTFOUND)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+    return rc == MDB_SUCCESS;
+}
+
+void
+CursorBase::put(MDB_val* key, MDB_val* data, unsigned int flags)
+{
+    assert(key->mv_size <= maxKeySize);
+    assert(!_readOnly);
+
+    const int rc = mdb_cursor_put(_mcursor, key, data, flags);
+    if (rc != MDB_SUCCESS)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+}
+
+bool
+CursorBase::find(MDB_val* key)
+{
+    MDB_val data;
+    return get(key, &data, MDB_SET);
+}
+
+bool
+CursorBase::find(MDB_val* key, MDB_val* data)
+{
+    return get(key, data, MDB_SET);
+}
+
+void
+CursorBase::del(unsigned int flags)
+{
+    assert(!_readOnly);
+
+    const int rc = mdb_cursor_del(_mcursor, flags);
+    if (rc != MDB_SUCCESS)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+}
+
+void
+CursorBase::renew(const ReadOnlyTxn& txn)
+{
+    assert(_readOnly);
+    const int rc = mdb_cursor_renew(txn.mtxn(), CursorBase::_mcursor);
+    if(rc != MDB_SUCCESS)
+    {
+        throw LMDBException(__FILE__, __LINE__, rc);
+    }
+}
+
+
+//
+// On Windows, we use a default LMDB map size of 10MB, whereas on other platforms
+// (Linux, OS X), we use a default of 100MB.
+//
+// On Windows, LMDB does not use sparse files and allocates immediately the file
+// with the given (max) size. This is why we need a fairly small default map size
+// on Windows, and a larger value on other platforms.
+
+size_t
+IceDB::getMapSize(int configValue)
+{
+#ifdef _WIN32
+    const size_t defaultMapSize = 10;
+#else
+    const size_t defaultMapSize = 100;
+#endif
+
+   return ((configValue <= 0) ? defaultMapSize : configValue) * 1024 * 1024;
+}
diff --git a/cpp/src/IceDB/IceDB.h b/cpp/src/IceDB/IceDB.h
new file mode 100644
index 00000000000..25a4ab365db
--- /dev/null
+++ b/cpp/src/IceDB/IceDB.h
@@ -0,0 +1,549 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_DB_H
+#define ICE_DB_H
+
+#include <IceUtil/Exception.h>
+#include <IceUtil/FileUtil.h>
+#include <Ice/Initialize.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
+
+#include <lmdb.h>
+
+#ifndef ICE_DB_API
+#   if defined(ICE_STATIC_LIBS)
+#       define ICE_DB_API /**/
+#   elif defined(ICE_DB_API_EXPORTS)
+#       define ICE_DB_API ICE_DECLSPEC_EXPORT
+#   else
+#       define ICE_DB_API ICE_DECLSPEC_IMPORT
+#   endif
+#endif
+
+//
+// Automatically link IceDB37[D|++11|++11D].lib with Visual C++
+//
+#if !defined(ICE_BUILDING_ICE_DB) && defined(ICE_DB_API_EXPORTS)
+#   define ICE_BUILDING_ICE_DB
+#endif
+
+#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICE_DB)
+#   pragma comment(lib, ICE_LIBNAME("IceDB"))
+#endif
+
+namespace IceDB
+{
+
+const size_t maxKeySize = 511;
+
+//
+// LMDBException wraps an error condition (and error code)
+// returned by LMDB
+//
+class ICE_DB_API LMDBException : public IceUtil::Exception
+{
+public:
+
+    LMDBException(const char*, int, int);
+#ifndef ICE_CPP11_COMPILER
+    virtual ~LMDBException() throw();
+#endif
+
+    virtual std::string ice_id() const;
+    virtual void ice_print(std::ostream&) const;
+#ifndef ICE_CPP11_MAPPING
+    virtual LMDBException* ice_clone() const;
+#endif
+    virtual void ice_throw() const;
+
+    int error() const;
+
+private:
+
+    const int _error;
+    static const char* _name;
+};
+
+//
+// KeyTooLongException is thrown if we attempt to marshal a
+// key with a marshaled representation longer than maxKeySize.
+//
+class ICE_DB_API KeyTooLongException : public IceUtil::Exception
+{
+public:
+
+    KeyTooLongException(const char*, int, size_t);
+#ifndef ICE_CPP11_COMPILER
+    virtual ~KeyTooLongException() throw();
+#endif
+
+    virtual std::string ice_id() const;
+    virtual void ice_print(std::ostream&) const;
+#ifndef ICE_CPP11_MAPPING
+    virtual KeyTooLongException* ice_clone() const;
+#endif
+    virtual void ice_throw() const;
+
+private:
+
+    const size_t _size;
+    static const char* _name;
+};
+
+//
+// The creation of an Env fails with BadEnvException when this
+// Env's max key size is smaller than maxKeySize.
+//
+class ICE_DB_API BadEnvException : public IceUtil::Exception
+{
+public:
+
+    BadEnvException(const char*, int, size_t);
+#ifndef ICE_CPP11_COMPILER
+    virtual ~BadEnvException() throw();
+#endif
+
+    virtual std::string ice_id() const;
+    virtual void ice_print(std::ostream&) const;
+#ifndef ICE_CPP11_MAPPING
+    virtual BadEnvException* ice_clone() const;
+#endif
+    virtual void ice_throw() const;
+
+private:
+
+    const size_t _size;
+    static const char* _name;
+};
+
+
+//
+// Codec reads and writes T to/from MDB_val
+//
+// Partial specializations of this template must provide:
+//
+// Read [out] T from [in] MDB_val using [in] context C
+// static void read(T& , const MDB_val&, const C&);
+//
+// Write [in] T into [out] MDB_val using [in] context C
+// [out] H& holds the memory for MDB_val.mv_data.
+// static void write(const T&, MDB_val&, H&, const C&);
+//
+// Write [in] T into [in/out] MDB_val using [in] context C
+// [in] MDB_val contains the destination array
+// write returns true on success, and false if the provided
+// array is too small.
+// On failure, MDB_val.mv_size contains the marshaled key
+// size if known, and 0 if not know.
+// static bool write(const T&, MDB_val&, H&, const C&);
+//
+template<typename T, typename C, typename H>
+struct Codec;
+
+class ICE_DB_API Env
+{
+public:
+
+    explicit Env(const std::string&, MDB_dbi = 0, size_t = 0, unsigned int = 0);
+    ~Env();
+
+    void close();
+
+    MDB_env* menv() const;
+
+private:
+
+    // Not implemented: class is not copyable
+    Env(const Env&);
+    void operator=(const Env&);
+
+    MDB_env* _menv;
+};
+
+class ICE_DB_API Txn
+{
+public:
+
+    virtual ~Txn();
+
+    void commit();
+    void rollback();
+
+    MDB_txn* mtxn() const;
+
+protected:
+
+    explicit Txn(const Env&, unsigned int);
+
+    MDB_txn* _mtxn;
+
+private:
+
+    // Not implemented: class is not copyable
+    Txn(const Txn&);
+    void operator=(const Txn&);
+};
+
+class ICE_DB_API ReadOnlyTxn : public Txn
+{
+public:
+
+    virtual ~ReadOnlyTxn();
+
+    explicit ReadOnlyTxn(const Env&);
+
+    void reset();
+    void renew();
+};
+
+class ICE_DB_API ReadWriteTxn : public Txn
+{
+public:
+
+    virtual ~ReadWriteTxn();
+
+    explicit ReadWriteTxn(const Env&);
+};
+
+class ICE_DB_API DbiBase
+{
+public:
+
+    void clear(const ReadWriteTxn&);
+    MDB_dbi mdbi() const;
+
+    virtual ~DbiBase();
+
+protected:
+
+    DbiBase(const Txn&, const std::string&, unsigned int, MDB_cmp_func*);
+    DbiBase();
+
+    // default copy ctor and assignment operator are OK
+
+    bool get(const Txn&, MDB_val*, MDB_val*) const;
+    void put(const ReadWriteTxn&, MDB_val*, MDB_val*, unsigned int);
+    bool find(const Txn&, MDB_val*) const;
+    bool del(const ReadWriteTxn&, MDB_val*, MDB_val*);
+
+private:
+
+    MDB_dbi _mdbi;
+};
+
+template<typename K, typename D, typename C, typename H>
+class Dbi : public DbiBase
+{
+public:
+
+    Dbi(const Txn& txn, const std::string& name, const C& ctx, unsigned int flags = 0, MDB_cmp_func* cmp = 0) :
+        DbiBase(txn, name, flags, cmp),
+        _marshalingContext(ctx)
+    {
+    }
+
+    Dbi()
+    {
+    }
+
+    bool get(const Txn& txn, const K& key, D& data) const
+    {
+        unsigned char kbuf[maxKeySize];
+        MDB_val mkey = {maxKeySize, kbuf};
+
+        if(Codec<K, C, H>::write(key, mkey, _marshalingContext))
+        {
+            MDB_val mdata;
+            if(DbiBase::get(txn, &mkey, &mdata))
+            {
+                Codec<D, C, H>::read(data, mdata, _marshalingContext);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    void put(const ReadWriteTxn& txn, const K& key, const D& data, unsigned int flags = 0)
+    {
+        unsigned char kbuf[maxKeySize];
+        MDB_val mkey = {maxKeySize, kbuf};
+
+        if(Codec<K, C, H>::write(key, mkey, _marshalingContext))
+        {
+            H hdata;
+            MDB_val mdata;
+            Codec<D, C, H>::write(data, mdata, hdata, _marshalingContext);
+            DbiBase::put(txn, &mkey, &mdata, flags);
+        }
+        else
+        {
+            throw KeyTooLongException(__FILE__, __LINE__, mkey.mv_size);
+        }
+    }
+
+    bool find(const Txn& txn, const K& key) const
+    {
+        unsigned char kbuf[maxKeySize];
+        MDB_val mkey = {maxKeySize, kbuf};
+        if(Codec<K, C, H>::write(key, mkey, _marshalingContext))
+        {
+            return DbiBase::find(txn, &mkey);
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    bool del(const ReadWriteTxn& txn, const K& key, const D& data)
+    {
+        unsigned char kbuf[maxKeySize];
+        MDB_val mkey = {maxKeySize, kbuf};
+        if(Codec<K, C, H>::write(key, mkey, _marshalingContext))
+        {
+            H hdata;
+            MDB_val mdata;
+            Codec<D, C, H>::write(data, mdata, hdata, _marshalingContext);
+            return DbiBase::del(txn, &mkey, &mdata);
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    bool del(const ReadWriteTxn& txn, const K& key)
+    {
+        unsigned char kbuf[maxKeySize];
+        MDB_val mkey = {maxKeySize, kbuf};
+        if(Codec<K, C, H>::write(key, mkey, _marshalingContext))
+        {
+            return DbiBase::del(txn, &mkey, 0);
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    C marshalingContext() const
+    {
+        return _marshalingContext;
+    }
+
+private:
+
+    C _marshalingContext;
+};
+
+class ICE_DB_API CursorBase
+{
+public:
+
+    void close();
+
+    MDB_cursor* mcursor() const;
+
+    virtual ~CursorBase();
+
+protected:
+
+    CursorBase(MDB_dbi dbi, const Txn& txn, bool);
+
+    bool get(MDB_val*, MDB_val*, MDB_cursor_op);
+    void put(MDB_val*, MDB_val*, unsigned int);
+    bool find(MDB_val*);
+    bool find(MDB_val*, MDB_val*);
+    void del(unsigned int);
+    void renew(const ReadOnlyTxn&);
+
+private:
+
+    // Not implemented: class is not copyable
+    CursorBase(const CursorBase&);
+    void operator=(const CursorBase&);
+
+    MDB_cursor* _mcursor;
+    const bool _readOnly;
+};
+
+template<typename K, typename D, typename C, typename H>
+class Cursor : public CursorBase
+{
+public:
+
+    Cursor(const Dbi<K, D, C, H>& dbi, const ReadOnlyTxn& txn) :
+        CursorBase(dbi.mdbi(), txn, true),
+        _marshalingContext(dbi.marshalingContext())
+    {
+    }
+
+    Cursor(const Dbi<K, D, C, H>& dbi, const ReadWriteTxn& txn) :
+        CursorBase(dbi.mdbi(), txn, false),
+        _marshalingContext(dbi.marshalingContext())
+    {
+    }
+
+    Cursor(const Dbi<K, D, C, H>& dbi, const Txn& txn) :
+        CursorBase(dbi.mdbi(), txn, dynamic_cast<const ReadOnlyTxn*>(&txn) != 0),
+        _marshalingContext(dbi.marshalingContext())
+    {
+    }
+
+    bool get(K& key, D& data, MDB_cursor_op op)
+    {
+        MDB_val mkey, mdata;
+        if(CursorBase::get(&mkey, &mdata, op))
+        {
+            Codec<K, C, H>::read(key, mkey, _marshalingContext);
+            Codec<D, C, H>::read(data, mdata, _marshalingContext);
+            return true;
+        }
+        return false;
+    }
+
+    bool find(const K& key)
+    {
+        unsigned char kbuf[maxKeySize];
+        MDB_val mkey = {maxKeySize, kbuf};
+        if(Codec<K, C, H>::write(key, mkey, _marshalingContext))
+        {
+            return CursorBase::find(&mkey);
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    bool find(const K& key, D& data)
+    {
+        unsigned char kbuf[maxKeySize];
+        MDB_val mkey = {maxKeySize, kbuf};
+        if(Codec<K, C, H>::write(key, mkey, _marshalingContext))
+        {
+            MDB_val mdata;
+            if(CursorBase::find(&mkey, &mdata))
+            {
+                Codec<D, C, H>::read(data, mdata, _marshalingContext);
+                return true;
+            }
+        }
+        return false;
+    }
+
+protected:
+
+    C _marshalingContext;
+};
+
+template<typename K, typename D, typename C, typename H>
+class ReadWriteCursor : public Cursor<K, D, C, H>
+{
+public:
+
+    ReadWriteCursor(const Dbi<K, D, C, H>& dbi, const ReadWriteTxn& txn) :
+        Cursor<K, D, C, H>(dbi, txn)
+    {
+    }
+
+    void put(const K& key, const D& data, unsigned int flags = 0)
+    {
+        unsigned char kbuf[maxKeySize];
+        MDB_val mkey = {maxKeySize, kbuf};
+        if(Codec<K, C, H>::write(key, mkey, this->_marshalingContext))
+        {
+            H hdata;
+            MDB_val mdata;
+            Codec<D, C, H>::write(data, mdata, hdata, this->_marshalingContext);
+            CursorBase::put(&mkey, &mdata, flags);
+        }
+        else
+        {
+            throw KeyTooLongException(__FILE__, __LINE__, mkey.mv_size);
+        }
+    }
+
+    void del(unsigned int flags = 0)
+    {
+        CursorBase::del(flags);
+    }
+};
+
+template<typename K, typename D, typename C, typename H>
+class ReadOnlyCursor : public Cursor<K, D, C, H>
+{
+public:
+
+    ReadOnlyCursor(const Dbi<K, D, C, H>& dbi, const ReadOnlyTxn& txn) :
+        Cursor<K, D, C, H>(dbi, txn)
+    {
+    }
+
+    void renew(const ReadOnlyTxn& txn)
+    {
+        CursorBase::renew(txn);
+    }
+};
+
+
+//
+// Partial specialization of Codec for Ice encoding
+//
+struct IceContext
+{
+    Ice::CommunicatorPtr communicator;
+    Ice::EncodingVersion encoding;
+};
+
+template<typename T>
+struct Codec<T, IceContext, Ice::OutputStream>
+{
+    static void read(T& t, const MDB_val& val, const IceContext& ctx)
+    {
+        std::pair<const Ice::Byte*, const Ice::Byte*> p(static_cast<const Ice::Byte*>(val.mv_data),
+                                                        static_cast<const Ice::Byte*>(val.mv_data) + val.mv_size);
+        Ice::InputStream in(ctx.communicator, ctx.encoding, p);
+        in.read(t);
+    }
+
+    static void write(const T& t, MDB_val& val, Ice::OutputStream& holder, const IceContext& ctx)
+    {
+        holder.initialize(ctx.communicator, ctx.encoding);
+        holder.write(t);
+        val.mv_size = holder.b.size();
+        val.mv_data = &holder.b[0];
+    }
+
+    static bool write(const T& t, MDB_val& val, const IceContext& ctx)
+    {
+        const size_t limit = val.mv_size;
+        std::pair<Ice::Byte*, Ice::Byte*> p(reinterpret_cast<Ice::Byte*>(val.mv_data),
+                                            reinterpret_cast<Ice::Byte*>(val.mv_data) + limit);
+        Ice::OutputStream stream(ctx.communicator, ctx.encoding, p);
+        stream.write(t);
+        val.mv_size = stream.b.size();
+        return stream.b.size() > limit ? false : true;
+    }
+};
+
+//
+// Returns computed mapSize in bytes.
+// When the input parameter is <= 0, returns a platform-dependent default
+// (currently 0 on Windows and 100 MB on other platforms).
+// Otherwise, returns input parameter * 1 MB.
+//
+
+ICE_DB_API size_t getMapSize(int);
+
+}
+
+#endif
diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/IceDB/IceDB.rc
index c89c5b383ca..8639e76aa3d 100644
--- a/cpp/src/Slice/Slice.rc
+++ b/cpp/src/IceDB/IceDB.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "slice36d\0"
- #define ORIGINALFILENAME "slice36d.dll\0"
+ #define INTERNALNAME "icedb37a2d\0"
+ #define ORIGINALFILENAME "icedb37a2d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "slice36\0"
- #define ORIGINALFILENAME "slice36.dll\0"
+ #define INTERNALNAME "icedb37a2\0"
+ #define ORIGINALFILENAME "icedb37a2.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -22,13 +22,13 @@ BEGIN
         BLOCK "040904e4"
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "Slice C++ Library\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileDescription", "IceDB C++ Library\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceDB/Makefile.mk b/cpp/src/IceDB/Makefile.mk
new file mode 100644
index 00000000000..2202886daae
--- /dev/null
+++ b/cpp/src/IceDB/Makefile.mk
@@ -0,0 +1,18 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries	= IceDB
+
+IceDB_targetdir		:= $(libdir)
+IceDB_dependencies  	:= Ice
+IceDB_libs          	:= lmdb
+IceDB_cppflags		:= -DICE_DB_API_EXPORTS
+
+projects += $(project)
+
diff --git a/cpp/src/IceDB/msbuild/icedb.vcxproj b/cpp/src/IceDB/msbuild/icedb.vcxproj
new file mode 100644
index 00000000000..18526016764
--- /dev/null
+++ b/cpp/src/IceDB/msbuild/icedb.vcxproj
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E8ACC848-F7DA-4B29-B52F-81D66E7D397E}</ProjectGuid>
+    <RootNamespace>IceDB</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_DB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_DB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_DB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_DB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\IceDB.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\IceDB.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\IceDB.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" />
+    <Import Project="..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets'))" />
+  </Target>
+</Project>
diff --git a/cpp/src/IceDB/msbuild/icedb.vcxproj.filters b/cpp/src/IceDB/msbuild/icedb.vcxproj.filters
new file mode 100644
index 00000000000..3fac98f1369
--- /dev/null
+++ b/cpp/src/IceDB/msbuild/icedb.vcxproj.filters
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{c0fe09d9-dc10-4dad-b473-50599ab75cdf}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{88c12b59-cf0a-434d-84d7-48857df3fa1d}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{401ce120-cf47-4973-8f1d-39529a5b4c6a}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\IceDB.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\IceDB.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\IceDB.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceDB/msbuild/packages.config b/cpp/src/IceDB/msbuild/packages.config
new file mode 100644
index 00000000000..3f680df025a
--- /dev/null
+++ b/cpp/src/IceDB/msbuild/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="lmdb.v120" version="0.9.18.0" targetFramework="native" />
+  <package id="lmdb.v140" version="0.9.18.0" targetFramework="native" />
+</packages>
diff --git a/cpp/src/IceDiscovery/.depend.mak b/cpp/src/IceDiscovery/.depend.mak
deleted file mode 100755
index c198faca95c..00000000000
--- a/cpp/src/IceDiscovery/.depend.mak
+++ /dev/null
@@ -1,409 +0,0 @@
-
-IceDiscovery.h: \
-    "$(slicedir)\IceDiscovery\IceDiscovery.ice" \
-    "$(slicedir)/Ice/Identity.ice"
-
-LocatorI.obj: \
-	LocatorI.cpp \
-    "LocatorI.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "LookupI.h" \
-    "IceDiscovery.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-
-LookupI.obj: \
-	LookupI.cpp \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "LookupI.h" \
-    "IceDiscovery.h" \
-    "LocatorI.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-
-PluginI.obj: \
-	PluginI.cpp \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "PluginI.h" \
-    "LookupI.h" \
-    "IceDiscovery.h" \
-    "LocatorI.h" \
-
-IceDiscovery.obj: \
-	IceDiscovery.cpp \
-    "IceDiscovery.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
diff --git a/cpp/src/IceDiscovery/.gitignore b/cpp/src/IceDiscovery/.gitignore
deleted file mode 100644
index 07790f7db33..00000000000
--- a/cpp/src/IceDiscovery/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
-IceDiscovery.cpp
-IceDiscovery.h
diff --git a/cpp/src/IceDiscovery/IceDiscovery.rc b/cpp/src/IceDiscovery/IceDiscovery.rc
index 6c549e2dbad..c0779d03977 100755
--- a/cpp/src/IceDiscovery/IceDiscovery.rc
+++ b/cpp/src/IceDiscovery/IceDiscovery.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icediscovery36d\0"
- #define ORIGINALFILENAME "icediscovery36d.dll\0"
+ #define INTERNALNAME "icediscovery37a2d\0"
+ #define ORIGINALFILENAME "icediscovery37a2d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icediscovery36\0"
- #define ORIGINALFILENAME "icediscovery36.dll\0"
+ #define INTERNALNAME "icediscovery37a2\0"
+ #define ORIGINALFILENAME "icediscovery37a2.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceDiscovery C++ Plug-in\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceDiscovery/LocatorI.cpp b/cpp/src/IceDiscovery/LocatorI.cpp
index 10fe87e26d6..c3f3c87b2ed 100644
--- a/cpp/src/IceDiscovery/LocatorI.cpp
+++ b/cpp/src/IceDiscovery/LocatorI.cpp
@@ -23,11 +23,21 @@ LocatorRegistryI::LocatorRegistryI(const Ice::CommunicatorPtr& com) :
 {
 }
 
-void 
-LocatorRegistryI::setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb, 
-                                              const std::string& adapterId, 
-                                              const ObjectPrx& proxy, 
+
+#ifdef ICE_CPP11_MAPPING
+void
+LocatorRegistryI::setAdapterDirectProxyAsync(string adapterId,
+                                              shared_ptr<ObjectPrx> proxy,
+                                              function<void()> response,
+                                              function<void(exception_ptr)>,
+                                              const Ice::Current&)
+#else
+void
+LocatorRegistryI::setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb,
+                                              const std::string& adapterId,
+                                              const ObjectPrxPtr& proxy,
                                               const Current&)
+#endif
 {
     Lock sync(*this);
     if(proxy)
@@ -38,16 +48,30 @@ LocatorRegistryI::setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapt
     {
         _adapters.erase(adapterId);
     }
+#ifdef ICE_CPP11_MAPPING
+    response();
+#else
     cb->ice_response();
+#endif
 }
 
+#ifdef ICE_CPP11_MAPPING
+void
+LocatorRegistryI::setReplicatedAdapterDirectProxyAsync(string adapterId,
+                                                        string replicaGroupId,
+                                                        shared_ptr<ObjectPrx> proxy,
+                                                        function<void()> response,
+                                                        function<void(exception_ptr)>,
+                                                        const Ice::Current&)
+#else
 void
 LocatorRegistryI::setReplicatedAdapterDirectProxy_async(
     const AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr& cb,
     const std::string& adapterId,
     const std::string& replicaGroupId,
-    const ObjectPrx& proxy, 
+    const ObjectPrxPtr& proxy,
     const Current&)
+#endif
 {
     Lock sync(*this);
     if(proxy)
@@ -73,19 +97,35 @@ LocatorRegistryI::setReplicatedAdapterDirectProxy_async(
             }
         }
     }
+#ifdef ICE_CPP11_MAPPING
+    response();
+#else
     cb->ice_response();
+#endif
 }
 
+#ifdef ICE_CPP11_MAPPING
 void
-LocatorRegistryI::setServerProcessProxy_async(const AMD_LocatorRegistry_setServerProcessProxyPtr& cb, 
-                                              const std::string&, 
-                                              const ProcessPrx&,
+LocatorRegistryI::setServerProcessProxyAsync(string,
+                                              shared_ptr<ProcessPrx>,
+                                              function<void()> response,
+                                              function<void(exception_ptr)>,
+                                              const Ice::Current&)
+{
+    response();
+}
+#else
+void
+LocatorRegistryI::setServerProcessProxy_async(const AMD_LocatorRegistry_setServerProcessProxyPtr& cb,
+                                              const std::string&,
+                                              const ProcessPrxPtr&,
                                               const Current&)
 {
     cb->ice_response();
 }
+#endif
 
-Ice::ObjectPrx 
+Ice::ObjectPrxPtr
 LocatorRegistryI::findObject(const Ice::Identity& id) const
 {
     Lock sync(*this);
@@ -94,7 +134,7 @@ LocatorRegistryI::findObject(const Ice::Identity& id) const
         return 0;
     }
 
-    Ice::ObjectPrx prx = _wellKnownProxy->ice_identity(id);
+    Ice::ObjectPrxPtr prx = _wellKnownProxy->ice_identity(id);
 
     vector<string> adapterIds;
     for(map<string, set<string> >::const_iterator p = _replicaGroups.begin(); p != _replicaGroups.end(); ++p)
@@ -112,7 +152,7 @@ LocatorRegistryI::findObject(const Ice::Identity& id) const
 
     if(adapterIds.empty())
     {
-        for(map<string, Ice::ObjectPrx>::const_iterator p = _adapters.begin(); p != _adapters.end(); ++p)
+        for(map<string, Ice::ObjectPrxPtr>::const_iterator p = _adapters.begin(); p != _adapters.end(); ++p)
         {
             try
             {
@@ -135,12 +175,12 @@ LocatorRegistryI::findObject(const Ice::Identity& id) const
     return prx->ice_adapterId(adapterIds[0]);
 }
 
-Ice::ObjectPrx 
+Ice::ObjectPrxPtr
 LocatorRegistryI::findAdapter(const string& adapterId, bool& isReplicaGroup) const
 {
     Lock sync(*this);
 
-    map<string, Ice::ObjectPrx>::const_iterator p = _adapters.find(adapterId);
+    map<string, Ice::ObjectPrxPtr>::const_iterator p = _adapters.find(adapterId);
     if(p != _adapters.end())
     {
         isReplicaGroup = false;
@@ -151,10 +191,10 @@ LocatorRegistryI::findAdapter(const string& adapterId, bool& isReplicaGroup) con
     if(q != _replicaGroups.end())
     {
         Ice::EndpointSeq endpoints;
-        Ice::ObjectPrx prx;
+        Ice::ObjectPrxPtr prx;
         for(set<string>::const_iterator r = q->second.begin(); r != q->second.end(); ++r)
         {
-            map<string, Ice::ObjectPrx>::const_iterator s = _adapters.find(*r);
+            map<string, Ice::ObjectPrxPtr>::const_iterator s = _adapters.find(*r);
             if(s == _adapters.end())
             {
                 continue; // TODO: Inconsistency
@@ -175,34 +215,53 @@ LocatorRegistryI::findAdapter(const string& adapterId, bool& isReplicaGroup) con
             return prx->ice_endpoints(endpoints);
         }
     }
-    
+
     isReplicaGroup = false;
     return 0;
 }
 
-LocatorI::LocatorI(const LookupIPtr& lookup, const LocatorRegistryPrx& registry) : _lookup(lookup), _registry(registry)
+LocatorI::LocatorI(const LookupIPtr& lookup, const LocatorRegistryPrxPtr& registry) : _lookup(lookup), _registry(registry)
+{
+}
+
+#ifdef ICE_CPP11_MAPPING
+void
+LocatorI::findObjectByIdAsync(Ice::Identity id,
+                               function<void(const shared_ptr<ObjectPrx>&)> response,
+                               function<void(exception_ptr)>,
+                               const Ice::Current&) const
 {
+    _lookup->findObject(response, id);
 }
 
-void 
-LocatorI::findObjectById_async(const AMD_Locator_findObjectByIdPtr& cb, 
-                               const Identity& id, 
+void
+LocatorI::findAdapterByIdAsync(string adapterId,
+                                function<void(const shared_ptr<ObjectPrx>&)> response,
+                                function<void(exception_ptr)>,
+                                const Ice::Current&) const
+{
+    _lookup->findAdapter(response, adapterId);
+}
+#else
+void
+LocatorI::findObjectById_async(const AMD_Locator_findObjectByIdPtr& cb,
+                               const Identity& id,
                                const Current&) const
 {
     _lookup->findObject(cb, id);
 }
 
-void 
-LocatorI::findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, 
-                                const std::string& adapterId, 
+void
+LocatorI::findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb,
+                                const std::string& adapterId,
                                 const Current&) const
 {
     _lookup->findAdapter(cb, adapterId);
 }
+#endif
 
-LocatorRegistryPrx 
+LocatorRegistryPrxPtr
 LocatorI::getRegistry(const Current&) const
 {
     return _registry;
 }
-
diff --git a/cpp/src/IceDiscovery/LocatorI.h b/cpp/src/IceDiscovery/LocatorI.h
index 329c469daca..0c71f2ef9fa 100644
--- a/cpp/src/IceDiscovery/LocatorI.h
+++ b/cpp/src/IceDiscovery/LocatorI.h
@@ -23,54 +23,90 @@ class LocatorRegistryI : public Ice::LocatorRegistry, private IceUtil::Mutex
 public:
 
     LocatorRegistryI(const Ice::CommunicatorPtr&);
-    
-    virtual void 
-    setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr&, const std::string&, 
+
+#ifdef ICE_CPP11_MAPPING
+    virtual void
+    setAdapterDirectProxyAsync(std::string,
+                               std::shared_ptr<Ice::ObjectPrx>,
+                               std::function<void()>,
+                               std::function<void(std::exception_ptr)>,
+                               const Ice::Current&);
+
+    virtual void
+    setReplicatedAdapterDirectProxyAsync(std::string,
+                                         std::string,
+                                         std::shared_ptr<Ice::ObjectPrx>,
+                                         std::function<void()>,
+                                         std::function<void(std::exception_ptr)>,
+                                         const Ice::Current&);
+
+    virtual void
+    setServerProcessProxyAsync(std::string,
+                               std::shared_ptr<Ice::ProcessPrx>,
+                               std::function<void()>,
+                               std::function<void(std::exception_ptr)>,
+                               const Ice::Current&);
+#else
+    virtual void
+    setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr&, const std::string&,
                                 const Ice::ObjectPrx&, const Ice::Current&);
 
     virtual void
     setReplicatedAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr&,
-                                          const std::string&, const std::string&, const Ice::ObjectPrx&, 
+                                          const std::string&, const std::string&, const Ice::ObjectPrx&,
                                           const Ice::Current&);
 
-    virtual void 
-    setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr&, const std::string&, 
+    virtual void
+    setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr&, const std::string&,
                                 const Ice::ProcessPrx&, const Ice::Current&);
-
-    Ice::ObjectPrx findObject(const Ice::Identity&) const;
-    Ice::ObjectPrx findAdapter(const std::string&, bool&) const;
+#endif
+    Ice::ObjectPrxPtr findObject(const Ice::Identity&) const;
+    Ice::ObjectPrxPtr findAdapter(const std::string&, bool&) const;
 
 private:
 
-    const Ice::ObjectPrx _wellKnownProxy;
-    std::map<std::string, Ice::ObjectPrx> _adapters;
+    const Ice::ObjectPrxPtr _wellKnownProxy;
+    std::map<std::string, Ice::ObjectPrxPtr> _adapters;
     std::map<std::string, std::set<std::string> > _replicaGroups;
 };
-typedef IceInternal::Handle<LocatorRegistryI> LocatorRegistryIPtr;
+ICE_DEFINE_PTR(LocatorRegistryIPtr, LocatorRegistryI);
 
 class LookupI;
-typedef IceInternal::Handle<LookupI> LookupIPtr;
+ICE_DEFINE_PTR(LookupIPtr, LookupI);
 
 class LocatorI : public Ice::Locator
 {
 public:
 
-    LocatorI(const LookupIPtr&, const Ice::LocatorRegistryPrx&);
+    LocatorI(const LookupIPtr&, const Ice::LocatorRegistryPrxPtr&);
 
-    virtual void 
-    findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&, 
+#ifdef ICE_CPP11_MAPPING
+    virtual void
+    findObjectByIdAsync(Ice::Identity,
+                        std::function<void(const std::shared_ptr<Ice::ObjectPrx>&)>,
+                        std::function<void(std::exception_ptr)>,
+                        const Ice::Current&) const;
+
+    virtual void
+    findAdapterByIdAsync(std::string,
+                         std::function<void(const std::shared_ptr<Ice::ObjectPrx>&)>,
+                         std::function<void(std::exception_ptr)>,
+                         const Ice::Current&) const;
+#else
+    virtual void
+    findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&,
                          const Ice::Current&) const;
 
-    virtual void 
-    findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&, 
+    virtual void
+    findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&,
                           const Ice::Current&) const;
-
-    virtual Ice::LocatorRegistryPrx getRegistry(const Ice::Current&) const;
+#endif
+    virtual Ice::LocatorRegistryPrxPtr getRegistry(const Ice::Current&) const;
 
 private:
-    
+
     LookupIPtr _lookup;
-    Ice::LocatorRegistryPrx _registry;
+    Ice::LocatorRegistryPrxPtr _registry;
 };
 
 };
diff --git a/cpp/src/IceDiscovery/LookupI.cpp b/cpp/src/IceDiscovery/LookupI.cpp
index 1c1c0a3fb72..5ad2350c68b 100644
--- a/cpp/src/IceDiscovery/LookupI.cpp
+++ b/cpp/src/IceDiscovery/LookupI.cpp
@@ -19,6 +19,7 @@ using namespace std;
 using namespace Ice;
 using namespace IceDiscovery;
 
+#ifndef ICE_CPP11_MAPPING
 IceDiscovery::Request::Request(const LookupIPtr& lookup, int retryCount) : _lookup(lookup), _nRetry(retryCount)
 {
 }
@@ -28,6 +29,7 @@ IceDiscovery::Request::retry()
 {
     return --_nRetry >= 0;
 }
+#endif
 
 bool
 AdapterRequest::retry()
@@ -36,15 +38,15 @@ AdapterRequest::retry()
 }
 
 bool
-AdapterRequest::response(const Ice::ObjectPrx& proxy, bool isReplicaGroup)
+AdapterRequest::response(const Ice::ObjectPrxPtr& proxy, bool isReplicaGroup)
 {
     if(isReplicaGroup)
     {
         if(_latency == IceUtil::Time())
         {
             _latency = (IceUtil::Time::now() - _start) * _lookup->latencyMultiplier();
-            _lookup->timer()->cancel(this);
-            _lookup->timer()->schedule(this, _latency);
+            _lookup->timer()->cancel(ICE_SHARED_FROM_THIS);
+            _lookup->timer()->schedule(ICE_SHARED_FROM_THIS, _latency);
         }
         _proxies.push_back(proxy);
         return false;
@@ -53,8 +55,37 @@ AdapterRequest::response(const Ice::ObjectPrx& proxy, bool isReplicaGroup)
     return true;
 }
 
+#ifdef ICE_CPP11_MAPPING
 void
-AdapterRequest::finished(const Ice::ObjectPrx& proxy)
+AdapterRequest::finished(const Ice::ObjectPrxPtr& proxy)
+{
+    if(proxy || _proxies.empty())
+    {
+        Request<string>::finished(proxy);
+        return;
+    }
+    else if(_proxies.size() == 1)
+    {
+        Request<string>::finished(_proxies[0]);
+        return;
+    }
+
+    EndpointSeq endpoints;
+    shared_ptr<ObjectPrx> prx;
+    for(vector<shared_ptr<ObjectPrx>>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p)
+    {
+        if(!prx)
+        {
+            prx = *p;
+        }
+        Ice::EndpointSeq endpts = (*p)->ice_getEndpoints();
+        copy(endpts.begin(), endpts.end(), back_inserter(endpoints));
+    }
+    Request<string>::finished(prx->ice_endpoints(endpoints));
+}
+#else
+void
+AdapterRequest::finished(const Ice::ObjectPrxPtr& proxy)
 {
     if(proxy || _proxies.empty())
     {
@@ -68,8 +99,8 @@ AdapterRequest::finished(const Ice::ObjectPrx& proxy)
     }
 
     Ice::EndpointSeq endpoints;
-    Ice::ObjectPrx prx;
-    for(vector<Ice::ObjectPrx>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p)
+    Ice::ObjectPrxPtr prx;
+    for(vector<Ice::ObjectPrxPtr>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p)
     {
         if(!prx)
         {
@@ -80,15 +111,16 @@ AdapterRequest::finished(const Ice::ObjectPrx& proxy)
     }
     RequestT<std::string, Ice::AMD_Locator_findAdapterByIdPtr>::finished(prx->ice_endpoints(endpoints));
 }
+#endif
 
 void
 AdapterRequest::runTimerTask()
 {
-    _lookup->adapterRequestTimedOut(this);
+    _lookup->adapterRequestTimedOut(shared_from_this());
 }
 
 void
-ObjectRequest::response(const Ice::ObjectPrx& proxy)
+ObjectRequest::response(const Ice::ObjectPrxPtr& proxy)
 {
     finished(proxy);
 }
@@ -96,10 +128,10 @@ ObjectRequest::response(const Ice::ObjectPrx& proxy)
 void
 ObjectRequest::runTimerTask()
 {
-    _lookup->objectRequestTimedOut(this);
+    _lookup->objectRequestTimedOut(shared_from_this());
 }
 
-LookupI::LookupI(const LocatorRegistryIPtr& registry, const LookupPrx& lookup, const Ice::PropertiesPtr& properties) :
+LookupI::LookupI(const LocatorRegistryIPtr& registry, const LookupPrxPtr& lookup, const Ice::PropertiesPtr& properties) :
     _registry(registry),
     _lookup(lookup),
     _timeout(IceUtil::Time::milliSeconds(properties->getPropertyAsIntWithDefault("IceDiscovery.Timeout", 300))),
@@ -133,21 +165,26 @@ LookupI::destroy()
 }
 
 void
-LookupI::setLookupReply(const LookupReplyPrx& lookupReply)
+LookupI::setLookupReply(const LookupReplyPrxPtr& lookupReply)
 {
     _lookupReply = lookupReply;
 }
 
 void
+#ifdef ICE_CPP11_MAPPING
+LookupI::findObjectById(string domainId, Ice::Identity id, shared_ptr<IceDiscovery::LookupReplyPrx> reply,
+                        const Ice::Current&)
+#else
 LookupI::findObjectById(const string& domainId, const Ice::Identity& id, const IceDiscovery::LookupReplyPrx& reply,
                         const Ice::Current&)
+#endif
 {
     if(domainId != _domainId)
     {
         return; // Ignore.
     }
 
-    Ice::ObjectPrx proxy = _registry->findObject(id);
+    Ice::ObjectPrxPtr proxy = _registry->findObject(id);
     if(proxy)
     {
         //
@@ -155,7 +192,11 @@ LookupI::findObjectById(const string& domainId, const Ice::Identity& id, const I
         //
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            reply->foundObjectByIdAsync(id, proxy);
+#else
             reply->begin_foundObjectById(id, proxy);
+#endif
         }
         catch(const Ice::LocalException&)
         {
@@ -165,8 +206,13 @@ LookupI::findObjectById(const string& domainId, const Ice::Identity& id, const I
 }
 
 void
-LookupI::findAdapterById(const string& domainId, const std::string& adapterId,
-                         const IceDiscovery::LookupReplyPrx& reply, const Ice::Current&)
+#ifdef ICE_CPP11_MAPPING
+LookupI::findAdapterById(string domainId, string adapterId, shared_ptr<IceDiscovery::LookupReplyPrx> reply,
+                         const Ice::Current&)
+#else
+LookupI::findAdapterById(const string& domainId, const string& adapterId, const IceDiscovery::LookupReplyPrxPtr& reply,
+                         const Ice::Current&)
+#endif
 {
     if(domainId != _domainId)
     {
@@ -174,7 +220,7 @@ LookupI::findAdapterById(const string& domainId, const std::string& adapterId,
     }
 
     bool isReplicaGroup;
-    Ice::ObjectPrx proxy = _registry->findAdapter(adapterId, isReplicaGroup);
+    Ice::ObjectPrxPtr proxy = _registry->findAdapter(adapterId, isReplicaGroup);
     if(proxy)
     {
         //
@@ -182,7 +228,11 @@ LookupI::findAdapterById(const string& domainId, const std::string& adapterId,
         //
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            reply->foundAdapterByIdAsync(adapterId, proxy, isReplicaGroup);
+#else
             reply->begin_foundAdapterById(adapterId, proxy, isReplicaGroup);
+#endif
         }
         catch(const Ice::LocalException&)
         {
@@ -191,6 +241,57 @@ LookupI::findAdapterById(const string& domainId, const std::string& adapterId,
     }
 }
 
+#ifdef ICE_CPP11_MAPPING
+void
+LookupI::findObject(function<void(const shared_ptr<Ice::ObjectPrx>&)> response, const Ice::Identity& id)
+{
+    Lock sync(*this);
+    map<Ice::Identity, ObjectRequestPtr>::iterator p = _objectRequests.find(id);
+    if(p == _objectRequests.end())
+    {
+        p = _objectRequests.insert(make_pair(id, make_shared<ObjectRequest>(shared_from_this(), id, _retryCount))).first;
+    }
+
+    if(p->second->addCallback(response))
+    {
+        try
+        {
+            _lookup->findObjectByIdAsync(_domainId, id, _lookupReply);
+            _timer->schedule(p->second, _timeout);
+        }
+        catch(const Ice::LocalException&)
+        {
+            p->second->finished(nullptr);
+            _objectRequests.erase(p);
+        }
+    }
+}
+
+void
+LookupI::findAdapter(function<void(const shared_ptr<Ice::ObjectPrx>&)> response, const std::string& adapterId)
+{
+    Lock sync(*this);
+    map<string, AdapterRequestPtr>::iterator p = _adapterRequests.find(adapterId);
+    if(p == _adapterRequests.end())
+    {
+        p = _adapterRequests.insert(make_pair(adapterId, make_shared<AdapterRequest>(shared_from_this(), adapterId, _retryCount))).first;
+    }
+
+    if(p->second->addCallback(response))
+    {
+        try
+        {
+            _lookup->findAdapterByIdAsync(_domainId, adapterId, _lookupReply);
+            _timer->schedule(p->second, _timeout);
+        }
+        catch(const Ice::LocalException&)
+        {
+            p->second->finished(0);
+            _adapterRequests.erase(p);
+        }
+    }
+}
+#else
 void
 LookupI::findObject(const Ice::AMD_Locator_findObjectByIdPtr& cb, const Ice::Identity& id)
 {
@@ -240,9 +341,10 @@ LookupI::findAdapter(const Ice::AMD_Locator_findAdapterByIdPtr& cb, const std::s
         }
     }
 }
+#endif
 
 void
-LookupI::foundObject(const Ice::Identity& id, const Ice::ObjectPrx& proxy)
+LookupI::foundObject(const Ice::Identity& id, const Ice::ObjectPrxPtr& proxy)
 {
     Lock sync(*this);
     map<Ice::Identity, ObjectRequestPtr>::iterator p = _objectRequests.find(id);
@@ -257,7 +359,7 @@ LookupI::foundObject(const Ice::Identity& id, const Ice::ObjectPrx& proxy)
 }
 
 void
-LookupI::foundAdapter(const std::string& adapterId, const Ice::ObjectPrx& proxy, bool isReplicaGroup)
+LookupI::foundAdapter(const std::string& adapterId, const Ice::ObjectPrxPtr& proxy, bool isReplicaGroup)
 {
     Lock sync(*this);
     map<string, AdapterRequestPtr>::iterator p = _adapterRequests.find(adapterId);
@@ -287,7 +389,11 @@ LookupI::objectRequestTimedOut(const ObjectRequestPtr& request)
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            _lookup->findObjectByIdAsync(_domainId, request->getId(), _lookupReply);
+#else
             _lookup->begin_findObjectById(_domainId, request->getId(), _lookupReply);
+#endif
             _timer->schedule(p->second, _timeout);
             return;
         }
@@ -315,7 +421,11 @@ LookupI::adapterRequestTimedOut(const AdapterRequestPtr& request)
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            _lookup->findAdapterByIdAsync(_domainId, request->getId(), _lookupReply);
+#else
             _lookup->begin_findAdapterById(_domainId, request->getId(), _lookupReply);
+#endif
             _timer->schedule(p->second, _timeout);
             return;
         }
@@ -333,16 +443,28 @@ LookupReplyI::LookupReplyI(const LookupIPtr& lookup) : _lookup(lookup)
 {
 }
 
+#ifdef ICE_CPP11_MAPPING
 void
-LookupReplyI::foundObjectById(const Ice::Identity& id, const Ice::ObjectPrx& proxy, const Ice::Current&)
+LookupReplyI::foundObjectById(Identity id, shared_ptr<ObjectPrx> proxy, const Current&)
 {
     _lookup->foundObject(id, proxy);
 }
 
 void
-LookupReplyI::foundAdapterById(const std::string& adapterId, const Ice::ObjectPrx& proxy, bool isReplicaGroup,
-                               const Ice::Current&)
+LookupReplyI::foundAdapterById(string adapterId, shared_ptr<ObjectPrx> proxy, bool isReplicaGroup, const Current&)
 {
     _lookup->foundAdapter(adapterId, proxy, isReplicaGroup);
 }
+#else
+void
+LookupReplyI::foundObjectById(const Identity& id, const ObjectPrxPtr& proxy, const Current&)
+{
+    _lookup->foundObject(id, proxy);
+}
 
+void
+LookupReplyI::foundAdapterById(const string& adapterId, const ObjectPrxPtr& proxy, bool isReplicaGroup, const Current&)
+{
+    _lookup->foundAdapter(adapterId, proxy, isReplicaGroup);
+}
+#endif
diff --git a/cpp/src/IceDiscovery/LookupI.h b/cpp/src/IceDiscovery/LookupI.h
index ffe4059632b..1432d7f0ff7 100644
--- a/cpp/src/IceDiscovery/LookupI.h
+++ b/cpp/src/IceDiscovery/LookupI.h
@@ -15,12 +15,102 @@
 
 #include <IceUtil/Timer.h>
 #include <Ice/Properties.h>
+#include <Ice/VirtualShared.h>
 
 namespace IceDiscovery
 {
 
 class LookupI;
 
+#ifdef ICE_CPP11_MAPPING
+
+template<class T> class Request : public IceUtil::TimerTask
+{
+public:
+
+    Request(std::shared_ptr<LookupI> lookup, const T& id, int retryCount) :
+        _lookup(lookup),
+        _id(id),
+        _nRetry(retryCount)
+    {
+    }
+
+    T getId() const
+    {
+        return _id;
+    }
+
+    virtual bool retry()
+    {
+        return --_nRetry >= 0;
+    }
+
+    bool addCallback(std::function<void(const std::shared_ptr<::Ice::ObjectPrx>&)> cb)
+    {
+        _callbacks.push_back(cb);
+        return _callbacks.size() == 1;
+    }
+
+    virtual void finished(const Ice::ObjectPrxPtr& proxy)
+    {
+        for(auto cb : _callbacks)
+        {
+            cb(proxy);
+        }
+        _callbacks.clear();
+    }
+
+protected:
+
+    LookupIPtr _lookup;
+    const T _id;
+    int _nRetry;
+    std::vector<std::function<void(const std::shared_ptr<::Ice::ObjectPrx>&)>> _callbacks;
+};
+
+class ObjectRequest : public Request<Ice::Identity>, public Ice::EnableSharedFromThis<ObjectRequest>
+{
+public:
+
+    ObjectRequest(const std::shared_ptr<LookupI>& lookup, const Ice::Identity& id, int retryCount) :
+        Request<Ice::Identity>(lookup, id, retryCount)
+    {
+    }
+
+    void response(const std::shared_ptr<Ice::ObjectPrx>&);
+
+private:
+
+    virtual void runTimerTask();
+};
+typedef std::shared_ptr<ObjectRequest> ObjectRequestPtr;
+
+class AdapterRequest : public Request<std::string>, public Ice::EnableSharedFromThis<AdapterRequest>
+{
+public:
+
+    AdapterRequest(std::shared_ptr<LookupI> lookup, const std::string& adapterId, int retryCount) :
+        Request<std::string>(lookup, adapterId, retryCount),
+        _start(IceUtil::Time::now())
+    {
+    }
+
+    bool response(const std::shared_ptr<Ice::ObjectPrx>&, bool);
+
+    virtual bool retry();
+    virtual void finished(const std::shared_ptr<Ice::ObjectPrx>&);
+
+private:
+
+    virtual void runTimerTask();
+    std::vector<Ice::ObjectPrxPtr> _proxies;
+    IceUtil::Time _start;
+    IceUtil::Time _latency;
+};
+typedef std::shared_ptr<AdapterRequest> AdapterRequestPtr;
+
+#else
+
 class Request : public IceUtil::TimerTask
 {
 public:
@@ -38,7 +128,7 @@ protected:
 template<class T, class CB> class RequestT : public Request
 {
 public:
-    
+
     RequestT(LookupI* lookup, T id, int retryCount) : Request(lookup, retryCount), _id(id)
     {
     }
@@ -54,7 +144,7 @@ public:
         return _callbacks.size() == 1;
     }
 
-    virtual void finished(const Ice::ObjectPrx& proxy)
+    virtual void finished(const Ice::ObjectPrxPtr& proxy)
     {
         for(typename std::vector<CB>::const_iterator p = _callbacks.begin(); p != _callbacks.end(); ++p)
         {
@@ -69,16 +159,17 @@ protected:
     std::vector<CB> _callbacks;
 };
 
-class ObjectRequest : public RequestT<Ice::Identity, Ice::AMD_Locator_findObjectByIdPtr>
+class ObjectRequest : public RequestT<Ice::Identity, Ice::AMD_Locator_findObjectByIdPtr>,
+                      public Ice::EnableSharedFromThis<ObjectRequest>
 {
 public:
 
-    ObjectRequest(LookupI* lookup, const Ice::Identity& id, int retryCount) : 
+    ObjectRequest(LookupI* lookup, const Ice::Identity& id, int retryCount) :
         RequestT<Ice::Identity, Ice::AMD_Locator_findObjectByIdPtr>(lookup, id, retryCount)
     {
     }
 
-    void response(const Ice::ObjectPrx&);
+    void response(const Ice::ObjectPrxPtr&);
 
 private:
 
@@ -86,51 +177,65 @@ private:
 };
 typedef IceUtil::Handle<ObjectRequest> ObjectRequestPtr;
 
-class AdapterRequest : public RequestT<std::string, Ice::AMD_Locator_findAdapterByIdPtr>
+class AdapterRequest : public RequestT<std::string, Ice::AMD_Locator_findAdapterByIdPtr>, public Ice::EnableSharedFromThis<AdapterRequest>
 {
 public:
 
-    AdapterRequest(LookupI* lookup, const std::string& adapterId, int retryCount) : 
+    AdapterRequest(LookupI* lookup, const std::string& adapterId, int retryCount) :
         RequestT<std::string, Ice::AMD_Locator_findAdapterByIdPtr>(lookup, adapterId, retryCount),
         _start(IceUtil::Time::now())
     {
     }
 
-    bool response(const Ice::ObjectPrx&, bool);
+    bool response(const Ice::ObjectPrxPtr&, bool);
 
     virtual bool retry();
-    virtual void finished(const Ice::ObjectPrx&);
+    virtual void finished(const Ice::ObjectPrxPtr&);
 
 private:
 
     virtual void runTimerTask();
-    std::vector<Ice::ObjectPrx> _proxies;
+    std::vector<Ice::ObjectPrxPtr> _proxies;
     IceUtil::Time _start;
     IceUtil::Time _latency;
 };
 typedef IceUtil::Handle<AdapterRequest> AdapterRequestPtr;
 
-class LookupI : public Lookup, private IceUtil::Mutex
+#endif
+
+class LookupI : public Lookup,
+                private IceUtil::Mutex,
+                public Ice::EnableSharedFromThis<LookupI>
 {
 public:
 
-    LookupI(const LocatorRegistryIPtr&, const LookupPrx&, const Ice::PropertiesPtr&);
+    LookupI(const LocatorRegistryIPtr&, const LookupPrxPtr&, const Ice::PropertiesPtr&);
     virtual ~LookupI();
 
     void destroy();
 
-    void setLookupReply(const LookupReplyPrx&);
+    void setLookupReply(const LookupReplyPrxPtr&);
 
-    virtual void findObjectById(const std::string&, const Ice::Identity&, const IceDiscovery::LookupReplyPrx&, 
+#ifdef ICE_CPP11_MAPPING
+    virtual void findObjectById(std::string,
+                                Ice::Identity,
+                                ::std::shared_ptr<IceDiscovery::LookupReplyPrx>,
                                 const Ice::Current&);
-    virtual void findAdapterById(const std::string&, const std::string&, const IceDiscovery::LookupReplyPrx&, 
+    virtual void findAdapterById(std::string, std::string, ::std::shared_ptr<IceDiscovery::LookupReplyPrx>,
+                                 const Ice::Current&);
+    void findObject(std::function<void(const std::shared_ptr<Ice::ObjectPrx>&)>, const Ice::Identity&);
+    void findAdapter(std::function<void(const std::shared_ptr<Ice::ObjectPrx>&)>, const std::string&);
+#else
+    virtual void findObjectById(const std::string&, const Ice::Identity&, const IceDiscovery::LookupReplyPrx&,
+                                const Ice::Current&);
+    virtual void findAdapterById(const std::string&, const std::string&, const IceDiscovery::LookupReplyPrx&,
                                  const Ice::Current&);
-
     void findObject(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&);
     void findAdapter(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&);
+#endif
 
-    void foundObject(const Ice::Identity&, const Ice::ObjectPrx&);
-    void foundAdapter(const std::string&, const Ice::ObjectPrx&, bool);
+    void foundObject(const Ice::Identity&, const Ice::ObjectPrxPtr&);
+    void foundAdapter(const std::string&, const Ice::ObjectPrxPtr&, bool);
 
     void adapterRequestTimedOut(const AdapterRequestPtr&);
     void objectRequestTimedOut(const ObjectRequestPtr&);
@@ -150,15 +255,15 @@ public:
 private:
 
     LocatorRegistryIPtr _registry;
-    const LookupPrx _lookup;
-    LookupReplyPrx _lookupReply;
+    const LookupPrxPtr _lookup;
+    LookupReplyPrxPtr _lookupReply;
     const IceUtil::Time _timeout;
     const int _retryCount;
     const int _latencyMultiplier;
     const std::string _domainId;
 
     IceUtil::TimerPtr _timer;
-    Ice::ObjectPrx _wellKnownProxy;
+    Ice::ObjectPrxPtr _wellKnownProxy;
 
     std::map<Ice::Identity, ObjectRequestPtr> _objectRequests;
     std::map<std::string, AdapterRequestPtr> _adapterRequests;
@@ -170,8 +275,13 @@ public:
 
     LookupReplyI(const LookupIPtr&);
 
+#ifdef ICE_CPP11_MAPPING
+    virtual void foundObjectById(Ice::Identity, std::shared_ptr<Ice::ObjectPrx>, const Ice::Current&);
+    virtual void foundAdapterById(std::string, std::shared_ptr<Ice::ObjectPrx>, bool, const Ice::Current&);
+#else
     virtual void foundObjectById(const Ice::Identity&, const Ice::ObjectPrx&, const Ice::Current&);
     virtual void foundAdapterById(const std::string&, const Ice::ObjectPrx&, bool, const Ice::Current&);
+#endif
 
 private:
 
diff --git a/cpp/src/IceDiscovery/Makefile b/cpp/src/IceDiscovery/Makefile
deleted file mode 100644
index b9f4f5dd9e3..00000000000
--- a/cpp/src/IceDiscovery/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME     = $(call mklibfilename,IceDiscovery,$(VERSION))
-SONAME          = $(call mksoname,IceDiscovery,$(SOVERSION))
-LIBNAME		= $(call mklibname,IceDiscovery)
-
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-
-SLICE_OBJS      = IceDiscovery.o
-
-OBJS		= LocatorI.o \
-		  LookupI.o \
-		  PluginI.o \
-		  $(SLICE_OBJS)
-
-HDIR		= $(headerdir)/IceDiscovery
-SDIR		= $(slicedir)/IceDiscovery
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I.. $(CPPFLAGS) -DICE_DISCOVERY_API_EXPORTS
-SLICE2CPPFLAGS	:= --ice --include-dir IceDiscovery $(SLICE2CPPFLAGS)
-
-LINKWITH        := -lIce -lIceUtil $(CXXLIBS)
-
-ifeq ($(STATICLIBS),yes)
-$(libdir)/$(LIBNAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mklib,$@,$(OBJS))
-else
-$(libdir)/$(LIBFILENAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	@mkdir -p $(libdir)$(cpp11libdirsuffix)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-endif
-
-../IceDiscovery/IceDiscovery.h IceDiscovery.cpp: \
-	$(slicedir)/IceDiscovery/IceDiscovery.ice $(SLICE2CPP) $(SLICEPARSERLIB)
-	rm -f IceDiscovery.h IceDiscovery.cpp
-	$(SLICE2CPP) $(SLICE2CPPFLAGS) $(slicedir)/IceDiscovery/IceDiscovery.ice
-	@touch IceDiscovery.cpp
-	@mkdir -p .depend
-	@$(SLICE2CPP) $(SLICE2CPPFLAGS) --depend $(slicedir)/IceDiscovery/IceDiscovery.ice > .depend/IceDiscovery.ice.d
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/IceDiscovery/Makefile.mak b/cpp/src/IceDiscovery/Makefile.mak
deleted file mode 100644
index c6e2615ba6a..00000000000
--- a/cpp/src/IceDiscovery/Makefile.mak
+++ /dev/null
@@ -1,67 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME     	= $(top_srcdir)\lib\icediscovery$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icediscovery$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-SDIR 		= $(slicedir)\IceDiscovery
-SLICE_OBJS	= .\IceDiscovery.obj 
-
-OBJS		= .\LocatorI.obj \
-		  .\LookupI.obj \
-		  .\PluginI.obj \
-		  $(SLICE_OBJS)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -DICE_DISCOVERY_API_EXPORTS
-SLICE2CPPFLAGS	= --ice --include-dir IceDiscovery $(SLICE2CPPFLAGS)
-
-LINKWITH        = $(LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = IceDiscovery.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceDiscovery.res
-	$(LINK) $(BASE):0x28000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-IceDiscovery.h IceDiscovery.cpp: $(slicedir)\IceDiscovery\IceDiscovery.ice "$(SLICE2CPP)" "$(SLICEPARSERLIB)"
-	del /q $(*F).h $(*F).cpp
-	"$(SLICE2CPP)" $(SLICE2CPPFLAGS) $(slicedir)\IceDiscovery\IceDiscovery.ice
-
-clean::
-	-del /q IceDiscovery.cpp IceDiscovery.h
-	-del /q IceDiscovery.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/IceDiscovery/Makefile.mk b/cpp/src/IceDiscovery/Makefile.mk
new file mode 100644
index 00000000000..f298ab5ab50
--- /dev/null
+++ b/cpp/src/IceDiscovery/Makefile.mk
@@ -0,0 +1,18 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries := IceDiscovery
+
+IceDiscovery_targetdir			:= $(libdir)
+IceDiscovery_dependencies		:= Ice
+IceDiscovery_sliceflags			:= --include-dir IceDiscovery
+IceDiscovery_generated_includedir 	:= $(project)/generated/IceDiscovery
+IceDiscovery_cppflags			:= -DICE_DISCOVERY_API_EXPORTS
+
+projects += $(project)
diff --git a/cpp/src/IceDiscovery/PluginI.cpp b/cpp/src/IceDiscovery/PluginI.cpp
index cf262c4f0b0..615e0eeec96 100644
--- a/cpp/src/IceDiscovery/PluginI.cpp
+++ b/cpp/src/IceDiscovery/PluginI.cpp
@@ -28,17 +28,12 @@ using namespace IceDiscovery;
 //
 // Plugin factory function.
 //
-extern "C"
-{
-
-ICE_DISCOVERY_API Ice::Plugin*
+extern "C" ICE_DISCOVERY_API Ice::Plugin*
 createIceDiscovery(const Ice::CommunicatorPtr& communicator, const string&, const Ice::StringSeq&)
 {
     return new PluginI(communicator);
 }
 
-}
-
 namespace Ice
 {
 
@@ -50,6 +45,15 @@ registerIceDiscovery(bool loadOnInitialize)
 
 }
 
+//
+// Objective-C function to allow Objective-C programs to register plugin.
+//
+extern "C" ICE_DISCOVERY_API void
+ICEregisterIceDiscovery(bool loadOnInitialize)
+{
+    Ice::registerIceDiscovery(loadOnInitialize);
+}
+
 PluginI::PluginI(const Ice::CommunicatorPtr& communicator) : _communicator(communicator)
 {
 }
@@ -105,9 +109,9 @@ PluginI::initialize()
     //
     // Setup locatory registry.
     //
-    LocatorRegistryIPtr locatorRegistry = new LocatorRegistryI(_communicator);
-    Ice::LocatorRegistryPrx locatorRegistryPrx =
-        Ice::LocatorRegistryPrx::uncheckedCast(_locatorAdapter->addWithUUID(locatorRegistry));
+    LocatorRegistryIPtr locatorRegistry = ICE_MAKE_SHARED(LocatorRegistryI, _communicator);
+    Ice::LocatorRegistryPrxPtr locatorRegistryPrx =
+        ICE_UNCHECKED_CAST(Ice::LocatorRegistryPrx, _locatorAdapter->addWithUUID(locatorRegistry));
 
     string lookupEndpoints = properties->getProperty("IceDiscovery.Lookup");
     if(lookupEndpoints.empty())
@@ -121,17 +125,21 @@ PluginI::initialize()
         lookupEndpoints = os.str();
     }
 
-    Ice::ObjectPrx lookupPrx = _communicator->stringToProxy("IceDiscovery/Lookup -d:" + lookupEndpoints);
+    Ice::ObjectPrxPtr lookupPrx = _communicator->stringToProxy("IceDiscovery/Lookup -d:" + lookupEndpoints);
     lookupPrx = lookupPrx->ice_collocationOptimized(false); // No collocation optimization for the multicast proxy!
     try
     {
         // Ensure we can establish a connection to the multicast proxy
         // but don't block.
+#ifdef ICE_CPP11_MAPPING
+        lookupPrx->ice_getConnection();
+#else
         Ice::AsyncResultPtr result = lookupPrx->begin_ice_getConnection();
         if(result->sentSynchronously())
         {
             lookupPrx->end_ice_getConnection(result);
         }
+#endif
     }
     catch(const Ice::LocalException& ex)
     {
@@ -145,17 +153,17 @@ PluginI::initialize()
     //
     // Add lookup and lookup reply Ice objects
     //
-    _lookup = new LookupI(locatorRegistry, LookupPrx::uncheckedCast(lookupPrx), properties);
+    _lookup = ICE_MAKE_SHARED(LookupI, locatorRegistry, ICE_UNCHECKED_CAST(LookupPrx, lookupPrx), properties);
     _multicastAdapter->add(_lookup, _communicator->stringToIdentity("IceDiscovery/Lookup"));
 
-    Ice::ObjectPrx lookupReply = _replyAdapter->addWithUUID(new LookupReplyI(_lookup))->ice_datagram();
-    _lookup->setLookupReply(LookupReplyPrx::uncheckedCast(lookupReply));
+    Ice::ObjectPrxPtr lookupReply = _replyAdapter->addWithUUID(ICE_MAKE_SHARED(LookupReplyI, _lookup))->ice_datagram();
+    _lookup->setLookupReply(ICE_UNCHECKED_CAST(LookupReplyPrx, lookupReply));
 
     //
     // Setup locator on the communicator.
     //
-    Ice::ObjectPrx loc = _locatorAdapter->addWithUUID(new LocatorI(_lookup, locatorRegistryPrx));
-    _communicator->setDefaultLocator(Ice::LocatorPrx::uncheckedCast(loc));
+    Ice::ObjectPrxPtr loc = _locatorAdapter->addWithUUID(ICE_MAKE_SHARED(LocatorI, _lookup, locatorRegistryPrx));
+    _communicator->setDefaultLocator(ICE_UNCHECKED_CAST(Ice::LocatorPrx, loc));
 
     _multicastAdapter->activate();
     _replyAdapter->activate();
diff --git a/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj b/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj
new file mode 100644
index 00000000000..9372639f490
--- /dev/null
+++ b/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{270BB666-62FB-49ED-BFA2-8F279DC9ABDD}</ProjectGuid>
+    <RootNamespace>IceDiscovery</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceDiscovery\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceDiscovery</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceDiscovery.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\LocatorI.cpp" />
+    <ClCompile Include="..\..\LookupI.cpp" />
+    <ClCompile Include="..\..\PluginI.cpp" />
+    <ClCompile Include="Win32\Debug\IceDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceDiscovery\IceDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceDiscovery\IceDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceDiscovery\IceDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceDiscovery\IceDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\LocatorI.h" />
+    <ClInclude Include="..\..\LookupI.h" />
+    <ClInclude Include="..\..\PluginI.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj.filters b/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj.filters
new file mode 100644
index 00000000000..24c6df71ba2
--- /dev/null
+++ b/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj.filters
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{0d6861f5-22e7-44f6-acd3-41036cc59969}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{be69da66-385a-4f67-a8ee-7e916d149ce7}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{0f9986eb-4f31-4c93-9427-d185c046b582}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{614de963-a575-41cd-9676-4aafa0959c5f}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{bc8d9c93-cb4c-4572-85c4-802ee4aa9abd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{9d647877-d834-4fc9-9bb0-c9e81b22af9e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{7e07e6af-48f1-4aac-887c-f4a1f5b66663}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{ae84873f-54d9-439a-9a91-a4426eac1d8e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{cae30a2b-a080-4a2e-8aaf-81c9fdd49aa3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{4136cbcb-a4ef-4825-8dbd-f52a75d07512}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{40fda4f9-f0c5-4859-b3e1-239238503f8c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{2f63945c-e7b3-40f7-9c14-1bc619182cc3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{e740ce81-b1e1-4ed2-8175-d51046baebbc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{7cb92079-40d3-4846-aa80-85c432bb1665}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{3fd46de4-5960-450c-9ad3-fffcdbe4eed1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{148be7ea-c8b5-46b1-a34b-5644d53498dd}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceDiscovery.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\PluginI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LookupI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LocatorI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceDiscovery.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceDiscovery.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceDiscovery.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceDiscovery.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\PluginI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\LookupI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\LocatorI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceDiscovery\IceDiscovery.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceDiscovery\IceDiscovery.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceDiscovery\IceDiscovery.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceDiscovery\IceDiscovery.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj b/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj
new file mode 100644
index 00000000000..2b28b9689bb
--- /dev/null
+++ b/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}</ProjectGuid>
+    <RootNamespace>IceDiscovery</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceDiscovery\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceDiscovery</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\LocatorI.cpp" />
+    <ClCompile Include="..\..\LookupI.cpp" />
+    <ClCompile Include="..\..\PluginI.cpp" />
+    <ClCompile Include="Win32\Debug\IceDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceDiscovery\IceDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceDiscovery\IceDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceDiscovery\IceDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceDiscovery\IceDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\LocatorI.h" />
+    <ClInclude Include="..\..\LookupI.h" />
+    <ClInclude Include="..\..\PluginI.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceDiscovery.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj.filters b/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj.filters
new file mode 100644
index 00000000000..7f9175b5ec4
--- /dev/null
+++ b/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj.filters
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{60c0e9e2-3c17-43ea-8d40-f2067fb72a34}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{564e28d7-2a5c-4442-8007-8b13ea920878}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{d9e7c45e-1847-4d4f-bdb1-2f3d5d758fc6}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{8cc93d29-e4e4-4255-b9f6-bea3de3c06a4}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{bd3b5589-03bd-47dd-93c4-913f198174a9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{5249ff2e-3f8a-44ee-85bd-32f39a0f8b11}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{8c2a770f-da37-42da-a603-4a17fb15f309}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{d4c28f90-be32-4170-a3c5-09dbd9a3918e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{5ce9af0e-4c81-460c-9038-8e7a6ba80c95}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{d82931ad-489f-47d5-8fc8-fac097a902f1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{1720fce7-3947-4368-a1d2-3a4681993e57}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{8ef8c108-8c5e-4634-9f00-e239c0944710}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{3e3b7fba-7b40-47a1-9283-5f0fa4aaccd9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{4ed77c3d-89de-4a2d-8648-5736395fafd8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{26db6790-71ea-48ed-ba85-59459a32f53a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{5737e931-4d61-4729-8df7-a9868ca753c5}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\PluginI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LookupI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LocatorI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceDiscovery.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceDiscovery.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceDiscovery.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceDiscovery.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\PluginI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\LookupI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\LocatorI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceDiscovery\IceDiscovery.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceDiscovery\IceDiscovery.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceDiscovery\IceDiscovery.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceDiscovery\IceDiscovery.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceDiscovery.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj b/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj
new file mode 100644
index 00000000000..4f4204f988c
--- /dev/null
+++ b/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}</ProjectGuid>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WindowsAppContainer>true</WindowsAppContainer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceDiscovery\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceDiscovery</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ARM\Debug\IceDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\IceDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceDiscovery\IceDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceDiscovery\IceDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceDiscovery\IceDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceDiscovery\IceDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceDiscovery\IceDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceDiscovery\IceDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj.filters b/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj.filters
new file mode 100644
index 00000000000..4e31d070748
--- /dev/null
+++ b/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj.filters
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{82958b57-d2a8-4a54-a60f-9dcb5cf8eb84}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{8e5ecb82-1905-4d38-8da7-e922ce4c834c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{edc33724-ceb2-42b3-9233-3dd263b03574}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{0547f74d-4739-4c1d-adf2-5f97967047fd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{39efba01-6c16-4076-b554-ea8ce5c4133b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{4dfcdb2a-477b-4f01-b588-e158f5e4b949}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{430c5308-d605-4e06-a8f3-0ea9f363adb8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM">
+      <UniqueIdentifier>{dd1e970e-9628-42a9-add8-2d92ea01f92c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Debug">
+      <UniqueIdentifier>{30ca212f-c1dc-4503-90ab-2f7862cd909e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM">
+      <UniqueIdentifier>{8549bbb1-e0b3-4608-bd1f-f679f123bebd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Debug">
+      <UniqueIdentifier>{62878f3d-1982-4223-81d4-cc5fff3e4e33}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{31321de6-06f3-4994-9df9-7b6be0eb264e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{d1ada182-6a56-46d1-a472-72cad558c8c1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{17121429-4626-4c81-af39-c34f7e33740d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{6c5b6305-73c5-4dd3-ab11-21673fe81456}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{bde7ff49-9648-48e2-9cb2-5f540336e3ef}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{fce53105-dc31-44b2-9ad3-b36625875ef1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Release">
+      <UniqueIdentifier>{32db1697-fc9d-427e-a944-ab4cbf770255}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Release">
+      <UniqueIdentifier>{9a5a71fc-1c2e-4f34-b6ad-8451b9f295f1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{a811dc89-64da-4fc1-9d8d-20970b1451fb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{8f873d48-2f3b-4b92-9645-75af9c88b997}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceDiscovery\IceDiscovery.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Win32\Debug\IceDiscovery.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\IceDiscovery.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceDiscovery.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceDiscovery.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\IceDiscovery.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceDiscovery.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceDiscovery\IceDiscovery.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceDiscovery\IceDiscovery.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceDiscovery\IceDiscovery.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceDiscovery\IceDiscovery.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceDiscovery\IceDiscovery.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceDiscovery\IceDiscovery.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceGrid/.depend.mak b/cpp/src/IceGrid/.depend.mak
deleted file mode 100755
index a89dacbcdba..00000000000
--- a/cpp/src/IceGrid/.depend.mak
+++ /dev/null
@@ -1,8294 +0,0 @@
-
-Client.obj: \
-	Client.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Parser.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "FileParserI.h" \
-    "$(includedir)\IceGrid\FileParser.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-    "IceLocatorDiscovery.h" \
-    "$(includedir)\Glacier2\Router.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-
-DescriptorBuilder.obj: \
-	DescriptorBuilder.cpp \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "DescriptorBuilder.h" \
-    "..\..\src\IceXML\Parser.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceUtil\Random.h" \
-
-DescriptorHelper.obj: \
-	DescriptorHelper.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "DescriptorHelper.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceXML\Parser.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "Internal.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-
-DescriptorParser.obj: \
-	DescriptorParser.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "..\..\src\IceXML\Parser.h" \
-    "..\..\src\IcePatch2Lib\Util.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "DescriptorParser.h" \
-    "DescriptorBuilder.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-
-FileParserI.obj: \
-	FileParserI.cpp \
-    "FileParserI.h" \
-    "$(includedir)\IceGrid\FileParser.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "DescriptorParser.h" \
-    "..\..\src\IceXML\Parser.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-
-Parser.obj: \
-	Parser.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "..\..\src\IceXML\Parser.h" \
-    "Parser.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "DescriptorParser.h" \
-    "DescriptorHelper.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "Internal.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\IceBox\IceBox.h" \
-    "$(includedir)\IceBox\Config.h" \
-
-Util.obj: \
-	Util.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Util.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "Internal.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-
-Internal.obj: \
-	Internal.cpp \
-    "Internal.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-
-IceLocatorDiscovery.obj: \
-	IceLocatorDiscovery.cpp \
-    "IceLocatorDiscovery.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-
-Grammar.obj: \
-	Grammar.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Parser.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Query.h" \
-
-Scanner.obj: \
-	Scanner.cpp \
-    "$(includedir)\IceUtil\ScannerConfig.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Parser.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Grammar.h" \
-
-AdminRouter.obj: \
-	AdminRouter.cpp \
-    "AdminRouter.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-
-FileCache.obj: \
-	FileCache.cpp \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "FileCache.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Config.h" \
-
-PlatformInfo.obj: \
-	PlatformInfo.cpp \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "PlatformInfo.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "Internal.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "TraceLevels.h" \
-
-SessionManager.obj: \
-	SessionManager.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "SessionManager.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "Internal.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-
-TraceLevels.obj: \
-	TraceLevels.cpp \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "TraceLevels.h" \
-
-Activator.obj: \
-	Activator.cpp \
-    "..\..\src\IceUtil\ArgVector.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Activator.h" \
-    "Internal.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "TraceLevels.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "ServerI.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "..\..\src\IcePatch2Lib\Util.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-
-NodeAdminRouter.obj: \
-	NodeAdminRouter.cpp \
-    "NodeAdminRouter.h" \
-    "NodeI.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IcePatch2\FileServer.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "Internal.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "PlatformInfo.h" \
-    "$(includedir)\IceGrid\UserAccountMapper.h" \
-    "FileCache.h" \
-    "AdminRouter.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "ServerI.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "Activator.h" \
-    "ServerAdapterI.h" \
-
-NodeI.obj: \
-	NodeI.cpp \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "..\..\src\IcePatch2Lib\Util.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "$(includedir)\IcePatch2\ClientUtil.h" \
-    "$(includedir)\IcePatch2\FileServer.h" \
-    "NodeI.h" \
-    "Internal.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "PlatformInfo.h" \
-    "$(includedir)\IceGrid\UserAccountMapper.h" \
-    "FileCache.h" \
-    "Activator.h" \
-    "ServerI.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "ServerAdapterI.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "NodeSessionManager.h" \
-    "SessionManager.h" \
-    "$(includedir)\IceGrid\Query.h" \
-
-NodeSessionManager.obj: \
-	NodeSessionManager.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "NodeSessionManager.h" \
-    "SessionManager.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "Internal.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "TraceLevels.h" \
-    "NodeI.h" \
-    "$(includedir)\IcePatch2\FileServer.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "PlatformInfo.h" \
-    "$(includedir)\IceGrid\UserAccountMapper.h" \
-    "FileCache.h" \
-
-ServerAdapterI.obj: \
-	ServerAdapterI.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "ServerAdapterI.h" \
-    "Internal.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "ServerI.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "Activator.h" \
-    "TraceLevels.h" \
-    "NodeI.h" \
-    "$(includedir)\IcePatch2\FileServer.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "PlatformInfo.h" \
-    "$(includedir)\IceGrid\UserAccountMapper.h" \
-    "FileCache.h" \
-
-ServerI.obj: \
-	ServerI.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "ServerI.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "Activator.h" \
-    "Internal.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "TraceLevels.h" \
-    "NodeI.h" \
-    "$(includedir)\IcePatch2\FileServer.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "PlatformInfo.h" \
-    "$(includedir)\IceGrid\UserAccountMapper.h" \
-    "FileCache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "ServerAdapterI.h" \
-    "DescriptorHelper.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceXML\Parser.h" \
-    "..\..\src\IcePatch2Lib\Util.h" \
-
-AdapterCache.obj: \
-	AdapterCache.cpp \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "AdapterCache.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "TraceLevels.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Internal.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "NodeSessionI.h" \
-    "ServerCache.h" \
-    "Allocatable.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "SessionI.h" \
-    "ReapThread.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "SessionServantManager.h" \
-    "AdminCallbackRouter.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-AdminCallbackRouter.obj: \
-	AdminCallbackRouter.cpp \
-    "AdminCallbackRouter.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-AdminI.obj: \
-	AdminI.cpp \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "..\..\src\Ice\TraceUtil.h" \
-    "..\..\src\Ice\TraceLevelsF.h" \
-    "AdminI.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "RegistryI.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-    "Internal.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "PlatformInfo.h" \
-    "ReplicaSessionManager.h" \
-    "SessionManager.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "..\..\src\IceStorm\Service.h" \
-    "$(includedir)\IceBox\IceBox.h" \
-    "$(includedir)\IceBox\Config.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Database.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ServerCache.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "ReplicaCache.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "Topics.h" \
-    "PluginFacadeI.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-    "DescriptorParser.h" \
-    "DescriptorHelper.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceXML\Parser.h" \
-    "AdminSessionI.h" \
-    "SessionI.h" \
-    "ReapThread.h" \
-    "SessionServantManager.h" \
-    "AdminCallbackRouter.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "NodeSessionI.h" \
-
-AdminSessionI.obj: \
-	AdminSessionI.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "RegistryI.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-    "Internal.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "PlatformInfo.h" \
-    "ReplicaSessionManager.h" \
-    "SessionManager.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "..\..\src\IceStorm\Service.h" \
-    "$(includedir)\IceBox\IceBox.h" \
-    "$(includedir)\IceBox\Config.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "AdminSessionI.h" \
-    "SessionI.h" \
-    "ReapThread.h" \
-    "SessionServantManager.h" \
-    "AdminCallbackRouter.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "Topics.h" \
-    "AdminI.h" \
-    "Database.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ServerCache.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "NodeCache.h" \
-    "ReplicaCache.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "PluginFacadeI.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-
-Allocatable.obj: \
-	Allocatable.cpp \
-    "Allocatable.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "SessionI.h" \
-    "ReapThread.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "SessionServantManager.h" \
-    "AdminCallbackRouter.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-AllocatableObjectCache.obj: \
-	AllocatableObjectCache.cpp \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "AllocatableObjectCache.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "TraceLevels.h" \
-    "Allocatable.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "SessionI.h" \
-    "ReapThread.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "SessionServantManager.h" \
-    "AdminCallbackRouter.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-Database.obj: \
-	Database.cpp \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "Database.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "Internal.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "ServerCache.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "TraceLevels.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "ReplicaCache.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "Topics.h" \
-    "PluginFacadeI.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-    "DescriptorHelper.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceXML\Parser.h" \
-    "NodeSessionI.h" \
-    "ReplicaSessionI.h" \
-    "$(includedir)\IceGrid\IceGrid.h" \
-    "$(includedir)\IceGrid\FileParser.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-    "$(includedir)\IceGrid\UserAccountMapper.h" \
-    "SerialsDict.h" \
-
-FileUserAccountMapperI.obj: \
-	FileUserAccountMapperI.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "FileUserAccountMapperI.h" \
-    "$(includedir)\IceGrid\UserAccountMapper.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Config.h" \
-
-IdentityObjectInfoDict.obj: \
-	IdentityObjectInfoDict.cpp \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "IdentityObjectInfoDict.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-
-InternalRegistryI.obj: \
-	InternalRegistryI.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "RegistryI.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-    "Internal.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "PlatformInfo.h" \
-    "ReplicaSessionManager.h" \
-    "SessionManager.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "..\..\src\IceStorm\Service.h" \
-    "$(includedir)\IceBox\IceBox.h" \
-    "$(includedir)\IceBox\Config.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "InternalRegistryI.h" \
-    "Database.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ServerCache.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "ReplicaCache.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "Topics.h" \
-    "PluginFacadeI.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-    "WellKnownObjectsManager.h" \
-    "ReapThread.h" \
-    "NodeSessionI.h" \
-    "ReplicaSessionI.h" \
-    "FileCache.h" \
-    "$(includedir)\IceSSL\IceSSL.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "$(includedir)\IceSSL\EndpointInfo.h" \
-    "..\..\src\IceSSL\RFC2253.h" \
-
-LocatorI.obj: \
-	LocatorI.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "LocatorI.h" \
-    "Internal.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-    "Database.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ServerCache.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "ReplicaCache.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "Topics.h" \
-    "PluginFacadeI.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-    "WellKnownObjectsManager.h" \
-    "SessionI.h" \
-    "ReapThread.h" \
-    "SessionServantManager.h" \
-    "AdminCallbackRouter.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-LocatorRegistryI.obj: \
-	LocatorRegistryI.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "LocatorRegistryI.h" \
-    "Internal.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "ReplicaSessionManager.h" \
-    "SessionManager.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Database.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ServerCache.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "ReplicaCache.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "Topics.h" \
-    "PluginFacadeI.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-
-NodeCache.obj: \
-	NodeCache.cpp \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "Internal.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "SessionI.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "ReapThread.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "SessionServantManager.h" \
-    "AdminCallbackRouter.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "NodeSessionI.h" \
-    "ServerCache.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Allocatable.h" \
-    "ReplicaCache.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "DescriptorHelper.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceXML\Parser.h" \
-
-NodeSessionI.obj: \
-	NodeSessionI.cpp \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "NodeSessionI.h" \
-    "Internal.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "Database.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ServerCache.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "ReplicaCache.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "Topics.h" \
-    "PluginFacadeI.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-
-ObjectCache.obj: \
-	ObjectCache.cpp \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "ObjectCache.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "TraceLevels.h" \
-    "Internal.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "NodeSessionI.h" \
-    "ServerCache.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Allocatable.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "SessionI.h" \
-    "ReapThread.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "SessionServantManager.h" \
-    "AdminCallbackRouter.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-PluginFacadeI.obj: \
-	PluginFacadeI.cpp \
-    "PluginFacadeI.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "PlatformInfo.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "Internal.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "NodeSessionI.h" \
-    "Database.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ServerCache.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "ReplicaCache.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "Topics.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-
-QueryI.obj: \
-	QueryI.cpp \
-    "Internal.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "QueryI.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Database.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ServerCache.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "ReplicaCache.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "Topics.h" \
-    "PluginFacadeI.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-
-ReapThread.obj: \
-	ReapThread.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "ReapThread.h" \
-
-RegistryAdminRouter.obj: \
-	RegistryAdminRouter.cpp \
-    "RegistryAdminRouter.h" \
-    "Database.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "Internal.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "ServerCache.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "ReplicaCache.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "Topics.h" \
-    "PluginFacadeI.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-    "AdminRouter.h" \
-
-RegistryI.obj: \
-	RegistryI.cpp \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "..\..\src\Ice\Network.h" \
-    "..\..\src\Ice\NetworkF.h" \
-    "..\..\src\Ice\NetworkProxyF.h" \
-    "..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\src\Ice\ProtocolPluginFacade.h" \
-    "..\..\src\Ice\ProtocolPluginFacadeF.h" \
-    "..\..\src\Ice\EndpointFactoryF.h" \
-    "..\..\src\Ice\EndpointIF.h" \
-    "..\..\src\IceStorm\Service.h" \
-    "$(includedir)\IceBox\IceBox.h" \
-    "$(includedir)\IceBox\Config.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "$(includedir)\IceSSL\IceSSL.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "$(includedir)\IceSSL\EndpointInfo.h" \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\Glacier2\NullPermissionsVerifier.h" \
-    "TraceLevels.h" \
-    "Database.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "Internal.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "ServerCache.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "ReplicaCache.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "Topics.h" \
-    "PluginFacadeI.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-    "ReapThread.h" \
-    "RegistryI.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-    "PlatformInfo.h" \
-    "ReplicaSessionManager.h" \
-    "SessionManager.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "LocatorI.h" \
-    "LocatorRegistryI.h" \
-    "AdminI.h" \
-    "QueryI.h" \
-    "SessionI.h" \
-    "SessionServantManager.h" \
-    "AdminCallbackRouter.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "AdminSessionI.h" \
-    "InternalRegistryI.h" \
-    "FileUserAccountMapperI.h" \
-    "$(includedir)\IceGrid\UserAccountMapper.h" \
-    "WellKnownObjectsManager.h" \
-    "FileCache.h" \
-    "IceLocatorDiscovery.h" \
-    "RegistryAdminRouter.h" \
-    "AdminRouter.h" \
-
-ReplicaCache.obj: \
-	ReplicaCache.cpp \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "ReplicaCache.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "Internal.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "ReplicaSessionI.h" \
-    "Topics.h" \
-
-ReplicaSessionI.obj: \
-	ReplicaSessionI.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "ReplicaSessionI.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "Internal.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "Database.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ServerCache.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "ReplicaCache.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "Topics.h" \
-    "PluginFacadeI.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-    "WellKnownObjectsManager.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-    "PlatformInfo.h" \
-
-ReplicaSessionManager.obj: \
-	ReplicaSessionManager.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "ReplicaSessionManager.h" \
-    "SessionManager.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "Internal.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "TraceLevels.h" \
-    "Database.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ServerCache.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "ReplicaCache.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "Topics.h" \
-    "PluginFacadeI.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-    "WellKnownObjectsManager.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-
-SerialsDict.obj: \
-	SerialsDict.cpp \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "SerialsDict.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-
-ServerCache.obj: \
-	ServerCache.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "ServerCache.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "Internal.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Allocatable.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "AdapterCache.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "SessionI.h" \
-    "ReapThread.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "SessionServantManager.h" \
-    "AdminCallbackRouter.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "DescriptorHelper.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceXML\Parser.h" \
-
-SessionI.obj: \
-	SessionI.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "SessionI.h" \
-    "ReapThread.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "SessionServantManager.h" \
-    "AdminCallbackRouter.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "QueryI.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "LocatorI.h" \
-    "Internal.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-    "Database.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ServerCache.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "NodeCache.h" \
-    "ReplicaCache.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "Topics.h" \
-    "PluginFacadeI.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-
-SessionServantManager.obj: \
-	SessionServantManager.cpp \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "SessionServantManager.h" \
-    "AdminCallbackRouter.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-
-StringAdapterInfoDict.obj: \
-	StringAdapterInfoDict.cpp \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "StringAdapterInfoDict.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-
-StringApplicationInfoDict.obj: \
-	StringApplicationInfoDict.cpp \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "StringApplicationInfoDict.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-
-Topics.obj: \
-	Topics.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Topics.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Internal.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "DescriptorHelper.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceXML\Parser.h" \
-
-WellKnownObjectsManager.obj: \
-	WellKnownObjectsManager.cpp \
-    "$(includedir)\Glacier2\PermissionsVerifier.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "WellKnownObjectsManager.h" \
-    "Internal.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-    "Database.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "ServerCache.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Allocatable.h" \
-    "Cache.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "TraceLevels.h" \
-    "NodeCache.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "ReplicaCache.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "ObjectCache.h" \
-    "AllocatableObjectCache.h" \
-    "AdapterCache.h" \
-    "Topics.h" \
-    "PluginFacadeI.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-
-IceGridNode.obj: \
-	IceGridNode.cpp \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Activator.h" \
-    "Internal.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "NodeAdminRouter.h" \
-    "NodeI.h" \
-    "$(includedir)\IcePatch2\FileServer.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "PlatformInfo.h" \
-    "$(includedir)\IceGrid\UserAccountMapper.h" \
-    "FileCache.h" \
-    "AdminRouter.h" \
-    "RegistryI.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-    "ReplicaSessionManager.h" \
-    "SessionManager.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "..\..\src\IceStorm\Service.h" \
-    "$(includedir)\IceBox\IceBox.h" \
-    "$(includedir)\IceBox\Config.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "FileUserAccountMapperI.h" \
-    "NodeSessionManager.h" \
-    "TraceLevels.h" \
-    "DescriptorParser.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "..\..\src\IcePatch2Lib\Util.h" \
-
-IceGridRegistry.obj: \
-	IceGridRegistry.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "RegistryI.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-    "Internal.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "PlatformInfo.h" \
-    "ReplicaSessionManager.h" \
-    "SessionManager.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "$(includedir)\Glacier2\PermissionsVerifierF.h" \
-    "..\..\src\IceStorm\Service.h" \
-    "$(includedir)\IceBox\IceBox.h" \
-    "$(includedir)\IceBox\Config.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "TraceLevels.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Random.h" \
-
-IceGridDB.obj: \
-	IceGridDB.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "$(includedir)\Freeze\CatalogIndexList.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "..\..\src\IcePatch2Lib\Util.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "DBTypes.h" \
-    "StringApplicationInfoDict.h" \
-    "StringAdapterInfoDict.h" \
-    "IdentityObjectInfoDict.h" \
-    "SerialsDict.h" \
-
-DBTypes.obj: \
-	DBTypes.cpp \
-    "DBTypes.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
diff --git a/cpp/src/IceGrid/.gitignore b/cpp/src/IceGrid/.gitignore
deleted file mode 100644
index 7f8f1311b4d..00000000000
--- a/cpp/src/IceGrid/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
-Internal.cpp
-IceLocatorDiscovery.cpp
-DBTypes.cpp
-Internal.h
-IceLocatorDiscovery.h
-DBTypes.h
-StringApplicationInfoDict.h
-StringApplicationInfoDict.cpp
-IdentityObjectInfoDict.h
-IdentityObjectInfoDict.cpp
-StringAdapterInfoDict.h
-StringAdapterInfoDict.cpp
-SerialsDict.h
-SerialsDict.cpp
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp
index ac7f7c3d349..cdb5ed64c03 100644
--- a/cpp/src/IceGrid/Activator.cpp
+++ b/cpp/src/IceGrid/Activator.cpp
@@ -1168,7 +1168,7 @@ Activator::terminationListener()
             ex.error = getSystemErrno();
             throw ex;
         }
-		clearInterrupt();
+        clearInterrupt();
 
         //
         // Collect terminated processes
diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h
index 03884dfee99..d83c18acd83 100644
--- a/cpp/src/IceGrid/AdapterCache.h
+++ b/cpp/src/IceGrid/AdapterCache.h
@@ -13,7 +13,7 @@
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Shared.h>
 #include <IceGrid/Cache.h>
-#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
 #include <IceGrid/Internal.h>
 
 #include <set>
@@ -42,7 +42,7 @@ struct LocatorAdapterInfo
 };
 typedef std::vector<LocatorAdapterInfo> LocatorAdapterInfoSeq;
 
-class AdapterEntry : virtual public IceUtil::Shared
+class AdapterEntry : public virtual IceUtil::Shared
 {
 public:
     
diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp
index e4e1e709ff8..edfb98f03a7 100644
--- a/cpp/src/IceGrid/AdminI.cpp
+++ b/cpp/src/IceGrid/AdminI.cpp
@@ -415,7 +415,7 @@ AdminI::getServerAdmin(const string& id, const Current& current) const
 namespace
 {
 
-class StartCB : virtual public IceUtil::Shared
+class StartCB : public virtual IceUtil::Shared
 {
 public:
 
@@ -469,7 +469,7 @@ AdminI::startServer_async(const AMD_Admin_startServerPtr& amdCB, const string& i
 namespace
 {
 
-class StopCB : virtual public IceUtil::Shared
+class StopCB : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/IceGrid/AdminSessionI.h b/cpp/src/IceGrid/AdminSessionI.h
index 23224f7df90..5669503e148 100644
--- a/cpp/src/IceGrid/AdminSessionI.h
+++ b/cpp/src/IceGrid/AdminSessionI.h
@@ -35,7 +35,7 @@ public:
 
     virtual void keepAlive(const Ice::Current& current) { BaseSessionI::keepAlive(current); }
 
-    virtual AdminPrx getAdmin(const Ice::Current& = Ice::Current()) const;
+    virtual AdminPrx getAdmin(const Ice::Current& = Ice::noExplicitCurrent) const;
     virtual Ice::ObjectPrx getAdminCallbackTemplate(const Ice::Current&) const;
 
     virtual void setObservers(const RegistryObserverPrx&, const NodeObserverPrx&, const ApplicationObserverPrx&,
@@ -81,7 +81,7 @@ private:
 };
 typedef IceUtil::Handle<AdminSessionI> AdminSessionIPtr;
 
-class AdminSessionFactory : virtual public IceUtil::Shared
+class AdminSessionFactory : public virtual IceUtil::Shared
 {
 public:
 
@@ -103,7 +103,7 @@ private:
 };
 typedef IceUtil::Handle<AdminSessionFactory> AdminSessionFactoryPtr;
 
-class AdminSessionManagerI : virtual public Glacier2::SessionManager
+class AdminSessionManagerI : public virtual Glacier2::SessionManager
 {
 public:
 
@@ -116,7 +116,7 @@ private:
     const AdminSessionFactoryPtr _factory;
 };
 
-class AdminSSLSessionManagerI : virtual public Glacier2::SSLSessionManager
+class AdminSSLSessionManagerI : public virtual Glacier2::SSLSessionManager
 {
 public:
 
diff --git a/cpp/src/IceGrid/Allocatable.h b/cpp/src/IceGrid/Allocatable.h
index bd5384311c9..0f10b94f4ae 100644
--- a/cpp/src/IceGrid/Allocatable.h
+++ b/cpp/src/IceGrid/Allocatable.h
@@ -70,7 +70,7 @@ private:
 };
 typedef IceUtil::Handle<AllocationRequest> AllocationRequestPtr;
 
-class Allocatable : virtual public IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
+class Allocatable : public virtual IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
diff --git a/cpp/src/IceGrid/Cache.h b/cpp/src/IceGrid/Cache.h
index 295e283df21..cf822604c4a 100644
--- a/cpp/src/IceGrid/Cache.h
+++ b/cpp/src/IceGrid/Cache.h
@@ -18,7 +18,7 @@
 namespace IceGrid
 {
 
-class SynchronizationCallback : virtual public IceUtil::Shared
+class SynchronizationCallback : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index 73842bb9da2..2087bb3359e 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -20,7 +20,6 @@
 #include <IceGrid/Parser.h>
 #include <IceGrid/FileParserI.h>
 #include <IceGrid/Registry.h>
-#include <IceGrid/Locator.h>
 #include <IceGrid/IceLocatorDiscovery.h>
 #include <Glacier2/Router.h>
 #include <fstream>
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp
index f1534ef548f..b51c056048b 100644
--- a/cpp/src/IceGrid/Database.cpp
+++ b/cpp/src/IceGrid/Database.cpp
@@ -22,7 +22,6 @@
 #include <IceGrid/Session.h>
 #include <IceGrid/Topics.h>
 #include <IceGrid/IceGrid.h>
-#include <IceGrid/SerialsDict.h>
 
 #include <algorithm>
 #include <functional>
@@ -30,15 +29,23 @@
 
 using namespace std;
 using namespace IceGrid;
-using namespace Freeze;
+
+typedef IceDB::ReadWriteCursor<string, ApplicationInfo, IceDB::IceContext, Ice::OutputStream> ApplicationMapRWCursor;
+typedef IceDB::ReadOnlyCursor<string, AdapterInfo, IceDB::IceContext, Ice::OutputStream> AdapterMapROCursor;
+typedef IceDB::Cursor<string, string, IceDB::IceContext, Ice::OutputStream> AdaptersByGroupMapCursor;
+typedef IceDB::ReadOnlyCursor<string, Ice::Identity, IceDB::IceContext, Ice::OutputStream> ObjectsByTypeMapROCursor;
+typedef IceDB::ReadOnlyCursor<Ice::Identity, ObjectInfo, IceDB::IceContext, Ice::OutputStream> ObjectsMapROCursor;
 
 namespace
 {
 
 const string applicationsDbName = "applications";
 const string adaptersDbName = "adapters";
+const string adaptersByReplicaGroupIdDbName = "adaptersByReplicaGroupId";
 const string objectsDbName = "objects";
+const string objectsByTypeDbName = "objectsByType";
 const string internalObjectsDbName = "internal-objects";
+const string internalObjectsByTypeDbName = "internal-objectsByType";
 const string serialsDbName = "serials";
 
 struct ObjectLoadCI : binary_function<pair<Ice::ObjectPrx, float>&, pair<Ice::ObjectPrx, float>&, bool>
@@ -49,42 +56,41 @@ struct ObjectLoadCI : binary_function<pair<Ice::ObjectPrx, float>&, pair<Ice::Ob
     }
 };
 
-template<typename K, typename V, typename C, typename Comp> vector<V>
-toVector(const Map<K, V, C, Comp>& m)
+template<typename K, typename V, typename C, typename H> vector<V>
+toVector(const IceDB::ReadOnlyTxn& txn, const IceDB::Dbi<K, V, C, H>& m)
 {
     vector<V> v;
-    for(typename Map<K, V, C, Comp>::const_iterator p = m.begin(); p != m.end(); ++p)
+    IceDB::ReadOnlyCursor<K, V, C, H> cursor(m, txn);
+    K key;
+    V value;
+    while(cursor.get(key, value, MDB_NEXT))
     {
-        v.push_back(p->second);
+        v.push_back(value);
     }
     return v;
 }
 
-template<typename K, typename V, typename C, typename Comp> map<K, V>
-toMap(const Map<K, V, C, Comp>& d)
+template<typename K, typename V, typename C, typename H> map<K, V>
+toMap(const IceDB::Txn& txn, const IceDB::Dbi<K, V, C, H>& d)
 {
     std::map<K, V> m;
-    for(typename Map<K, V, C, Comp>::const_iterator p = d.begin(); p != d.end(); ++p)
+    IceDB::Cursor<K, V, C, H> cursor(d, txn);
+    K key;
+    V value;
+    while(cursor.get(key, value, MDB_NEXT))
     {
-#ifdef __SUNPRO_CC
-        std::map<Key, Value>::value_type v(p->first, p->second);
+        typename std::map<K, V>::value_type v(key, value);
         m.insert(v);
-#else
-        m.insert(*p);
-#endif
     }
+    cursor.close();
     return m;
 }
 
 void
-halt(const Ice::CommunicatorPtr& com, const DatabaseException& ex)
+logError(const Ice::CommunicatorPtr& com, const IceDB::LMDBException& ex)
 {
-    {
-        Ice::Error error(com->getLogger());
-        error << "fatal exception: " << ex << "\n*** Aborting application ***";
-    }
-
-    abort();
+    Ice::Error error(com->getLogger());
+    error << "LMDB error: " << ex;
 }
 
 void
@@ -134,69 +140,52 @@ filterAdapterInfos(const string& filter,
     infos.swap(filteredAdpts);
 }
 
-Ice::Long
-getSerial(const Freeze::ConnectionPtr& connection, const string& dbName)
-{
-    SerialsDict dict(connection, serialsDbName);
-
-    //
-    // If a serial number is provided, juste update the serial number from the database,
-    // otherwise if the serial is 0, we increment the serial from the database.
-    //
-    SerialsDict::iterator p = dict.find(dbName);
-    if(p == dict.end())
-    {
-        dict.insert(SerialsDict::value_type(dbName, 1));
-        return 1;
-    }
-    return p->second;
-}
-
-Ice::Long
-updateSerial(const Freeze::ConnectionPtr& connection, const string& dbName, Ice::Long serial = 0)
-{
-    if(serial == -1) // Master doesn't support serials.
-    {
-        return -1;
-    }
-
-    SerialsDict dict(connection, serialsDbName);
-
-    //
-    // If a serial number is provided, juste update the serial number from the database,
-    // otherwise if the serial is 0, we increment the serial from the database.
-    //
-    SerialsDict::iterator p = dict.find(dbName);
-    if(p == dict.end())
-    {
-        dict.insert(SerialsDict::value_type(dbName, serial == 0 ? 1 : serial));
-        return 1;
-    }
-    else
-    {
-        p.set(serial == 0 ? p->second + 1 : serial);
-        return p->second;
-    }
-}
-
 vector<AdapterInfo>
-findByReplicaGroupId(const StringAdapterInfoDict& dict, const string& name)
+findByReplicaGroupId(const IceDB::Txn& txn,
+                     const StringAdapterInfoMap& adapters,
+                     const StringStringMap& adaptersByGroupId,
+                     const string& name)
 {
     vector<AdapterInfo> result;
-    for(StringAdapterInfoDict::const_iterator p = dict.findByReplicaGroupId(name, true); p != dict.end(); ++p)
+    AdaptersByGroupMapCursor cursor(adaptersByGroupId, txn);
+    string id;
+    if(cursor.find(name, id))
     {
-        result.push_back(p->second);
+        AdapterInfo info;
+        adapters.get(txn, id, info);
+        result.push_back(info);
+
+        string n;
+        while(cursor.get(n, id, MDB_NEXT) && n == name)
+        {
+            adapters.get(txn, id, info);
+            result.push_back(info);
+        }
     }
     return result;
 }
 
 vector<ObjectInfo>
-findByType(const IdentityObjectInfoDict& dict, const string& type)
+findByType(const IceDB::ReadOnlyTxn& txn,
+           const IdentityObjectInfoMap& objects,
+           const StringIdentityMap& objectsByType,
+           const string& type)
 {
     vector<ObjectInfo> result;
-    for(IdentityObjectInfoDict::const_iterator p = dict.findByType(type); p != dict.end(); ++p)
+    ObjectsByTypeMapROCursor cursor(objectsByType, txn);
+    Ice::Identity id;
+    if(cursor.find(type, id))
     {
-        result.push_back(p->second);
+        ObjectInfo info;
+        objects.get(txn, id, info);
+        result.push_back(info);
+
+        string t;
+        while(cursor.get(t, id, MDB_NEXT) && t == type)
+        {
+            objects.get(txn, id, info);
+            result.push_back(info);
+        }
     }
     return result;
 }
@@ -208,8 +197,6 @@ Database::Database(const Ice::ObjectAdapterPtr& registryAdapter,
                    const string& instanceName,
                    const TraceLevelsPtr& traceLevels,
                    const RegistryInfo& info,
-                   const Freeze::ConnectionPtr& connection,
-                   const string& envName,
                    bool readonly) :
     _communicator(registryAdapter->getCommunicator()),
     _internalAdapter(registryAdapter),
@@ -224,27 +211,47 @@ Database::Database(const Ice::ObjectAdapterPtr& registryAdapter,
     _objectCache(_communicator),
     _allocatableObjectCache(_communicator),
     _serverCache(_communicator, _instanceName, _nodeCache, _adapterCache, _objectCache, _allocatableObjectCache),
-    _connection(connection),
-    _envName(envName),
-    _applications(_connection, applicationsDbName),
-    _adapters(_connection, adaptersDbName),
-    _objects(_connection, objectsDbName),
-    _internalObjects(_connection, internalObjectsDbName),
+    _dbLock(_communicator->getProperties()->getProperty("IceGrid.Registry.LMDB.Path") + "/icedb.lock"),
+    _env(_communicator->getProperties()->getProperty("IceGrid.Registry.LMDB.Path"), 8,
+         IceDB::getMapSize(_communicator->getProperties()->getPropertyAsInt("IceGrid.Registry.LMDB.MapSize"))),
     _pluginFacade(RegistryPluginFacadeIPtr::dynamicCast(getRegistryPluginFacade())),
     _lock(0)
 {
+    IceDB::ReadWriteTxn txn(_env);
+
+    IceDB::IceContext context;
+    context.communicator = _communicator;
+    context.encoding.major = 1;
+    context.encoding.minor = 1;
+
+    _applications = StringApplicationInfoMap(txn, applicationsDbName, context, MDB_CREATE);
+
+    _adapters = StringAdapterInfoMap(txn, adaptersDbName, context, MDB_CREATE);
+    _adaptersByGroupId = StringStringMap(txn, adaptersByReplicaGroupIdDbName, context, MDB_CREATE|MDB_DUPSORT);
+
+    _objects = IdentityObjectInfoMap(txn, objectsDbName, context, MDB_CREATE);
+    _objectsByType = StringIdentityMap(txn, objectsByTypeDbName, context, MDB_CREATE|MDB_DUPSORT);
+
+    _internalObjects = IdentityObjectInfoMap(txn, internalObjectsDbName, context, MDB_CREATE);
+    _internalObjectsByType = StringIdentityMap(txn, internalObjectsByTypeDbName, context, MDB_CREATE|MDB_DUPSORT);
+
+    _serials = StringLongMap(txn, serialsDbName, context, MDB_CREATE);
+
     ServerEntrySeq entries;
 
-    for(StringApplicationInfoDict::iterator p = _applications.begin(); p != _applications.end(); ++p)
+    string k;
+    ApplicationInfo v;
+    ApplicationMapRWCursor cursor(_applications, txn);
+    while(cursor.get(k, v, MDB_NEXT))
     {
         try
         {
-            load(ApplicationHelper(_communicator, p->second.descriptor), entries, p->second.uuid, p->second.revision);
+            load(ApplicationHelper(_communicator, v.descriptor), entries, v.uuid, v.revision);
         }
         catch(const DeploymentException& ex)
         {
             Ice::Error err(_traceLevels->logger);
-            err << "invalid application `" << p->first << "':\n" << ex.reason;
+            err << "invalid application `" << k << "':\n" << ex.reason;
         }
     }
 
@@ -257,9 +264,30 @@ Database::Database(const Ice::ObjectAdapterPtr& registryAdapter,
 
     _nodeObserverTopic = new NodeObserverTopic(_topicManager, _internalAdapter);
     _registryObserverTopic = new RegistryObserverTopic(_topicManager);
-    _applicationObserverTopic = new ApplicationObserverTopic(_topicManager, toMap(_applications), getSerial(_connection, applicationsDbName));
-    _adapterObserverTopic = new AdapterObserverTopic(_topicManager, toMap(_adapters), getSerial(_connection, adaptersDbName));
-    _objectObserverTopic = new ObjectObserverTopic(_topicManager, toMap(_objects), getSerial(_connection, objectsDbName));
+
+    // Set all serials to 1 if they have not yet been set.
+    Ice::Long serial;
+    if(!_serials.get(txn, applicationsDbName, serial))
+    {
+        _serials.put(txn, applicationsDbName, 1);
+    }
+    if(!_serials.get(txn, adaptersDbName, serial))
+    {
+        _serials.put(txn, adaptersDbName, 1);
+    }
+    if(!_serials.get(txn, objectsDbName, serial))
+    {
+        _serials.put(txn, objectsDbName, 1);
+    }
+
+    _applicationObserverTopic =
+        new ApplicationObserverTopic(_topicManager, toMap(txn, _applications), getSerial(txn, applicationsDbName));
+    _adapterObserverTopic =
+        new AdapterObserverTopic(_topicManager, toMap(txn, _adapters), getSerial(txn, adaptersDbName));
+    _objectObserverTopic =
+        new ObjectObserverTopic(_topicManager, toMap(txn, _objects), getSerial(txn, objectsDbName));
+
+    txn.commit();
 
     _registryObserverTopic->registryUp(info);
 
@@ -353,29 +381,24 @@ Database::syncApplications(const ApplicationInfoSeq& newApplications, Ice::Long
         Lock sync(*this);
 
         map<string, ApplicationInfo> oldApplications;
-        for(;;)
+        try
         {
-            try
-            {
-                TransactionHolder txHolder(_connection);
-                oldApplications = toMap(_applications);
-                _applications.clear();
-                for(ApplicationInfoSeq::const_iterator p = newApplications.begin(); p != newApplications.end(); ++p)
-                {
-                    _applications.put(StringApplicationInfoDict::value_type(p->descriptor.name, *p));
-                }
-                dbSerial = updateSerial(_connection, applicationsDbName, dbSerial);
-                txHolder.commit();
-                break;
-            }
-            catch(const DeadlockException&)
-            {
-                continue;
-            }
-            catch(const DatabaseException& ex)
+            IceDB::ReadWriteTxn txn(_env);
+
+            oldApplications = toMap(txn, _applications);
+            _applications.clear(txn);
+            for(ApplicationInfoSeq::const_iterator p = newApplications.begin(); p != newApplications.end(); ++p)
             {
-                halt(_communicator, ex);
+                _applications.put(txn, p->descriptor.name, *p);
             }
+            dbSerial = updateSerial(txn, applicationsDbName, dbSerial);
+
+            txn.commit();
+        }
+        catch(const IceDB::LMDBException& ex)
+        {
+            logError(_communicator, ex);
+            throw;
         }
 
         ServerEntrySeq entries;
@@ -433,28 +456,28 @@ Database::syncAdapters(const AdapterInfoSeq& adapters, Ice::Long dbSerial)
     int serial = 0;
     {
         Lock sync(*this);
-        for(;;)
+        try
         {
-            try
-            {
-                TransactionHolder txHolder(_connection);
-                _adapters.clear();
-                for(AdapterInfoSeq::const_iterator r = adapters.begin(); r != adapters.end(); ++r)
-                {
-                    _adapters.put(StringAdapterInfoDict::value_type(r->id, *r));
-                }
-                dbSerial = updateSerial(_connection, adaptersDbName, dbSerial);
-                txHolder.commit();
-                break;
-            }
-            catch(const DeadlockException&)
-            {
-                continue;
-            }
-            catch(const DatabaseException& ex)
+            IceDB::ReadWriteTxn txn(_env);
+
+            _adapters.clear(txn);
+            _adaptersByGroupId.clear(txn);
+            for(AdapterInfoSeq::const_iterator r = adapters.begin(); r != adapters.end(); ++r)
             {
-                halt(_communicator, ex);
+                addAdapter(txn, *r);
             }
+            dbSerial = updateSerial(txn, adaptersDbName, dbSerial);
+
+            txn.commit();
+        }
+        catch(const IceDB::KeyTooLongException&)
+        {
+            throw;
+        }
+        catch(const IceDB::LMDBException& ex)
+        {
+            logError(_communicator, ex);
+            throw;
         }
 
         if(_traceLevels->adapter > 0)
@@ -475,28 +498,24 @@ Database::syncObjects(const ObjectInfoSeq& objects, Ice::Long dbSerial)
     int serial = 0;
     {
         Lock sync(*this);
-        for(;;)
+        try
         {
-            try
-            {
-                TransactionHolder txHolder(_connection);
-                _objects.clear();
-                for(ObjectInfoSeq::const_iterator q = objects.begin(); q != objects.end(); ++q)
-                {
-                    _objects.put(IdentityObjectInfoDict::value_type(q->proxy->ice_getIdentity(), *q));
-                }
-                dbSerial = updateSerial(_connection, objectsDbName, dbSerial);
-                txHolder.commit();
-                break;
-            }
-            catch(const DeadlockException&)
-            {
-                continue;
-            }
-            catch(const DatabaseException& ex)
+            IceDB::ReadWriteTxn txn(_env);
+
+            _objects.clear(txn);
+            _objectsByType.clear(txn);
+            for(ObjectInfoSeq::const_iterator q = objects.begin(); q != objects.end(); ++q)
             {
-                halt(_communicator, ex);
+                addObject(txn, *q, false);
             }
+            dbSerial = updateSerial(txn, objectsDbName, dbSerial);
+
+            txn.commit();
+        }
+        catch(const IceDB::LMDBException& ex)
+        {
+            logError(_communicator, ex);
+            throw;
         }
 
         if(_traceLevels->object > 0)
@@ -511,82 +530,67 @@ Database::syncObjects(const ObjectInfoSeq& objects, Ice::Long dbSerial)
 }
 
 ApplicationInfoSeq
-Database::getApplications(Ice::Long& serial) const
+Database::getApplications(Ice::Long& serial)
 {
-    for(;;)
+    try
     {
-        try
-        {
-            ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
-            TransactionHolder txHolder(connection);
-            StringApplicationInfoDict applications(connection, applicationsDbName);
-            serial = getSerial(connection, applicationsDbName);
-            return toVector(applications);
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_communicator, ex);
-        }
+        IceDB::ReadOnlyTxn txn(_env);
+
+        serial = getSerial(txn, applicationsDbName);
+        return toVector(txn, _applications);
     }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_communicator, ex);
+        throw;
+    }
+    assert(false);
+    return ApplicationInfoSeq();
 }
 
 AdapterInfoSeq
-Database::getAdapters(Ice::Long& serial) const
+Database::getAdapters(Ice::Long& serial)
 {
-    for(;;)
+    try
     {
-        try
-        {
-            ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
-            TransactionHolder txHolder(connection);
-            StringAdapterInfoDict adapters(connection, adaptersDbName);
-            serial = getSerial(connection, adaptersDbName);
-            return toVector(adapters);
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_communicator, ex);
-        }
+        IceDB::ReadOnlyTxn txn(_env);
+
+        serial = getSerial(txn, adaptersDbName);
+        return toVector(txn, _adapters);
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_communicator, ex);
+        throw;
     }
+    assert(false);
+    return AdapterInfoSeq();
 }
 
 ObjectInfoSeq
-Database::getObjects(Ice::Long& serial) const
+Database::getObjects(Ice::Long& serial)
 {
-    for(;;)
+    try
     {
-        try
-        {
-            ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
-            TransactionHolder txHolder(connection);
-            IdentityObjectInfoDict objects(connection, objectsDbName);
-            serial = getSerial(connection, objectsDbName);
-            return toVector(objects);
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_communicator, ex);
-        }
+        IceDB::ReadOnlyTxn txn(_env);
+
+        serial = getSerial(txn, objectsDbName);
+        return toVector(txn, _objects);
     }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_communicator, ex);
+        throw;
+    }
+    assert(false);
+    return ObjectInfoSeq();
 }
 
 StringLongDict
 Database::getSerials() const
 {
-    SerialsDict serials(Freeze::createConnection(_communicator, _envName), serialsDbName);
-    return toMap(serials);
+    IceDB::ReadOnlyTxn txn(_env);
+    return toMap(txn, _serials);
 }
 
 void
@@ -603,24 +607,33 @@ Database::addApplication(const ApplicationInfo& info, AdminSessionI* session, Ic
 
         waitForUpdate(info.descriptor.name);
 
-        StringApplicationInfoDict::const_iterator i = _applications.find(info.descriptor.name);
-        if(i != _applications.end())
+        IceDB::ReadWriteTxn txn(_env);
+
+        if(_applications.find(txn, info.descriptor.name))
         {
             throw DeploymentException("application `" + info.descriptor.name + "' already exists");
         }
 
         ApplicationHelper helper(_communicator, info.descriptor, true);
-        checkForAddition(helper, _connection);
-        dbSerial = saveApplication(info, _connection, dbSerial);
+        checkForAddition(helper, txn);
+        dbSerial = saveApplication(info, txn, dbSerial);
+
+        txn.commit();
+
         load(helper, entries, info.uuid, info.revision);
         startUpdating(info.descriptor.name, info.uuid, info.revision);
 
         for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::sync));
         serial = _applicationObserverTopic->applicationAdded(dbSerial, info);
     }
-    catch(const DatabaseException& ex)
+    catch(const IceDB::KeyTooLongException& ex)
+    {
+        throw DeploymentException("application name `" + info.descriptor.name + "' is too long: " + ex.what());
+    }
+    catch(const IceDB::LMDBException& ex)
     {
-        halt(_communicator, ex);
+        logError(_communicator, ex);
+        throw;
     }
 
     _applicationObserverTopic->waitForSyncedSubscribers(serial); // Wait for replicas to be updated.
@@ -659,7 +672,10 @@ Database::addApplication(const ApplicationInfo& info, AdminSessionI* session, Ic
                 Lock sync(*this);
                 entries.clear();
                 unload(ApplicationHelper(_communicator, info.descriptor), entries);
-                dbSerial = removeApplication(info.descriptor.name, _connection);
+
+                IceDB::ReadWriteTxn txn(_env);
+                dbSerial = removeApplication(info.descriptor.name, txn);
+                txn.commit();
 
                 for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::sync));
                 serial = _applicationObserverTopic->applicationRemoved(dbSerial, info.descriptor.name);
@@ -669,10 +685,11 @@ Database::addApplication(const ApplicationInfo& info, AdminSessionI* session, Ic
                 Ice::Error err(_traceLevels->logger);
                 err << "failed to rollback previous application `" << info.descriptor.name << "':\n" << ex.reason;
             }
-            catch(const DatabaseException& ex)
+            catch(const IceDB::LMDBException& ex)
             {
-                halt(_communicator, ex);
+                logError(_communicator, ex);
             }
+
             _applicationObserverTopic->waitForSyncedSubscribers(serial);
             for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::waitForSyncNoThrow));
             finishUpdating(info.descriptor.name);
@@ -705,12 +722,12 @@ Database::updateApplication(const ApplicationUpdateInfo& updt, bool noRestart, A
 
         waitForUpdate(update.descriptor.name);
 
-        StringApplicationInfoDict::const_iterator i = _applications.find(update.descriptor.name);
-        if(i == _applications.end())
+        IceDB::ReadOnlyTxn txn(_env);
+
+        if(!_applications.get(txn, update.descriptor.name, oldApp))
         {
             throw ApplicationNotExistException(update.descriptor.name);
         }
-        oldApp = i->second;
 
         if(update.revision < 0)
         {
@@ -722,9 +739,10 @@ Database::updateApplication(const ApplicationUpdateInfo& updt, bool noRestart, A
 
         startUpdating(update.descriptor.name, oldApp.uuid, oldApp.revision + 1);
     }
-    catch(const DatabaseException& ex)
+    catch(const IceDB::LMDBException& ex)
     {
-        halt(_communicator, ex);
+        logError(_communicator, ex);
+        throw;
     }
 
     finishApplicationUpdate(update, oldApp, *previous, *helper, session, noRestart, dbSerial);
@@ -746,12 +764,12 @@ Database::syncApplicationDescriptor(const ApplicationDescriptor& newDesc, bool n
 
         waitForUpdate(newDesc.name);
 
-        StringApplicationInfoDict::const_iterator i = _applications.find(newDesc.name);
-        if(i == _applications.end())
+        IceDB::ReadOnlyTxn txn(_env);
+
+        if(!_applications.get(txn, newDesc.name, oldApp))
         {
             throw ApplicationNotExistException(newDesc.name);
         }
-        oldApp = i->second;
 
         previous.reset(new ApplicationHelper(_communicator, oldApp.descriptor));
         helper.reset(new ApplicationHelper(_communicator, newDesc, true));
@@ -763,9 +781,10 @@ Database::syncApplicationDescriptor(const ApplicationDescriptor& newDesc, bool n
 
         startUpdating(update.descriptor.name, oldApp.uuid, oldApp.revision + 1);
     }
-    catch(const DatabaseException& ex)
+    catch(const IceDB::LMDBException& ex)
     {
-        halt(_communicator, ex);
+        logError(_communicator, ex);
+        throw;
     }
 
     finishApplicationUpdate(update, oldApp, *previous, *helper, session, noRestart);
@@ -791,13 +810,12 @@ Database::instantiateServer(const string& application,
 
         waitForUpdate(application);
 
-        StringApplicationInfoDict::const_iterator i = _applications.find(application);
-        if(i == _applications.end())
+        IceDB::ReadOnlyTxn txn(_env);
+
+        if(!_applications.get(txn, application, oldApp))
         {
             throw ApplicationNotExistException(application);
-
         }
-        oldApp = i->second;
 
         previous.reset(new ApplicationHelper(_communicator, oldApp.descriptor));
         helper.reset(new ApplicationHelper(_communicator, previous->instantiateServer(node, instance), true));
@@ -809,9 +827,10 @@ Database::instantiateServer(const string& application,
 
         startUpdating(update.descriptor.name, oldApp.uuid, oldApp.revision + 1);
     }
-    catch(const DatabaseException& ex)
+    catch(const IceDB::LMDBException& ex)
     {
-        halt(_communicator, ex);
+        logError(_communicator, ex);
+        throw;
     }
 
     finishApplicationUpdate(update, oldApp, *previous, *helper, session, true);
@@ -833,12 +852,12 @@ Database::removeApplication(const string& name, AdminSessionI* session, Ice::Lon
 
         ApplicationInfo appInfo;
 
-        StringApplicationInfoDict::const_iterator i = _applications.find(name);
-        if(i == _applications.end())
+        IceDB::ReadWriteTxn txn(_env);
+
+        if(!_applications.get(txn, name, appInfo))
         {
             throw ApplicationNotExistException(name);
         }
-        appInfo = i->second;
 
         bool init = false;
         try
@@ -855,17 +874,21 @@ Database::removeApplication(const string& name, AdminSessionI* session, Ice::Lon
                 throw;
             }
         }
+        dbSerial = removeApplication(name, txn, dbSerial);
+
+        txn.commit();
 
-        dbSerial = removeApplication(name, _connection, dbSerial);
         startUpdating(name, appInfo.uuid, appInfo.revision);
 
         for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::sync));
         serial = _applicationObserverTopic->applicationRemoved(dbSerial, name);
     }
-    catch(const DatabaseException& ex)
+    catch(const IceDB::LMDBException& ex)
     {
-        halt(_communicator, ex);
+        logError(_communicator, ex);
+        throw;
     }
+
     _applicationObserverTopic->waitForSyncedSubscribers(serial);
 
     if(_master)
@@ -885,22 +908,21 @@ Database::removeApplication(const string& name, AdminSessionI* session, Ice::Lon
 ApplicationInfo
 Database::getApplicationInfo(const std::string& name)
 {
-    ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
-    StringApplicationInfoDict applications(connection, applicationsDbName);
-    StringApplicationInfoDict::const_iterator i = applications.find(name);
-    if(i == applications.end())
+    IceDB::ReadOnlyTxn txn(_env);
+
+    ApplicationInfo info;
+    if(!_applications.get(txn, name, info))
     {
         throw ApplicationNotExistException(name);
     }
-    return i->second;
+    return info;
 }
 
 Ice::StringSeq
 Database::getAllApplications(const string& expression)
 {
-    ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
-    StringApplicationInfoDict applications(connection, applicationsDbName);
-    return getMatchingKeys<map<string, ApplicationInfo> >(toMap(applications), expression);
+    IceDB::ReadOnlyTxn txn(_env);
+    return getMatchingKeys<map<string, ApplicationInfo> >(toMap(txn, _applications), expression);
 }
 
 void
@@ -989,44 +1011,42 @@ Database::setAdapterDirectProxy(const string& adapterId, const string& replicaGr
         info.replicaGroupId = replicaGroupId;
 
         bool updated = false;
-        for(;;)
+        try
         {
-            try
+            IceDB::ReadWriteTxn txn(_env);
+
+            AdapterInfo oldInfo;
+            bool found = _adapters.get(txn, adapterId, oldInfo);
+            if(proxy)
             {
-                TransactionHolder txHolder(_connection);
-                StringAdapterInfoDict::iterator i = _adapters.find(adapterId);
-                if(proxy)
+                updated = found;
+
+                if(replicaGroupId != oldInfo.replicaGroupId)
                 {
-                    if(i == _adapters.end())
-                    {
-                        _adapters.put(StringAdapterInfoDict::value_type(adapterId, info));
-                    }
-                    else
-                    {
-                        updated = true;
-                        i.set(info);
-                    }
+                    _adaptersByGroupId.del(txn, oldInfo.replicaGroupId, adapterId);
                 }
-                else
-                {
-                    if(i == _adapters.end())
-                    {
-                        return;
-                    }
-                    _adapters.erase(i);
-                }
-                dbSerial = updateSerial(_connection, adaptersDbName, dbSerial);
-                txHolder.commit();
-                break;
+                addAdapter(txn, info);
             }
-            catch(const DeadlockException&)
-            {
-                continue;
-            }
-            catch(const DatabaseException& ex)
+            else
             {
-                halt(_communicator, ex);
+                if(!found)
+                {
+                    return;
+                }
+                deleteAdapter(txn, oldInfo);
             }
+            dbSerial = updateSerial(txn, adaptersDbName, dbSerial);
+
+            txn.commit();
+        }
+        catch(const IceDB::KeyTooLongException&)
+        {
+            throw;
+        }
+        catch(const IceDB::LMDBException& ex)
+        {
+            logError(_communicator, ex);
+            throw;
         }
 
         if(_traceLevels->adapter > 0)
@@ -1037,7 +1057,7 @@ Database::setAdapterDirectProxy(const string& adapterId, const string& replicaGr
             {
                 out << " with replica group `" << replicaGroupId << "'";
             }
-	    out << " (serial = `" << dbSerial << "')";
+            out << " (serial = `" << dbSerial << "')";
         }
 
         if(proxy)
@@ -1063,16 +1083,16 @@ Ice::ObjectPrx
 Database::getAdapterDirectProxy(const string& id, const Ice::EncodingVersion& encoding, const Ice::ConnectionPtr& con,
                                 const Ice::Context& ctx)
 {
-    ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
-    StringAdapterInfoDict adapters(connection, adaptersDbName);
-    StringAdapterInfoDict::const_iterator i = adapters.find(id);
-    if(i != adapters.end())
+    IceDB::ReadOnlyTxn txn(_env);
+
+    AdapterInfo info;
+    if(_adapters.get(txn, id, info))
     {
-        return i->second.proxy;
+        return info.proxy;
     }
 
     Ice::EndpointSeq endpoints;
-    vector<AdapterInfo> infos = findByReplicaGroupId(adapters, id);
+    vector<AdapterInfo> infos = findByReplicaGroupId(txn, _adapters, _adaptersByGroupId, id);
     filterAdapterInfos("", id, _pluginFacade, con, ctx, infos);
     for(unsigned int i = 0; i < infos.size(); ++i)
     {
@@ -1109,41 +1129,41 @@ Database::removeAdapter(const string& adapterId)
 
         AdapterInfoSeq infos;
         Ice::Long dbSerial = 0;
-        for(;;)
+        try
         {
-            try
+            IceDB::ReadWriteTxn txn(_env);
+
+            AdapterInfo info;
+            if(_adapters.get(txn, adapterId, info))
             {
-                TransactionHolder txHolder(_connection);
-                StringAdapterInfoDict::iterator i = _adapters.find(adapterId);
-                if(i != _adapters.end())
+                deleteAdapter(txn, info);
+            }
+            else
+            {
+                infos = findByReplicaGroupId(txn, _adapters, _adaptersByGroupId, adapterId);
+                if(infos.empty())
                 {
-                    _adapters.erase(i);
+                    throw AdapterNotExistException(adapterId);
                 }
-                else
+                for(AdapterInfoSeq::iterator p = infos.begin(); p != infos.end(); ++p)
                 {
-                    infos = findByReplicaGroupId(_adapters, adapterId);
-                    if(infos.empty())
-                    {
-                        throw AdapterNotExistException(adapterId);
-                    }
-                    for(AdapterInfoSeq::iterator p = infos.begin(); p != infos.end(); ++p)
-                    {
-                        p->replicaGroupId.clear();
-                        _adapters.put(StringAdapterInfoDict::value_type(p->id, *p));
-                    }
+                    _adaptersByGroupId.del(txn, p->replicaGroupId, p->id);
+                    p->replicaGroupId.clear();
+                    addAdapter(txn, *p);
                 }
-                dbSerial = updateSerial(_connection, adaptersDbName);
-                txHolder.commit();
-                break;
-            }
-            catch(const DeadlockException&)
-            {
-                continue;
-            }
-            catch(const DatabaseException& ex)
-            {
-                halt(_communicator, ex);
             }
+            dbSerial = updateSerial(txn, adaptersDbName);
+
+            txn.commit();
+        }
+        catch(const IceDB::KeyTooLongException&)
+        {
+            throw;
+        }
+        catch(const IceDB::LMDBException& ex)
+        {
+            logError(_communicator, ex);
+            throw;
         }
 
         if(_traceLevels->adapter > 0)
@@ -1254,13 +1274,13 @@ Database::getAdapterInfo(const string& id)
     // Otherwise, we check the adapter endpoint table -- if there's an
     // entry the adapter is managed by the registry itself.
     //
-    ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
-    StringAdapterInfoDict adapters(connection, adaptersDbName);
+    IceDB::ReadOnlyTxn txn(_env);
+
+    AdapterInfo info;
     AdapterInfoSeq infos;
-    StringAdapterInfoDict::const_iterator i = adapters.find(id);
-    if(i != adapters.end())
+    if(_adapters.get(txn, id, info))
     {
-        infos.push_back(i->second);
+        infos.push_back(info);
     }
     else
     {
@@ -1268,7 +1288,7 @@ Database::getAdapterInfo(const string& id)
         // If it's not a regular object adapter, perhaps it's a replica
         // group...
         //
-        infos = findByReplicaGroupId(adapters, id);
+        infos = findByReplicaGroupId(txn, _adapters, _adaptersByGroupId, id);
         if(infos.empty())
         {
             throw AdapterNotExistException(id);
@@ -1310,13 +1330,13 @@ Database::getFilteredAdapterInfo(const string& id, const Ice::ConnectionPtr& con
     // Otherwise, we check the adapter endpoint table -- if there's an
     // entry the adapter is managed by the registry itself.
     //
-    ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
-    StringAdapterInfoDict adapters(connection, adaptersDbName);
+    IceDB::ReadOnlyTxn txn(_env);
+
+    AdapterInfo info;
     AdapterInfoSeq infos;
-    StringAdapterInfoDict::const_iterator i = adapters.find(id);
-    if(i != adapters.end())
+    if(_adapters.get(txn, id, info))
     {
-        infos.push_back(i->second);
+        infos.push_back(info);
     }
     else
     {
@@ -1324,7 +1344,7 @@ Database::getFilteredAdapterInfo(const string& id, const Ice::ConnectionPtr& con
         // If it's not a regular object adapter, perhaps it's a replica
         // group...
         //
-        infos = findByReplicaGroupId(adapters, id);
+        infos = findByReplicaGroupId(txn, _adapters, _adaptersByGroupId, id);
         if(infos.empty())
         {
             throw AdapterNotExistException(id);
@@ -1393,18 +1413,25 @@ Database::getAllAdapters(const string& expression)
     result.swap(ids);
     set<string> groups;
 
-    for(StringAdapterInfoDict::const_iterator p = _adapters.begin(); p != _adapters.end(); ++p)
+    IceDB::ReadOnlyTxn txn(_env);
+
+    string name;
+    AdapterInfo info;
+    AdapterMapROCursor cursor(_adapters, txn);
+    while(cursor.get(name, info, MDB_NEXT))
     {
-        if(expression.empty() || IceUtilInternal::match(p->first, expression, true))
+        if(expression.empty() || IceUtilInternal::match(name, expression, true))
         {
-            result.push_back(p->first);
+            result.push_back(name);
         }
-        string replicaGroupId = p->second.replicaGroupId;
+        string replicaGroupId = info.replicaGroupId;
         if(!replicaGroupId.empty() && (expression.empty() || IceUtilInternal::match(replicaGroupId, expression, true)))
         {
             groups.insert(replicaGroupId);
         }
     }
+    cursor.close();
+
     //
     // COMPILERFIX: We're not using result.insert() here, this doesn't compile on Sun.
     //
@@ -1432,29 +1459,23 @@ Database::addObject(const ObjectInfo& info)
         }
 
         Ice::Long dbSerial = 0;
-        for(;;)
+        try
         {
-            try
-            {
-                TransactionHolder txHolder(_connection);
-                IdentityObjectInfoDict::const_iterator i = _objects.find(id);
-                if(i != _objects.end())
-                {
-                    throw ObjectExistsException(id);
-                }
-                _objects.put(IdentityObjectInfoDict::value_type(id, info));
-                dbSerial = updateSerial(_connection, objectsDbName);
-                txHolder.commit();
-                break;
-            }
-            catch(const DeadlockException&)
-            {
-                continue;
-            }
-            catch(const DatabaseException& ex)
+            IceDB::ReadWriteTxn txn(_env);
+
+            if(_objects.find(txn, id))
             {
-                halt(_communicator, ex);
+                throw ObjectExistsException(id);
             }
+            addObject(txn, info, false);
+            dbSerial = updateSerial(txn, objectsDbName);
+
+            txn.commit();
+        }
+        catch(const IceDB::LMDBException& ex)
+        {
+            logError(_communicator, ex);
+            throw;
         }
 
         serial = _objectObserverTopic->objectAdded(dbSerial, info);
@@ -1484,33 +1505,26 @@ Database::addOrUpdateObject(const ObjectInfo& info, Ice::Long dbSerial)
         }
 
         bool update = false;
-        for(;;)
+        try
         {
-            try
-            {
-                TransactionHolder txHolder(_connection);
-                IdentityObjectInfoDict::iterator i = _objects.find(id);
-                if(i != _objects.end())
-                {
-                    update = true;
-                    i.set(info);
-                }
-                else
-                {
-                    _objects.put(IdentityObjectInfoDict::value_type(id, info));
-                }
-                dbSerial = updateSerial(_connection, objectsDbName, dbSerial);
-                txHolder.commit();
-                break;
-            }
-            catch(const DeadlockException&)
-            {
-                continue;
-            }
-            catch(const DatabaseException& ex)
+            IceDB::ReadWriteTxn txn(_env);
+
+            Ice::Identity k;
+            ObjectInfo v;
+            update = _objects.get(txn, k, v);
+            if(update)
             {
-                halt(_communicator, ex);
+                _objectsByType.del(txn, v.type, v.proxy->ice_getIdentity());
             }
+            addObject(txn, info, false);
+            dbSerial = updateSerial(txn, objectsDbName, dbSerial);
+
+            txn.commit();
+        }
+        catch(const IceDB::LMDBException& ex)
+        {
+            logError(_communicator, ex);
+            throw;
         }
 
         if(update)
@@ -1549,32 +1563,26 @@ Database::removeObject(const Ice::Identity& id, Ice::Long dbSerial)
             throw ex;
         }
 
-        for(;;)
+        try
         {
-            try
-            {
-                TransactionHolder txHolder(_connection);
-                IdentityObjectInfoDict::iterator i = _objects.find(id);
-                if(i == _objects.end())
-                {
-                    ObjectNotRegisteredException ex;
-                    ex.id = id;
-                    throw ex;
-                }
+            IceDB::ReadWriteTxn txn(_env);
 
-                _objects.erase(i);
-                dbSerial = updateSerial(_connection, objectsDbName, dbSerial);
-                txHolder.commit();
-                break;
-            }
-            catch(const DeadlockException&)
+            ObjectInfo info;
+            if(!_objects.get(txn, id, info))
             {
-                continue;
-            }
-            catch(const DatabaseException& ex)
-            {
-                halt(_communicator, ex);
+                ObjectNotRegisteredException ex;
+                ex.id = id;
+                throw ex;
             }
+            deleteObject(txn, info, false);
+            dbSerial = updateSerial(txn, objectsDbName, dbSerial);
+
+            txn.commit();
+        }
+        catch(const IceDB::LMDBException& ex)
+        {
+            logError(_communicator, ex);
+            throw;
         }
 
         serial = _objectObserverTopic->objectRemoved(dbSerial, id);
@@ -1610,33 +1618,26 @@ Database::updateObject(const Ice::ObjectPrx& proxy)
 
         ObjectInfo info;
         Ice::Long dbSerial = 0;
-        for(;;)
+        try
         {
-            try
-            {
-                TransactionHolder txHolder(_connection);
-                IdentityObjectInfoDict::iterator i = _objects.find(id);
-                if(i == _objects.end())
-                {
-                    ObjectNotRegisteredException ex;
-                    ex.id = id;
-                    throw ex;
-                }
-                info = i->second;
-                info.proxy = proxy;
-                i.set(info);
-                dbSerial = updateSerial(_connection, objectsDbName);
-                txHolder.commit();
-                break;
-            }
-            catch(const DeadlockException&)
-            {
-                continue;
-            }
-            catch(const DatabaseException& ex)
+            IceDB::ReadWriteTxn txn(_env);
+
+            if(!_objects.get(txn, id, info))
             {
-                halt(_communicator, ex);
+                ObjectNotRegisteredException ex;
+                ex.id = id;
+                throw ex;
             }
+            info.proxy = proxy;
+            addObject(txn, info, false);
+            dbSerial = updateSerial(txn, objectsDbName);
+
+            txn.commit();
+        }
+        catch(const IceDB::LMDBException& ex)
+        {
+            logError(_communicator, ex);
+            throw;
         }
 
         serial = _objectObserverTopic->objectUpdated(dbSerial, info);
@@ -1653,27 +1654,27 @@ int
 Database::addOrUpdateRegistryWellKnownObjects(const ObjectInfoSeq& objects)
 {
     Lock sync(*this);
-    for(;;)
+    try
     {
-        try
+        IceDB::ReadWriteTxn txn(_env);
+        for(ObjectInfoSeq::const_iterator p = objects.begin(); p != objects.end(); ++p)
         {
-            TransactionHolder txHolder(_connection);
-            for(ObjectInfoSeq::const_iterator p = objects.begin(); p != objects.end(); ++p)
+            Ice::Identity id = p->proxy->ice_getIdentity();
+            ObjectInfo info;
+            if(_objects.get(txn, id, info))
             {
-                _objects.put(IdentityObjectInfoDict::value_type(p->proxy->ice_getIdentity(), *p));
+                _objectsByType.del(txn, info.type, id);
             }
-            txHolder.commit();
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_communicator, ex);
+            addObject(txn, *p, false);
         }
+        txn.commit();
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_communicator, ex);
+        throw;
     }
+
     return _objectObserverTopic->wellKnownObjectsAddedOrUpdated(objects);
 }
 
@@ -1681,27 +1682,26 @@ int
 Database::removeRegistryWellKnownObjects(const ObjectInfoSeq& objects)
 {
     Lock sync(*this);
-    for(;;)
+    try
     {
-        try
+        IceDB::ReadWriteTxn txn(_env);
+        for(ObjectInfoSeq::const_iterator p = objects.begin(); p != objects.end(); ++p)
         {
-            TransactionHolder txHolder(_connection);
-            for(ObjectInfoSeq::const_iterator p = objects.begin(); p != objects.end(); ++p)
+            Ice::Identity id = p->proxy->ice_getIdentity();
+            ObjectInfo info;
+            if(_objects.get(txn, id, info))
             {
-                _objects.erase(p->proxy->ice_getIdentity());
+                deleteObject(txn, info, false);
             }
-            txHolder.commit();
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_communicator, ex);
         }
+        txn.commit();
     }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_communicator, ex);
+        throw;
+    }
+
     return _objectObserverTopic->wellKnownObjectsRemoved(objects);
 }
 
@@ -1719,16 +1719,15 @@ Database::getObjectProxy(const Ice::Identity& id)
     {
     }
 
-    ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
-    IdentityObjectInfoDict objects(connection, objectsDbName);
-    IdentityObjectInfoDict::const_iterator i = objects.find(id);
-    if(i == objects.end())
+    IceDB::ReadOnlyTxn txn(_env);
+    ObjectInfo info;
+    if(!_objects.get(txn, id, info))
     {
         ObjectNotRegisteredException ex;
         ex.id = id;
         throw ex;
     }
-    return i->second.proxy;
+    return info.proxy;
 }
 
 Ice::ObjectPrx
@@ -1780,9 +1779,8 @@ Database::getObjectsByType(const string& type, const Ice::ConnectionPtr& con, co
 {
     Ice::ObjectProxySeq proxies = _objectCache.getObjectsByType(type);
 
-    ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
-    IdentityObjectInfoDict objects(connection, objectsDbName);
-    vector<ObjectInfo> infos = findByType(objects, type);
+    IceDB::ReadOnlyTxn txn(_env);
+    vector<ObjectInfo> infos = findByType(txn, _objects, _objectsByType, type);
     for(unsigned int i = 0; i < infos.size(); ++i)
     {
         proxies.push_back(infos[i].proxy);
@@ -1814,14 +1812,13 @@ Database::getObjectInfo(const Ice::Identity& id)
     {
     }
 
-    ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
-    IdentityObjectInfoDict objects(connection, objectsDbName);
-    IdentityObjectInfoDict::const_iterator i = objects.find(id);
-    if(i == objects.end())
+    IceDB::ReadOnlyTxn txn(_env);
+    ObjectInfo info;
+    if(!_objects.get(txn, id, info))
     {
         throw ObjectNotRegisteredException(id);
     }
-    return i->second;
+    return info;
 }
 
 ObjectInfoSeq
@@ -1829,13 +1826,16 @@ Database::getAllObjectInfos(const string& expression)
 {
     ObjectInfoSeq infos = _objectCache.getAll(expression);
 
-    ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
-    IdentityObjectInfoDict objects(connection, objectsDbName);
-    for(IdentityObjectInfoDict::const_iterator p = objects.begin(); p != objects.end(); ++p)
+    IceDB::ReadOnlyTxn txn(_env);
+
+    Ice::Identity id;
+    ObjectInfo info;
+    ObjectsMapROCursor cursor(_objects, txn);
+    while(cursor.get(id, info, MDB_NEXT))
     {
-        if(expression.empty() || IceUtilInternal::match(_communicator->identityToString(p->first), expression, true))
+        if(expression.empty() || IceUtilInternal::match(_communicator->identityToString(id), expression, true))
         {
-            infos.push_back(p->second);
+            infos.push_back(info);
         }
     }
     return infos;
@@ -1846,9 +1846,8 @@ Database::getObjectInfosByType(const string& type)
 {
     ObjectInfoSeq infos = _objectCache.getAllByType(type);
 
-    ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
-    IdentityObjectInfoDict objects(connection, objectsDbName);
-    ObjectInfoSeq dbInfos = findByType(objects, type);
+    IceDB::ReadOnlyTxn txn(_env);
+    ObjectInfoSeq dbInfos = findByType(txn, _objects, _objectsByType, type);
     for(unsigned int i = 0; i < dbInfos.size(); ++i)
     {
         infos.push_back(dbInfos[i]);
@@ -1862,31 +1861,27 @@ Database::addInternalObject(const ObjectInfo& info, bool replace)
     Lock sync(*this);
     const Ice::Identity id = info.proxy->ice_getIdentity();
 
-    for(;;)
+    try
     {
-        try
+        IceDB::ReadWriteTxn txn(_env);
+
+        ObjectInfo oldInfo;
+        if(_internalObjects.get(txn, id, oldInfo))
         {
-            TransactionHolder txHolder(_connection);
             if(!replace)
             {
-                IdentityObjectInfoDict::const_iterator i = _internalObjects.find(id);
-                if(i != _internalObjects.end())
-                {
-                    throw ObjectExistsException(id);
-                }
+                throw ObjectExistsException(id);
             }
-            _internalObjects.put(IdentityObjectInfoDict::value_type(id, info));
-            txHolder.commit();
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_communicator, ex);
+            _internalObjectsByType.del(txn, oldInfo.type, id);
         }
+        addObject(txn, info, true);
+
+        txn.commit();
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_communicator, ex);
+        throw;
     }
 }
 
@@ -1895,30 +1890,25 @@ Database::removeInternalObject(const Ice::Identity& id)
 {
     Lock sync(*this);
 
-    for(;;)
+    try
     {
-        try
-        {
-            TransactionHolder txHolder(_connection);
-            IdentityObjectInfoDict::iterator i = _internalObjects.find(id);
-            if(i == _internalObjects.end())
-            {
-                ObjectNotRegisteredException ex;
-                ex.id = id;
-                throw ex;
-            }
-            _internalObjects.erase(i);
-            txHolder.commit();
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
+        IceDB::ReadWriteTxn txn(_env);
+
+        ObjectInfo info;
+        if(!_internalObjects.get(txn, id, info))
         {
-            halt(_communicator, ex);
+            ObjectNotRegisteredException ex;
+            ex.id = id;
+            throw ex;
         }
+        deleteObject(txn, info, true);
+
+        txn.commit();
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_communicator, ex);
+        throw;
     }
 }
 
@@ -1927,9 +1917,8 @@ Database::getInternalObjectsByType(const string& type)
 {
     Ice::ObjectProxySeq proxies;
 
-    ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
-    IdentityObjectInfoDict internalObjects(connection, internalObjectsDbName);
-    vector<ObjectInfo> infos = findByType(internalObjects, type);
+    IceDB::ReadOnlyTxn txn(_env);
+    vector<ObjectInfo> infos = findByType(txn, _internalObjects, _internalObjectsByType, type);
     for(unsigned int i = 0; i < infos.size(); ++i)
     {
         proxies.push_back(infos[i].proxy);
@@ -1938,7 +1927,7 @@ Database::getInternalObjectsByType(const string& type)
 }
 
 void
-Database::checkForAddition(const ApplicationHelper& app, const ConnectionPtr& connection)
+Database::checkForAddition(const ApplicationHelper& app, const IceDB::ReadWriteTxn& txn)
 {
     set<string> serverIds;
     set<string> adapterIds;
@@ -1949,18 +1938,16 @@ Database::checkForAddition(const ApplicationHelper& app, const ConnectionPtr& co
     for_each(serverIds.begin(), serverIds.end(), objFunc(*this, &Database::checkServerForAddition));
     if(!adapterIds.empty())
     {
-        StringAdapterInfoDict adapters(connection, adaptersDbName);
         for(set<string>::const_iterator p = adapterIds.begin(); p != adapterIds.end(); ++p)
         {
-            checkAdapterForAddition(*p, adapters);
+            checkAdapterForAddition(*p, txn);
         }
     }
     if(!objectIds.empty())
     {
-        IdentityObjectInfoDict objects(connection, objectsDbName);
         for(set<Ice::Identity>::const_iterator p = objectIds.begin(); p != objectIds.end(); ++p)
         {
-            checkObjectForAddition(*p, objects);
+            checkObjectForAddition(*p, txn);
         }
     }
 
@@ -1973,7 +1960,7 @@ Database::checkForAddition(const ApplicationHelper& app, const ConnectionPtr& co
 void
 Database::checkForUpdate(const ApplicationHelper& origApp,
                          const ApplicationHelper& newApp,
-                         const ConnectionPtr& connection)
+                         const IceDB::ReadWriteTxn& txn)
 {
     set<string> oldSvrs, newSvrs;
     set<string> oldAdpts, newAdpts;
@@ -1990,10 +1977,9 @@ Database::checkForUpdate(const ApplicationHelper& origApp,
     set_difference(newAdpts.begin(), newAdpts.end(), oldAdpts.begin(), oldAdpts.end(), back_inserter(addedAdpts));
     if(!addedAdpts.empty())
     {
-        StringAdapterInfoDict adapters(connection, adaptersDbName);
         for(Ice::StringSeq::const_iterator p = addedAdpts.begin(); p != addedAdpts.end(); ++p)
         {
-            checkAdapterForAddition(*p, adapters);
+            checkAdapterForAddition(*p, txn);
         }
     }
 
@@ -2001,10 +1987,9 @@ Database::checkForUpdate(const ApplicationHelper& origApp,
     set_difference(newObjs.begin(), newObjs.end(), oldObjs.begin(), oldObjs.end(), back_inserter(addedObjs));
     if(!addedObjs.empty())
     {
-        IdentityObjectInfoDict objects(connection, objectsDbName);
         for(vector<Ice::Identity>::const_iterator p = addedObjs.begin(); p != addedObjs.end(); ++p)
         {
-            checkObjectForAddition(*p, objects);
+            checkObjectForAddition(*p, txn);
         }
     }
 
@@ -2054,7 +2039,7 @@ Database::checkServerForAddition(const string& id)
 }
 
 void
-Database::checkAdapterForAddition(const string& id, const StringAdapterInfoDict& adapters)
+Database::checkAdapterForAddition(const string& id, const IceDB::ReadWriteTxn& txn)
 {
     bool found = false;
     if(_adapterCache.has(id))
@@ -2063,14 +2048,13 @@ Database::checkAdapterForAddition(const string& id, const StringAdapterInfoDict&
     }
     else
     {
-        StringAdapterInfoDict::const_iterator i = adapters.find(id);
-        if(i != adapters.end())
+        if(_adapters.find(txn, id))
         {
             found = true;
         }
         else
         {
-            if(!findByReplicaGroupId(adapters, id).empty())
+            if(!findByReplicaGroupId(txn, _adapters,_adaptersByGroupId, id).empty())
             {
                 found = true;
             }
@@ -2086,7 +2070,8 @@ Database::checkAdapterForAddition(const string& id, const StringAdapterInfoDict&
 }
 
 void
-Database::checkObjectForAddition(const Ice::Identity& objectId, const IdentityObjectInfoDict& objects)
+Database::checkObjectForAddition(const Ice::Identity& objectId,
+                                 const IceDB::ReadWriteTxn& txn)
 {
     bool found = false;
     if(_objectCache.has(objectId) || _allocatableObjectCache.has(objectId))
@@ -2095,8 +2080,7 @@ Database::checkObjectForAddition(const Ice::Identity& objectId, const IdentityOb
     }
     else
     {
-        IdentityObjectInfoDict::const_iterator i = objects.find(objectId);
-        if(i != objects.end())
+        if(_objects.find(txn, objectId))
         {
             found = true;
         }
@@ -2342,57 +2326,19 @@ Database::reload(const ApplicationHelper& oldApp,
 }
 
 Ice::Long
-Database::saveApplication(const ApplicationInfo& info, const ConnectionPtr& connection, Ice::Long dbSerial)
+Database::saveApplication(const ApplicationInfo& info, const IceDB::ReadWriteTxn& txn, Ice::Long dbSerial)
 {
     assert(dbSerial != 0 || _master);
-    for(;;)
-    {
-        try
-        {
-            StringApplicationInfoDict applications(connection, applicationsDbName);
-            TransactionHolder txHolder(connection);
-            applications.put(StringApplicationInfoDict::value_type(info.descriptor.name, info));
-            dbSerial = updateSerial(connection, applicationsDbName, dbSerial);
-            txHolder.commit();
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_communicator, ex);
-        }
-    }
-    return dbSerial;
+    _applications.put(txn, info.descriptor.name, info);
+    return updateSerial(txn, applicationsDbName, dbSerial);
 }
 
 Ice::Long
-Database::removeApplication(const string& name, const ConnectionPtr& connection, Ice::Long dbSerial)
+Database::removeApplication(const string& name, const IceDB::ReadWriteTxn& txn, Ice::Long dbSerial)
 {
     assert(dbSerial != 0 || _master);
-    for(;;)
-    {
-        try
-        {
-            StringApplicationInfoDict applications(connection, applicationsDbName);
-            TransactionHolder txHolder(connection);
-            applications.erase(name);
-            dbSerial = updateSerial(connection, applicationsDbName, dbSerial);
-            txHolder.commit();
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_communicator, ex);
-        }
-    }
-    return dbSerial;
+    _applications.del(txn, name);
+    return updateSerial(txn, applicationsDbName, dbSerial);
 }
 
 void
@@ -2598,7 +2544,6 @@ Database::finishApplicationUpdate(const ApplicationUpdateInfo& update,
                                   Ice::Long dbSerial)
 {
     const ApplicationDescriptor& newDesc = helper.getDefinition();
-    ConnectionPtr connection = Freeze::createConnection(_communicator, _envName);
 
     ServerEntrySeq entries;
     int serial = 0;
@@ -2610,7 +2555,10 @@ Database::finishApplicationUpdate(const ApplicationUpdateInfo& update,
         }
 
         Lock sync(*this);
-        checkForUpdate(previous, helper, connection);
+
+        IceDB::ReadWriteTxn txn(_env);
+
+        checkForUpdate(previous, helper, txn);
         reload(previous, helper, entries, oldApp.uuid, oldApp.revision + 1, noRestart);
 
         for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::sync));
@@ -2620,7 +2568,9 @@ Database::finishApplicationUpdate(const ApplicationUpdateInfo& update,
         info.updateUser = update.updateUser;
         info.revision = update.revision;
         info.descriptor = newDesc;
-        dbSerial = saveApplication(info, connection, dbSerial);
+        dbSerial = saveApplication(info, txn, dbSerial);
+
+        txn.commit();
 
         serial = _applicationObserverTopic->applicationUpdated(dbSerial, update);
     }
@@ -2629,6 +2579,11 @@ Database::finishApplicationUpdate(const ApplicationUpdateInfo& update,
         finishUpdating(update.descriptor.name);
         throw;
     }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_communicator, ex);
+        throw;
+    }
 
     _applicationObserverTopic->waitForSyncedSubscribers(serial); // Wait for replicas to be updated.
 
@@ -2670,7 +2625,18 @@ Database::finishApplicationUpdate(const ApplicationUpdateInfo& update,
 
                 ApplicationInfo info = oldApp;
                 info.revision = update.revision + 1;
-                dbSerial = saveApplication(info, connection);
+
+                try
+                {
+                    IceDB::ReadWriteTxn txn(_env);
+                    dbSerial = saveApplication(info, txn);
+                    txn.commit();
+                }
+                catch(const IceDB::LMDBException& ex)
+                {
+                    logError(_communicator, ex);
+                }
+
                 reload(previous, helper, entries, info.uuid, info.revision, noRestart);
 
                 newUpdate.updateTime = IceUtil::Time::now().toMilliSeconds();
@@ -2729,3 +2695,97 @@ Database::finishUpdating(const string& name)
     _updating.erase(p);
     notifyAll();
 }
+
+Ice::Long
+Database::getSerial(const IceDB::Txn& txn, const string& dbName)
+{
+    Ice::Long serial = 1;
+    _serials.get(txn, dbName, serial);
+    return serial;
+}
+
+Ice::Long
+Database::updateSerial(const IceDB::ReadWriteTxn& txn, const string& dbName, Ice::Long serial)
+{
+    if(serial == -1) // The master we are talking to doesn't support serials (old IceGrid versions)
+    {
+        return -1;
+    }
+
+    //
+    // If a serial number is set, just update the serial number from the database,
+    // otherwise if the serial is 0, we increment the serial from the database.
+    //
+    if(serial > 0)
+    {
+        _serials.put(txn, dbName, serial);
+        return serial;
+    }
+    else
+    {
+        Ice::Long dbSerial = getSerial(txn, dbName) + 1;
+        _serials.put(txn, dbName, dbSerial);
+        return dbSerial;
+    }
+}
+
+void
+Database::addAdapter(const IceDB::ReadWriteTxn& txn, const AdapterInfo& info)
+{
+    _adapters.put(txn, info.id, info);
+    _adaptersByGroupId.put(txn, info.replicaGroupId, info.id);
+}
+
+void
+Database::deleteAdapter(const IceDB::ReadWriteTxn& txn, const AdapterInfo& info)
+{
+
+    _adapters.del(txn, info.id);
+    _adaptersByGroupId.del(txn, info.replicaGroupId, info.id);
+}
+
+void
+Database::addObject(const IceDB::ReadWriteTxn& txn, const ObjectInfo& info, bool internal)
+{
+    if(internal)
+    {
+        _internalObjects.put(txn, info.proxy->ice_getIdentity(), info);
+        _internalObjectsByType.put(txn, info.type, info.proxy->ice_getIdentity());
+    }
+    else
+    {
+        try
+        {
+            _objects.put(txn, info.proxy->ice_getIdentity(), info);
+        }
+        catch(const IceDB::KeyTooLongException& ex)
+        {
+            throw DeploymentException("object identity `" +
+                                      _communicator->identityToString(info.proxy->ice_getIdentity()) 
+                                      + "' is too long: " + ex.what());
+        }
+        try
+        {
+            _objectsByType.put(txn, info.type, info.proxy->ice_getIdentity());
+        }
+        catch(const IceDB::KeyTooLongException& ex)
+        {
+            throw DeploymentException("object type `" + info.type + "' is too long: " + ex.what());
+        }
+    }
+}
+
+void
+Database::deleteObject(const IceDB::ReadWriteTxn& txn, const ObjectInfo& info, bool internal)
+{
+    if(internal)
+    {
+        _internalObjects.del(txn, info.proxy->ice_getIdentity());
+        _internalObjectsByType.del(txn, info.type, info.proxy->ice_getIdentity());
+    }
+    else
+    {
+        _objects.del(txn, info.proxy->ice_getIdentity());
+        _objectsByType.del(txn, info.type, info.proxy->ice_getIdentity());
+    }
+}
diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h
index f75769123ff..be7a89fae6c 100644
--- a/cpp/src/IceGrid/Database.h
+++ b/cpp/src/IceGrid/Database.h
@@ -12,8 +12,8 @@
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Shared.h>
+#include <IceUtil/FileUtil.h>
 #include <Ice/CommunicatorF.h>
-#include <Freeze/Freeze.h>
 #include <IceGrid/Admin.h>
 #include <IceGrid/Internal.h>
 #include <IceGrid/ServerCache.h>
@@ -25,9 +25,7 @@
 #include <IceGrid/Topics.h>
 #include <IceGrid/PluginFacadeI.h>
 
-#include <IceGrid/StringApplicationInfoDict.h>
-#include <IceGrid/StringAdapterInfoDict.h>
-#include <IceGrid/IdentityObjectInfoDict.h>
+#include <IceDB/IceDB.h>
 
 namespace IceGrid
 {
@@ -48,6 +46,17 @@ typedef IceUtil::Handle<ServerEntry> ServerEntryPtr;
 
 class ApplicationHelper;
 
+typedef IceDB::Dbi<std::string, IceGrid::ApplicationInfo, IceDB::IceContext, Ice::OutputStream>
+    StringApplicationInfoMap;
+
+typedef IceDB::Dbi<Ice::Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream> IdentityObjectInfoMap;
+typedef IceDB::Dbi<std::string, Ice::Identity, IceDB::IceContext, Ice::OutputStream> StringIdentityMap;
+
+typedef IceDB::Dbi<std::string, IceGrid::AdapterInfo, IceDB::IceContext, Ice::OutputStream> StringAdapterInfoMap;
+typedef IceDB::Dbi<std::string, std::string, IceDB::IceContext, Ice::OutputStream> StringStringMap;
+
+typedef IceDB::Dbi<std::string, Ice::Long, IceDB::IceContext, Ice::OutputStream> StringLongMap;
+
 class Database : public IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
@@ -58,9 +67,9 @@ public:
 #endif
 
 
-    Database(const Ice::ObjectAdapterPtr&, const IceStorm::TopicManagerPrx&, const std::string&,
-             const TraceLevelsPtr&, const RegistryInfo&, const Freeze::ConnectionPtr&, const std::string&, bool);
-    
+    Database(const Ice::ObjectAdapterPtr&, const IceStorm::TopicManagerPrx&, const std::string&, const TraceLevelsPtr&,
+             const RegistryInfo&, bool);
+
     std::string getInstanceName() const;
     bool isReadOnly() const { return _readonly; }
     const TraceLevelsPtr& getTraceLevels() const { return _traceLevels; }
@@ -78,9 +87,9 @@ public:
     void syncAdapters(const AdapterInfoSeq&, Ice::Long);
     void syncObjects(const ObjectInfoSeq&, Ice::Long);
 
-    ApplicationInfoSeq getApplications(Ice::Long&) const;
-    AdapterInfoSeq getAdapters(Ice::Long&) const;
-    ObjectInfoSeq getObjects(Ice::Long&) const;
+    ApplicationInfoSeq getApplications(Ice::Long&);
+    AdapterInfoSeq getAdapters(Ice::Long&);
+    ObjectInfoSeq getObjects(Ice::Long&);
 
     StringLongDict getSerials() const;
 
@@ -98,7 +107,7 @@ public:
 
     ReplicaCache& getReplicaCache();
     ReplicaEntryPtr getReplica(const std::string&) const;
-    
+
     ServerCache& getServerCache();
     ServerEntryPtr getServer(const std::string&) const;
 
@@ -106,16 +115,16 @@ public:
     AllocatableObjectEntryPtr getAllocatableObject(const Ice::Identity&) const;
 
     void setAdapterDirectProxy(const std::string&, const std::string&, const Ice::ObjectPrx&, Ice::Long = 0);
-    Ice::ObjectPrx getAdapterDirectProxy(const std::string&, const Ice::EncodingVersion&, const Ice::ConnectionPtr&, 
+    Ice::ObjectPrx getAdapterDirectProxy(const std::string&, const Ice::EncodingVersion&, const Ice::ConnectionPtr&,
                                          const Ice::Context&);
 
     void removeAdapter(const std::string&);
     AdapterPrx getAdapterProxy(const std::string&, const std::string&, bool);
-    void getLocatorAdapterInfo(const std::string&, const Ice::ConnectionPtr&, const Ice::Context&, 
-                               LocatorAdapterInfoSeq&, int&, bool&, bool&, 
+    void getLocatorAdapterInfo(const std::string&, const Ice::ConnectionPtr&, const Ice::Context&,
+                               LocatorAdapterInfoSeq&, int&, bool&, bool&,
                                const std::set<std::string>& = std::set<std::string>());
 
-    bool addAdapterSyncCallback(const std::string&, const SynchronizationCallbackPtr&, 
+    bool addAdapterSyncCallback(const std::string&, const SynchronizationCallbackPtr&,
                                 const std::set<std::string>& = std::set<std::string>());
 
     std::vector<std::pair<std::string, AdapterPrx> > getAdapters(const std::string&, int&, bool&);
@@ -140,7 +149,7 @@ public:
     Ice::ObjectPrx getObjectByTypeOnLeastLoadedNode(const std::string&, LoadSample,
                                                     const Ice::ConnectionPtr& = Ice::ConnectionPtr(),
                                                     const Ice::Context& = Ice::Context());
-    Ice::ObjectProxySeq getObjectsByType(const std::string&, 
+    Ice::ObjectProxySeq getObjectsByType(const std::string&,
                                          const Ice::ConnectionPtr& = Ice::ConnectionPtr(),
                                          const Ice::Context& = Ice::Context());
     ObjectInfo getObjectInfo(const Ice::Identity&);
@@ -153,13 +162,13 @@ public:
 
 private:
 
-    void checkForAddition(const ApplicationHelper&, const Freeze::ConnectionPtr&);
-    void checkForUpdate(const ApplicationHelper&, const ApplicationHelper&, const Freeze::ConnectionPtr&);
+    void checkForAddition(const ApplicationHelper&, const IceDB::ReadWriteTxn&);
+    void checkForUpdate(const ApplicationHelper&, const ApplicationHelper&, const IceDB::ReadWriteTxn&);
     void checkForRemove(const ApplicationHelper&);
 
     void checkServerForAddition(const std::string&);
-    void checkAdapterForAddition(const std::string&, const StringAdapterInfoDict&);
-    void checkObjectForAddition(const Ice::Identity&, const IdentityObjectInfoDict&);
+    void checkAdapterForAddition(const std::string&, const IceDB::ReadWriteTxn&);
+    void checkObjectForAddition(const Ice::Identity&, const IceDB::ReadWriteTxn&);
     void checkReplicaGroupExists(const std::string&);
     void checkReplicaGroupForRemove(const std::string&);
 
@@ -169,8 +178,8 @@ private:
 
     void checkUpdate(const ApplicationHelper&, const ApplicationHelper&, const std::string&, int, bool);
 
-    Ice::Long saveApplication(const ApplicationInfo&, const Freeze::ConnectionPtr&, Ice::Long = 0);
-    Ice::Long removeApplication(const std::string&, const Freeze::ConnectionPtr&, Ice::Long = 0);
+    Ice::Long saveApplication(const ApplicationInfo&, const IceDB::ReadWriteTxn&, Ice::Long = 0);
+    Ice::Long removeApplication(const std::string&, const IceDB::ReadWriteTxn&, Ice::Long = 0);
 
     void finishApplicationUpdate(const ApplicationUpdateInfo&, const ApplicationInfo&, const ApplicationHelper&,
                                  const ApplicationHelper&, AdminSessionI*, bool, Ice::Long = 0);
@@ -181,6 +190,15 @@ private:
     void startUpdating(const std::string&, const std::string&, int);
     void finishUpdating(const std::string&);
 
+    Ice::Long getSerial(const IceDB::Txn&, const std::string&);
+    Ice::Long updateSerial(const IceDB::ReadWriteTxn&, const std::string&, Ice::Long = 0);
+
+    void addAdapter(const IceDB::ReadWriteTxn&, const AdapterInfo&);
+    void deleteAdapter(const IceDB::ReadWriteTxn&, const AdapterInfo&);
+
+    void addObject(const IceDB::ReadWriteTxn&, const ObjectInfo&, bool);
+    void deleteObject(const IceDB::ReadWriteTxn&, const ObjectInfo&, bool);
+
     friend struct AddComponent;
 
     static const std::string _applicationDbName;
@@ -188,7 +206,7 @@ private:
     static const std::string _internalObjectDbName;
     static const std::string _adapterDbName;
     static const std::string _replicaGroupDbName;
-  
+
     const Ice::CommunicatorPtr _communicator;
     const Ice::ObjectAdapterPtr _internalAdapter;
     const IceStorm::TopicManagerPrx _topicManager;
@@ -210,16 +228,24 @@ private:
     AdapterObserverTopicPtr _adapterObserverTopic;
     ObjectObserverTopicPtr _objectObserverTopic;
 
-    Freeze::ConnectionPtr _connection;
-    const std::string _envName;
-    
-    StringApplicationInfoDict _applications;
-    StringAdapterInfoDict _adapters;
-    IdentityObjectInfoDict _objects;
-    IdentityObjectInfoDict _internalObjects;
-    
+    IceUtilInternal::FileLock _dbLock;
+    IceDB::Env _env;
+
+    StringApplicationInfoMap _applications;
+
+    StringAdapterInfoMap _adapters;
+    StringStringMap _adaptersByGroupId;
+
+    IdentityObjectInfoMap _objects;
+    StringIdentityMap _objectsByType;
+
+    IdentityObjectInfoMap _internalObjects;
+    StringIdentityMap _internalObjectsByType;
+
+    StringLongMap _serials;
+
     RegistryPluginFacadeIPtr _pluginFacade;
-    
+
     AdminSessionI* _lock;
     std::string _lockUserId;
 
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index 6a1ab12a230..bd0d57cb333 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -118,7 +118,7 @@ struct TemplateDescriptorEqual : std::binary_function<TemplateDescriptor&, Templ
             if(slhs && srhs)
             {
                 return ServiceHelper(slhs) == ServiceHelper(srhs);
-            }   
+            }
         }
 
         return false;
@@ -266,7 +266,7 @@ getSeqUpdatedEltsWithEq(const Seq& lseq, const Seq& rseq, GetKeyFunc func, EqFun
     return result;
 }
 
-template <typename GetKeyFunc, typename Seq> Ice::StringSeq 
+template <typename GetKeyFunc, typename Seq> Ice::StringSeq
 getSeqRemovedElts(const Seq& lseq, const Seq& rseq, GetKeyFunc func)
 {
     Ice::StringSeq removed;
@@ -388,7 +388,7 @@ validateProxyOptions(const Resolver& resolver, const string& proxyOptions)
 
 }
 
-Resolver::Resolver(const ApplicationDescriptor& app, const Ice::CommunicatorPtr& communicator, bool enableWarning) : 
+Resolver::Resolver(const ApplicationDescriptor& app, const Ice::CommunicatorPtr& communicator, bool enableWarning) :
     _application(&app),
     _communicator(communicator),
     _escape(false),
@@ -414,6 +414,12 @@ Resolver::Resolver(const ApplicationDescriptor& app, const Ice::CommunicatorPtr&
     _ignore.insert("node.version");
     _ignore.insert("node.machine");
     _ignore.insert("node.datadir");
+    _ignore.insert("node.data");
+
+    //
+    // Deprecated variables
+    //
+    _deprecated["node.datadir"] = "node.data";
 
     for(StringStringDict::const_iterator v = _variables.begin(); v != _variables.end(); ++v)
     {
@@ -439,7 +445,7 @@ Resolver::Resolver(const ApplicationDescriptor& app, const Ice::CommunicatorPtr&
         sort(params.begin(), params.end());
         Ice::StringSeq wdups = params;
         Ice::StringSeq dups;
-        set_difference(wdups.begin(), wdups.end(), params.begin(), unique(params.begin(), params.end()), 
+        set_difference(wdups.begin(), wdups.end(), params.begin(), unique(params.begin(), params.end()),
                        back_inserter(dups));
         if(!dups.empty())
         {
@@ -462,7 +468,7 @@ Resolver::Resolver(const ApplicationDescriptor& app, const Ice::CommunicatorPtr&
         sort(params.begin(), params.end());
         Ice::StringSeq wdups = params;
         Ice::StringSeq dups;
-        set_difference(wdups.begin(), wdups.end(), params.begin(), unique(params.begin(), params.end()), 
+        set_difference(wdups.begin(), wdups.end(), params.begin(), unique(params.begin(), params.end()),
                        back_inserter(dups));
         if(!dups.empty())
         {
@@ -472,8 +478,8 @@ Resolver::Resolver(const ApplicationDescriptor& app, const Ice::CommunicatorPtr&
     }
 }
 
-Resolver::Resolver(const Resolver& resolve, 
-                   const map<string, string>& values, 
+Resolver::Resolver(const Resolver& resolve,
+                   const map<string, string>& values,
                    bool params) :
     _application(resolve._application),
     _communicator(resolve._communicator),
@@ -484,6 +490,7 @@ Resolver::Resolver(const Resolver& resolve,
     _parameters(!params ? resolve._parameters : values),
     _propertySets(resolve._propertySets),
     _reserved(resolve._reserved),
+    _deprecated(resolve._deprecated),
     _ignore(resolve._ignore),
     _version(resolve._version)
 {
@@ -522,9 +529,10 @@ Resolver::Resolver(const InternalNodeInfoPtr& info, const Ice::CommunicatorPtr&
     setReserved("node.version", info->version);
     setReserved("node.machine", info->machine);
     setReserved("node.datadir", info->dataDir);
+    setReserved("node.data", info->dataDir);
 }
 
-string 
+string
 Resolver::operator()(const string& value, const string& name, bool allowEmpty) const
 {
     try
@@ -588,7 +596,7 @@ Resolver::operator()(const DistributionDescriptor& desc) const
 }
 
 PropertyDescriptorSeq
-Resolver::operator()(const PropertyDescriptorSeq& properties, const string& name) const 
+Resolver::operator()(const PropertyDescriptorSeq& properties, const string& name) const
 {
     PropertyDescriptorSeq result;
     for(PropertyDescriptorSeq::const_iterator q = properties.begin(); q != properties.end(); ++q)
@@ -751,7 +759,7 @@ Resolver::setReserved(const string& name, const string& value)
 {
     assert(_reserved.find(name) != _reserved.end());
     _reserved[name] = value;
-}    
+}
 
 void
 Resolver::setContext(const string& context)
@@ -887,15 +895,15 @@ Resolver::hasReplicaGroup(const string& id) const
         //
         return true;
     }
-    
-    for(ReplicaGroupDescriptorSeq::const_iterator p = _application->replicaGroups.begin(); 
+
+    for(ReplicaGroupDescriptorSeq::const_iterator p = _application->replicaGroups.begin();
         p != _application->replicaGroups.end(); ++p)
     {
         if(p->id == id)
         {
             return true;
         }
-    } 
+    }
     return false;
 }
 
@@ -915,12 +923,12 @@ Resolver::substitute(const string& v, bool useParams, bool useIgnored) const
             {
                 --escape;
             }
-            
+
             if((beg - escape) % 2)
             {
                 if(_escape)
                 {
-                    value.replace(escape, beg - escape, (beg - escape) / 2, '$');                   
+                    value.replace(escape, beg - escape, (beg - escape) / 2, '$');
                 }
                 ++beg;
                 continue;
@@ -949,6 +957,7 @@ Resolver::substitute(const string& v, bool useParams, bool useIgnored) const
         string name = value.substr(beg + 2, end - beg - 2);
         if(_ignore.find(name) != _ignore.end())
         {
+            checkDeprecated(name);
             if(useIgnored)
             {
                 ++beg;
@@ -983,6 +992,7 @@ Resolver::getVariable(const string& name, bool checkParams, bool& param) const
     map<string, string>::const_iterator p = _reserved.find(name);
     if(p != _reserved.end())
     {
+        checkDeprecated(name);
         if(p->second.empty())
         {
             throw "undefined variable `" + name + "'";
@@ -1002,7 +1012,7 @@ Resolver::getVariable(const string& name, bool checkParams, bool& param) const
     if(p != _variables.end())
     {
         return p->second;
-    }    
+    }
 
     throw "undefined variable `" + name + "'";
     return ""; // To keep the compiler happy.
@@ -1026,7 +1036,7 @@ Resolver::getProperties(const Ice::StringSeq& references, set<string>& resolved)
             PropertyDescriptorSeq p = getProperties(desc.references, resolved);
             properties.insert(properties.end(), p.begin(), p.end());
         }
-        
+
         PropertyDescriptorSeq pds = operator()(desc.properties);
         properties.insert(properties.end(), pds.begin(), pds.end());
     }
@@ -1050,11 +1060,14 @@ Resolver::getReserved()
     reserved["node.version"] = "";
     reserved["node.machine"] = "";
     reserved["node.datadir"] = "";
+    reserved["node.data"] = "";
     reserved["session.id"] = "";
-    reserved["application.distrib"] = "${node.datadir}/distrib/${application}";
-    reserved["server.distrib"] = "${node.datadir}/servers/${server}/distrib";
+    reserved["application.distrib"] = "${node.data}/distrib/${application}";
+    reserved["server.distrib"] = "${node.data}/servers/${server}/distrib";
     reserved["server"] = "";
+    reserved["server.data"] = "${node.data}/servers/${server}/data";
     reserved["service"] = "";
+    reserved["service.data"] = "${node.data}/servers/${server}/data_${service}";
     return reserved;
 }
 
@@ -1070,12 +1083,32 @@ Resolver::checkReserved(const string& type, const map<string, string>& values) c
     }
 }
 
-CommunicatorHelper::CommunicatorHelper(const CommunicatorDescriptorPtr& desc, bool ignoreProps) : 
+void
+Resolver::checkDeprecated(const string& name) const
+{
+    if(!warningEnabled())
+    {
+        return;
+    }
+
+    map<string, string>::const_iterator q = _deprecated.find(name);
+    if(q != _deprecated.end())
+    {
+        Ice::Warning out(_communicator->getLogger());
+        out << "variable `" << name << "' is deprecated";
+        if(!q->second.empty())
+        {
+            out << ", use `" << q->second << "' instead";
+        }
+    }
+}
+
+CommunicatorHelper::CommunicatorHelper(const CommunicatorDescriptorPtr& desc, bool ignoreProps) :
     _desc(desc), _ignoreProps(ignoreProps)
 {
 }
 
-bool 
+bool
 CommunicatorHelper::operator==(const CommunicatorHelper& helper) const
 {
     if(_desc->ice_id() != helper._desc->ice_id())
@@ -1101,7 +1134,7 @@ CommunicatorHelper::operator==(const CommunicatorHelper& helper) const
         }
     }
 
-    if(set<DbEnvDescriptor>(_desc->dbEnvs.begin(), _desc->dbEnvs.end()) != 
+    if(set<DbEnvDescriptor>(_desc->dbEnvs.begin(), _desc->dbEnvs.end()) !=
        set<DbEnvDescriptor>(helper._desc->dbEnvs.begin(), helper._desc->dbEnvs.end()))
     {
         return false;
@@ -1121,11 +1154,11 @@ CommunicatorHelper::operator!=(const CommunicatorHelper& helper) const
     return !operator==(helper);
 }
 
-void 
+void
 CommunicatorHelper::getIds(multiset<string>& adapterIds, multiset<Ice::Identity>& objectIds) const
 {
     for(AdapterDescriptorSeq::const_iterator p = _desc->adapters.begin(); p != _desc->adapters.end(); ++p)
-    {   
+    {
         if(!p->id.empty())
         {
             adapterIds.insert(p->id);
@@ -1151,7 +1184,7 @@ CommunicatorHelper::getIds(multiset<string>& adapterIds, multiset<Ice::Identity>
     }
 }
 
-void 
+void
 CommunicatorHelper::getReplicaGroups(set<string>& replicaGroups) const
 {
     for(AdapterDescriptorSeq::const_iterator p = _desc->adapters.begin(); p != _desc->adapters.end(); ++p)
@@ -1276,7 +1309,7 @@ CommunicatorHelper::print(const Ice::CommunicatorPtr& communicator, Output& out)
         {
             out << nl << "references = " << toString(_desc->propertySet.references);
         }
-        
+
         for(PropertyDescriptorSeq::const_iterator q = _desc->propertySet.properties.begin();
             q != _desc->propertySet.properties.end(); ++q)
         {
@@ -1289,7 +1322,7 @@ CommunicatorHelper::print(const Ice::CommunicatorPtr& communicator, Output& out)
     }
 }
 
-void 
+void
 CommunicatorHelper::printDbEnv(Output& out, const DbEnvDescriptor& dbEnv) const
 {
     out << nl << "database environment `" << dbEnv.name << "'";
@@ -1320,7 +1353,7 @@ CommunicatorHelper::printDbEnv(Output& out, const DbEnvDescriptor& dbEnv) const
 
 void
 CommunicatorHelper::printObjectAdapter(const Ice::CommunicatorPtr& communicator,
-                                       Output& out, 
+                                       Output& out,
                                        const AdapterDescriptor& adapter) const
 {
     out << nl << "adapter `" << adapter.name << "'";
@@ -1399,7 +1432,7 @@ ServiceHelper::ServiceHelper(const ServiceDescriptorPtr& descriptor, bool ignore
 {
 }
 
-bool 
+bool
 ServiceHelper::operator==(const CommunicatorHelper& h) const
 {
     const ServiceHelper* helper = dynamic_cast<const ServiceHelper*>(&h);
@@ -1434,7 +1467,7 @@ ServiceHelper::getDescriptor() const
 }
 
 ServiceDescriptorPtr
-ServiceHelper::instantiate(const Resolver& resolver, const PropertyDescriptorSeq& props, 
+ServiceHelper::instantiate(const Resolver& resolver, const PropertyDescriptorSeq& props,
                            const PropertySetDescriptorDict& serviceProps) const
 {
     ServiceDescriptorPtr service = new ServiceDescriptor();
@@ -1443,8 +1476,8 @@ ServiceHelper::instantiate(const Resolver& resolver, const PropertyDescriptorSeq
 }
 
 void
-ServiceHelper::instantiateImpl(const ServiceDescriptorPtr& instance, 
-                               const Resolver& resolve, 
+ServiceHelper::instantiateImpl(const ServiceDescriptorPtr& instance,
+                               const Resolver& resolve,
                                const PropertyDescriptorSeq& props,
                                const PropertySetDescriptorDict& serviceProps) const
 {
@@ -1455,7 +1488,7 @@ ServiceHelper::instantiateImpl(const ServiceDescriptorPtr& instance,
     PropertySetDescriptorDict::const_iterator p = serviceProps.find(instance->name);
     if(p != serviceProps.end())
     {
-        instance->propertySet.properties.insert(instance->propertySet.properties.end(), 
+        instance->propertySet.properties.insert(instance->propertySet.properties.end(),
                                                 p->second.properties.begin(),
                                                 p->second.properties.end());
     }
@@ -1477,7 +1510,7 @@ ServerHelper::ServerHelper(const ServerDescriptorPtr& descriptor, bool ignorePro
 {
 }
 
-bool 
+bool
 ServerHelper::operator==(const CommunicatorHelper& h) const
 {
     const ServerHelper* helper = dynamic_cast<const ServerHelper*>(&h);
@@ -1506,13 +1539,13 @@ ServerHelper::operator==(const CommunicatorHelper& h) const
         return false;
     }
 
-    if(set<string>(_desc->options.begin(), _desc->options.end()) != 
+    if(set<string>(_desc->options.begin(), _desc->options.end()) !=
        set<string>(helper->_desc->options.begin(), helper->_desc->options.end()))
     {
         return false;
     }
 
-    if(set<string>(_desc->envs.begin(), _desc->envs.end()) != 
+    if(set<string>(_desc->envs.begin(), _desc->envs.end()) !=
        set<string>(helper->_desc->envs.begin(), helper->_desc->envs.end()))
     {
         return false;
@@ -1565,7 +1598,7 @@ ServerHelper::getDescriptor() const
 
 ServerDescriptorPtr
 ServerHelper::instantiate(const Resolver& resolver,
-                          const PropertyDescriptorSeq& props, 
+                          const PropertyDescriptorSeq& props,
                           const PropertySetDescriptorDict& serviceProps) const
 {
     if(!serviceProps.empty())
@@ -1661,8 +1694,8 @@ ServerHelper::printImpl(const Ice::CommunicatorPtr& communicator, Output& out, c
 }
 
 void
-ServerHelper::instantiateImpl(const ServerDescriptorPtr& instance, 
-                              const Resolver& resolve, 
+ServerHelper::instantiateImpl(const ServerDescriptorPtr& instance,
+                              const Resolver& resolve,
                               const PropertyDescriptorSeq& props) const
 {
     CommunicatorHelper::instantiateImpl(instance, resolve);
@@ -1675,7 +1708,7 @@ ServerHelper::instantiateImpl(const ServerDescriptorPtr& instance,
     instance->applicationDistrib = _desc->applicationDistrib;
     instance->allocatable = _desc->allocatable;
     instance->user = resolve(_desc->user, "user");
-    if(!instance->activation.empty() && 
+    if(!instance->activation.empty() &&
        instance->activation != "manual" &&
        instance->activation != "on-demand" &&
        instance->activation != "always" &&
@@ -1701,7 +1734,7 @@ IceBoxHelper::IceBoxHelper(const IceBoxDescriptorPtr& descriptor, bool ignorePro
     }
 }
 
-bool 
+bool
 IceBoxHelper::operator==(const CommunicatorHelper& h) const
 {
     const IceBoxHelper* helper = dynamic_cast<const IceBoxHelper*>(&h);
@@ -1714,7 +1747,7 @@ IceBoxHelper::operator==(const CommunicatorHelper& h) const
     {
         return false;
     }
-    
+
     return true;
 }
 
@@ -1725,7 +1758,7 @@ IceBoxHelper::operator!=(const CommunicatorHelper& helper) const
 }
 
 ServerDescriptorPtr
-IceBoxHelper::instantiate(const Resolver& resolver, 
+IceBoxHelper::instantiate(const Resolver& resolver,
                           const PropertyDescriptorSeq& props,
                           const PropertySetDescriptorDict& serviceProps) const
 {
@@ -1781,8 +1814,8 @@ IceBoxHelper::print(const Ice::CommunicatorPtr& communicator, Output& out, const
 }
 
 void
-IceBoxHelper::instantiateImpl(const IceBoxDescriptorPtr& instance, 
-                              const Resolver& resolver, 
+IceBoxHelper::instantiateImpl(const IceBoxDescriptorPtr& instance,
+                              const Resolver& resolver,
                               const PropertyDescriptorSeq& props,
                               const PropertySetDescriptorDict& serviceProps) const
 {
@@ -1805,8 +1838,8 @@ IceBoxHelper::instantiateImpl(const IceBoxDescriptorPtr& instance,
 }
 
 map<string, string>
-InstanceHelper::instantiateParams(const Resolver& resolve, 
-                                  const string& tmpl, 
+InstanceHelper::instantiateParams(const Resolver& resolve,
+                                  const string& tmpl,
                                   const map<string, string>& parameters,
                                   const vector<string>& requiredParameters,
                                   const map<string, string>& defaults) const
@@ -1830,7 +1863,7 @@ InstanceHelper::instantiateParams(const Resolver& resolve,
         copy(unknown.begin(), unknown.end(), ostream_iterator<string>(os, " "));
         resolve.exception(os.str());
     }
-    
+
     set<string> missingParams;
     for(set<string>::const_iterator q = required.begin(); q != required.end(); ++q)
     {
@@ -1886,7 +1919,7 @@ ServiceInstanceHelper::operator==(const ServiceInstanceHelper& helper) const
     }
     else
     {
-        return _def._cpp_template == helper._def._cpp_template && 
+        return _def._cpp_template == helper._def._cpp_template &&
             _def.parameterValues == helper._def.parameterValues &&
             _def.propertySet == helper._def.propertySet;
     }
@@ -1900,7 +1933,7 @@ ServiceInstanceHelper::operator!=(const ServiceInstanceHelper& helper) const
 
 ServiceInstanceDescriptor
 ServiceInstanceHelper::instantiate(const Resolver& resolve, const PropertySetDescriptorDict& serviceProps) const
-{ 
+{
     ServiceHelper def = _service;
     std::map<std::string, std::string> parameterValues;
     if(!def.getDescriptor())
@@ -1908,10 +1941,10 @@ ServiceInstanceHelper::instantiate(const Resolver& resolve, const PropertySetDes
         assert(!_def._cpp_template.empty());
         TemplateDescriptor tmpl = resolve.getServiceTemplate(_def._cpp_template);
         def = ServiceHelper(ServiceDescriptorPtr::dynamicCast(tmpl.descriptor));
-        parameterValues = instantiateParams(resolve, 
-                                            _def._cpp_template, 
+        parameterValues = instantiateParams(resolve,
+                                            _def._cpp_template,
                                             _def.parameterValues,
-                                            tmpl.parameters, 
+                                            tmpl.parameters,
                                             tmpl.parameterDefaults);
     }
 
@@ -1985,7 +2018,7 @@ ServerInstanceHelper::ServerInstanceHelper(const ServerInstanceDescriptor& desc,
     init(0, resolve, instantiate);
 }
 
-ServerInstanceHelper::ServerInstanceHelper(const ServerDescriptorPtr& definition, 
+ServerInstanceHelper::ServerInstanceHelper(const ServerDescriptorPtr& definition,
                                            const Resolver& resolve,
                                            bool instantiate) :
     _def(ServerInstanceDescriptor())
@@ -2007,16 +2040,16 @@ ServerInstanceHelper::init(const ServerDescriptorPtr& definition, const Resolver
         {
             resolve.exception("invalid server instance: template is not defined");
         }
-        
+
         //
         // Get the server definition and the template property sets.
         //
         TemplateDescriptor tmpl = resolve.getServerTemplate(_def._cpp_template);
         def = ServerDescriptorPtr::dynamicCast(tmpl.descriptor);
-        parameterValues = instantiateParams(resolve, 
-                                            _def._cpp_template, 
-                                            _def.parameterValues, 
-                                            tmpl.parameters, 
+        parameterValues = instantiateParams(resolve,
+                                            _def._cpp_template,
+                                            _def.parameterValues,
+                                            tmpl.parameters,
                                             tmpl.parameterDefaults);
     }
     assert(def);
@@ -2046,9 +2079,9 @@ ServerInstanceHelper::init(const ServerDescriptorPtr& definition, const Resolver
     //
     if(svrResolve(def->activation, "server activation", true) == "session")
     {
-        svrResolve.addIgnored("session.id"); 
+        svrResolve.addIgnored("session.id");
     }
-        
+
     //
     // Instantiate the server instance definition (we use the server
     // resolver above, so using parameters in properties is possible).
@@ -2064,7 +2097,7 @@ ServerInstanceHelper::init(const ServerDescriptorPtr& definition, const Resolver
             _instance.servicePropertySets.insert(make_pair(svrResolve(p->first), svrResolve(p->second)));
         }
     }
-    
+
     //
     // Instantiate the server definition.
     //
@@ -2082,9 +2115,9 @@ ServerInstanceHelper::operator==(const ServerInstanceHelper& helper) const
     }
     else
     {
-        return _def._cpp_template == helper._def._cpp_template && 
+        return _def._cpp_template == helper._def._cpp_template &&
             _def.parameterValues == helper._def.parameterValues &&
-            _def.propertySet == helper._def.propertySet && 
+            _def.propertySet == helper._def.propertySet &&
             _def.servicePropertySets == helper._def.servicePropertySets;
     }
 }
@@ -2143,10 +2176,10 @@ ServerInstanceHelper::getReplicaGroups(set<string>& replicaGroups) const
     _serverInstance->getReplicaGroups(replicaGroups);
 }
 
-NodeHelper::NodeHelper(const string& name, 
-                       const NodeDescriptor& descriptor, 
+NodeHelper::NodeHelper(const string& name,
+                       const NodeDescriptor& descriptor,
                        const Resolver& appResolve,
-                       bool instantiate) : 
+                       bool instantiate) :
     _name(name),
     _def(descriptor),
     _instantiated(instantiate)
@@ -2270,7 +2303,7 @@ NodeHelper::diff(const NodeHelper& helper) const
 
     update.propertySets = getDictUpdatedElts(helper._def.propertySets, _def.propertySets);
     update.removePropertySets = getDictRemovedElts(helper._def.propertySets, _def.propertySets);
-    
+
     ServerInstanceHelperDict updated = getDictUpdatedElts(helper._serverInstances, _serverInstances);
     for(ServerInstanceHelperDict::const_iterator p = updated.begin(); p != updated.end(); ++p)
     {
@@ -2301,7 +2334,7 @@ NodeHelper::update(const NodeUpdateDescriptor& update, const Resolver& appResolv
     def.propertySets = updateDictElts(_def.propertySets, update.propertySets, update.removePropertySets);
     def.loadFactor = update.loadFactor ? update.loadFactor->value : _def.loadFactor;
     def.description = update.description ? update.description->value : _def.description;
-    
+
     //
     // NOTE: It's important to create the resolver *after* updating
     // the node variables!
@@ -2335,7 +2368,7 @@ NodeHelper::update(const NodeUpdateDescriptor& update, const Resolver& appResolv
         if(removed.find(r->first) != removed.end() || added.find(r->first) != added.end())
         {
             continue;
-        } 
+        }
 
         //
         // Re-instantiate the server. Make sure the server ID didn't
@@ -2360,13 +2393,13 @@ NodeHelper::update(const NodeUpdateDescriptor& update, const Resolver& appResolv
             resolve.exception("duplicate server `" + helper.getId() + "' in node `" + _name + "'");
         }
         def.servers.push_back(helper.getServerDefinition());
-    }    
+    }
     for(ServerInstanceHelperDict::const_iterator r = _servers.begin(); r != _servers.end(); ++r)
     {
         if(removed.find(r->first) != removed.end() || added.find(r->first) != added.end())
         {
             continue;
-        } 
+        }
 
         //
         // Re-instantiate the server. Make sure the server ID didn't
@@ -2376,9 +2409,9 @@ NodeHelper::update(const NodeUpdateDescriptor& update, const Resolver& appResolv
         ServerInstanceHelper helper(r->second.getServerDefinition(), resolve, false);
         if(helper.getId() != r->first)
         {
-            resolve.exception("invalid update in node `" + _name + "':\nserver instance id `" + r->first + 
+            resolve.exception("invalid update in node `" + _name + "':\nserver instance id `" + r->first +
                               "' changed to `" + helper.getId() + "'");
-        }       
+        }
         def.servers.push_back(helper.getServerDefinition());
     }
     return def;
@@ -2397,7 +2430,7 @@ NodeHelper::getIds(multiset<string>& serverIds, multiset<string>& adapterIds, mu
     {
         serverIds.insert(p->first);
         p->second.getIds(adapterIds, objectIds);
-    }    
+    }
 }
 
 void
@@ -2411,7 +2444,7 @@ NodeHelper::getReplicaGroups(set<string>& replicaGroups) const
     for(ServerInstanceHelperDict::const_iterator p = _servers.begin(); p != _servers.end(); ++p)
     {
         p->second.getReplicaGroups(replicaGroups);
-    }    
+    }
 }
 
 const NodeDescriptor&
@@ -2560,7 +2593,7 @@ NodeHelper::print(Output& out) const
         out << eb;
         return;
     }
-    
+
     out << nl << "servers";
     out << sb;
     for(ServerInstanceHelperDict::const_iterator p = _serverInstances.begin(); p != _serverInstances.end(); ++p)
@@ -2584,7 +2617,7 @@ NodeHelper::printDiff(Output& out, const NodeHelper& helper) const
     Ice::StringSeq removed1 = getDictRemovedElts(helper._serverInstances, _serverInstances);
     ServerInstanceHelperDict updated2 = getDictUpdatedElts(helper._servers, _servers);
     Ice::StringSeq removed2 = getDictRemovedElts(helper._servers, _servers);
-    
+
     ServerInstanceHelperDict updated;
     Ice::StringSeq removed;
     updated.insert(updated1.begin(), updated1.end());
@@ -2653,13 +2686,13 @@ NodeHelper::printDiff(Output& out, const NodeHelper& helper) const
         for(Ice::StringSeq::const_iterator q = removed.begin(); q != removed.end(); ++q)
         {
             out << nl << "server `" << *q << "' removed";
-        }    
+        }
         out << eb;
     }
     out << eb;
 }
 
-ApplicationHelper::ApplicationHelper(const Ice::CommunicatorPtr& communicator, 
+ApplicationHelper::ApplicationHelper(const Ice::CommunicatorPtr& communicator,
                                      const ApplicationDescriptor& desc,
                                      bool enableWarning,
                                      bool instantiate) :
@@ -2685,7 +2718,7 @@ ApplicationHelper::ApplicationHelper(const Ice::CommunicatorPtr& communicator,
         _instance.description = resolve(_def.description, "description");
         _instance.distrib = resolve(_def.distrib);
         _instance.propertySets = resolve(_def.propertySets);
-        
+
         for(ReplicaGroupDescriptorSeq::iterator r = _def.replicaGroups.begin(); r != _def.replicaGroups.end(); ++r)
         {
             ReplicaGroupDescriptor desc;
@@ -2721,7 +2754,7 @@ ApplicationHelper::ApplicationHelper(const Ice::CommunicatorPtr& communicator,
             }
             _instance.replicaGroups.push_back(desc);
         }
-        
+
         //
         // Set the named property sets on the resolver. We use the
         // instantiated named property sets here -- named property sets
@@ -2746,7 +2779,7 @@ ApplicationHelper::ApplicationHelper(const Ice::CommunicatorPtr& communicator,
     //
     // If the application is instantiated, ensure the unicity of
     // object ids, adapter ids and server ids.
-    //    
+    //
     if(instantiate)
     {
         multiset<string> serverIds;
@@ -2867,7 +2900,7 @@ ApplicationHelper::update(const ApplicationUpdateDescriptor& updt) const
     def.name = _def.name;
     def.description = updt.description ? updt.description->value : _def.description;
     def.distrib = updt.distrib ? updt.distrib->value : _def.distrib;
-    def.replicaGroups = updateSeqElts(_def.replicaGroups, updt.replicaGroups, updt.removeReplicaGroups, rg);    
+    def.replicaGroups = updateSeqElts(_def.replicaGroups, updt.replicaGroups, updt.removeReplicaGroups, rg);
     def.variables = updateDictElts(_def.variables, updt.variables, updt.removeVariables);
     def.propertySets = updateDictElts(_def.propertySets, updt.propertySets, updt.removePropertySets);
     def.serverTemplates = updateDictElts(_def.serverTemplates, updt.serverTemplates, updt.removeServerTemplates);
@@ -2949,7 +2982,7 @@ ApplicationHelper::getIds(set<string>& serverIds, set<string>& adapterIds, set<I
     multiset<string> sIds;
     multiset<string> aIds;
     multiset<Ice::Identity> oIds;
-    
+
     for(NodeHelperDict::const_iterator p = _nodes.begin(); p != _nodes.end(); ++p)
     {
         p->second.getIds(sIds, aIds, oIds);
@@ -2981,7 +3014,7 @@ ApplicationHelper::getReplicaGroups(set<string>& replicaGroups, set<string>& ada
     {
         p->second.getReplicaGroups(allAdapterReplicaGroups);
     }
-    
+
     //
     // Only return references to replica groups which don't belong to
     // this application.
@@ -3017,7 +3050,7 @@ ApplicationHelper::getServerInfos(const string& uuid, int revision) const
 }
 
 void
-ApplicationHelper::getDistributions(DistributionDescriptor& distribution, 
+ApplicationHelper::getDistributions(DistributionDescriptor& distribution,
                                     vector<string>& nodes,
                                     const string& server) const
 {
@@ -3034,7 +3067,7 @@ ApplicationHelper::getDistributions(DistributionDescriptor& distribution,
                 break;
             }
         }
-        else if(!_instance.distrib.icepatch.empty() && 
+        else if(!_instance.distrib.icepatch.empty() &&
                 ((server.empty() && n->second.hasServers()) || n->second.hasServer(server)))
         {
             nodes.push_back(n->first);
@@ -3064,7 +3097,7 @@ ApplicationHelper::print(Output& out, const ApplicationInfo& info) const
     {
         out << nl << "variables";
         out << sb;
-        for(StringStringDict::const_iterator p = _instance.variables.begin(); p != _instance.variables.end(); 
+        for(StringStringDict::const_iterator p = _instance.variables.begin(); p != _instance.variables.end();
             ++p)
         {
             out << nl << p->first << " = `" << p->second << "'";
@@ -3082,7 +3115,7 @@ ApplicationHelper::print(Output& out, const ApplicationInfo& info) const
             {
                 out << nl << "references = " << toString(q->second.references);
             }
-            for(PropertyDescriptorSeq::const_iterator r = q->second.properties.begin(); 
+            for(PropertyDescriptorSeq::const_iterator r = q->second.properties.begin();
                 r != q->second.properties.end(); ++r)
             {
                 out << nl << r->name << " = `" << r->value << "'";
@@ -3145,7 +3178,7 @@ ApplicationHelper::print(Output& out, const ApplicationInfo& info) const
     {
         out << nl << "server templates";
         out << sb;
-        for(TemplateDescriptorDict::const_iterator p = _instance.serverTemplates.begin(); 
+        for(TemplateDescriptorDict::const_iterator p = _instance.serverTemplates.begin();
             p != _instance.serverTemplates.end(); ++p)
         {
             out << nl << p->first;
@@ -3187,7 +3220,7 @@ ApplicationHelper::printDiff(Output& out, const ApplicationHelper& helper) const
         if(!variables.empty() || !removeVariables.empty())
         {
             out << nl << "variables udpated";
-        }    
+        }
     }
     {
         if(_def.distrib != helper._def.distrib)
@@ -3206,14 +3239,14 @@ ApplicationHelper::printDiff(Output& out, const ApplicationHelper& helper) const
     {
         GetReplicaGroupId rk;
         ReplicaGroupEq req;
-        ReplicaGroupDescriptorSeq updated = 
+        ReplicaGroupDescriptorSeq updated =
             getSeqUpdatedEltsWithEq(helper._def.replicaGroups, _def.replicaGroups, rk, req);
         Ice::StringSeq removed = getSeqRemovedElts(helper._def.replicaGroups, _def.replicaGroups, rk);
         if(!updated.empty() || !removed.empty())
         {
             out << nl << "replica groups";
             out << sb;
-           
+
             for(ReplicaGroupDescriptorSeq::iterator p = updated.begin(); p != updated.end();)
             {
                 ReplicaGroupDescriptorSeq::const_iterator r;
@@ -3369,7 +3402,7 @@ IceGrid::createHelper(const ServerDescriptorPtr& desc)
     }
 }
 
-bool 
+bool
 IceGrid::isServerUpdated(const ServerInfo& lhs, const ServerInfo& rhs, bool ignoreProps)
 {
     if(lhs.node != rhs.node)
diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h
index c1571efcb57..f8ff653e667 100644
--- a/cpp/src/IceGrid/DescriptorHelper.h
+++ b/cpp/src/IceGrid/DescriptorHelper.h
@@ -56,7 +56,7 @@ public:
     TemplateDescriptor getServerTemplate(const std::string&) const;
     TemplateDescriptor getServiceTemplate(const std::string&) const;
     bool hasReplicaGroup(const std::string&) const;
-    
+
     Ice::CommunicatorPtr getCommunicator() const { return _communicator; }
     bool warningEnabled() const { return _enableWarning; }
 
@@ -68,6 +68,7 @@ private:
 
     static std::map<std::string, std::string> getReserved();
     void checkReserved(const std::string&, const std::map<std::string, std::string>&) const;
+    void checkDeprecated(const std::string&) const;
 
     const ApplicationDescriptor* _application;
     const Ice::CommunicatorPtr _communicator;
@@ -78,6 +79,7 @@ private:
     std::map<std::string, std::string> _parameters;
     PropertySetDescriptorDict _propertySets;
     std::map<std::string, std::string> _reserved;
+    std::map<std::string, std::string> _deprecated;
     std::set<std::string> _ignore;
     int _version;
 };
@@ -95,7 +97,7 @@ public:
 
     virtual void getIds(std::multiset<std::string>&, std::multiset<Ice::Identity>&) const;
     virtual void getReplicaGroups(std::set<std::string>&) const;
-    
+
     void print(const Ice::CommunicatorPtr&, IceUtilInternal::Output&) const;
 
 protected:
@@ -106,7 +108,7 @@ protected:
     virtual std::string getProperty(const std::string&) const;
 
     void instantiateImpl(const CommunicatorDescriptorPtr&, const Resolver&) const;
-    
+
 private:
 
     CommunicatorDescriptorPtr _desc;
@@ -121,10 +123,10 @@ public:
     ServiceHelper() { }
 
     virtual bool operator==(const CommunicatorHelper&) const;
-    virtual bool operator!=(const CommunicatorHelper&) const;    
+    virtual bool operator!=(const CommunicatorHelper&) const;
 
     ServiceDescriptorPtr getDescriptor() const;
-    ServiceDescriptorPtr instantiate(const Resolver&, const PropertyDescriptorSeq&, 
+    ServiceDescriptorPtr instantiate(const Resolver&, const PropertyDescriptorSeq&,
                                      const PropertySetDescriptorDict&) const;
 
     void print(const Ice::CommunicatorPtr&, IceUtilInternal::Output&) const;
@@ -137,7 +139,7 @@ protected:
                          const PropertySetDescriptorDict&) const;
 
 private:
-    
+
     ServiceDescriptorPtr _desc;
 };
 
@@ -149,7 +151,7 @@ public:
     ServerHelper() { }
 
     virtual bool operator==(const CommunicatorHelper&) const;
-    virtual bool operator!=(const CommunicatorHelper&) const;    
+    virtual bool operator!=(const CommunicatorHelper&) const;
 
     ServerDescriptorPtr getDescriptor() const;
     virtual ServerDescriptorPtr instantiate(const Resolver&, const PropertyDescriptorSeq&,
@@ -166,7 +168,7 @@ protected:
     void instantiateImpl(const ServerDescriptorPtr&, const Resolver&, const PropertyDescriptorSeq&) const;
 
 private:
-    
+
     ServerDescriptorPtr _desc;
 };
 typedef IceUtil::Handle<ServerHelper> ServerHelperPtr;
@@ -175,8 +177,8 @@ class InstanceHelper
 {
 protected:
 
-    std::map<std::string, std::string> instantiateParams(const Resolver&, 
-                                                         const std::string&, 
+    std::map<std::string, std::string> instantiateParams(const Resolver&,
+                                                         const std::string&,
                                                          const std::map<std::string, std::string>&,
                                                          const std::vector<std::string>&,
                                                          const std::map<std::string, std::string>&) const;
@@ -199,7 +201,7 @@ public:
     void print(const Ice::CommunicatorPtr&, IceUtilInternal::Output&) const;
 
 private:
-    
+
     ServiceInstanceDescriptor _def;
     mutable ServiceHelper _service;
 };
@@ -213,9 +215,9 @@ public:
     IceBoxHelper() { }
 
     virtual bool operator==(const CommunicatorHelper&) const;
-    virtual bool operator!=(const CommunicatorHelper&) const;    
+    virtual bool operator!=(const CommunicatorHelper&) const;
 
-    virtual ServerDescriptorPtr instantiate(const Resolver&, const PropertyDescriptorSeq&, 
+    virtual ServerDescriptorPtr instantiate(const Resolver&, const PropertyDescriptorSeq&,
                                             const PropertySetDescriptorDict&) const;
 
     virtual void getIds(std::multiset<std::string>&, std::multiset<Ice::Identity>&) const;
@@ -234,7 +236,7 @@ protected:
                          const PropertySetDescriptorDict&) const;
 
 private:
-    
+
     IceBoxDescriptorPtr _desc;
 
     std::vector<ServiceInstanceHelper> _services;
@@ -246,7 +248,7 @@ public:
 
     ServerInstanceHelper(const ServerInstanceDescriptor&, const Resolver&, bool);
     ServerInstanceHelper(const ServerDescriptorPtr&, const Resolver&, bool);
-    
+
     bool operator==(const ServerInstanceHelper&) const;
     bool operator!=(const ServerInstanceHelper&) const;
 
@@ -301,7 +303,7 @@ private:
     NodeDescriptor instantiate(const Resolver&) const;
 
     std::string _name;
-    NodeDescriptor _def;    
+    NodeDescriptor _def;
     NodeDescriptor _instance;
     bool _instantiated;
 
diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp
index d7aa96978c6..a10ceeee3fc 100644
--- a/cpp/src/IceGrid/Grammar.cpp
+++ b/cpp/src/IceGrid/Grammar.cpp
@@ -1,23 +1,24 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
+
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -28,7 +29,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -46,7 +47,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -54,21 +55,106 @@
 /* Pure parsers.  */
 #define YYPURE 1
 
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
 
 
-/* Copy the first part of user declarations.  */
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ICE_GRID_HELP = 258,
+     ICE_GRID_EXIT = 259,
+     ICE_GRID_APPLICATION = 260,
+     ICE_GRID_NODE = 261,
+     ICE_GRID_REGISTRY = 262,
+     ICE_GRID_SERVER = 263,
+     ICE_GRID_ADAPTER = 264,
+     ICE_GRID_PING = 265,
+     ICE_GRID_LOAD = 266,
+     ICE_GRID_SOCKETS = 267,
+     ICE_GRID_ADD = 268,
+     ICE_GRID_REMOVE = 269,
+     ICE_GRID_LIST = 270,
+     ICE_GRID_SHUTDOWN = 271,
+     ICE_GRID_STRING = 272,
+     ICE_GRID_START = 273,
+     ICE_GRID_STOP = 274,
+     ICE_GRID_PATCH = 275,
+     ICE_GRID_SIGNAL = 276,
+     ICE_GRID_STDOUT = 277,
+     ICE_GRID_STDERR = 278,
+     ICE_GRID_DESCRIBE = 279,
+     ICE_GRID_PROPERTIES = 280,
+     ICE_GRID_PROPERTY = 281,
+     ICE_GRID_STATE = 282,
+     ICE_GRID_PID = 283,
+     ICE_GRID_ENDPOINTS = 284,
+     ICE_GRID_ACTIVATION = 285,
+     ICE_GRID_OBJECT = 286,
+     ICE_GRID_FIND = 287,
+     ICE_GRID_SHOW = 288,
+     ICE_GRID_COPYING = 289,
+     ICE_GRID_WARRANTY = 290,
+     ICE_GRID_DIFF = 291,
+     ICE_GRID_UPDATE = 292,
+     ICE_GRID_INSTANTIATE = 293,
+     ICE_GRID_TEMPLATE = 294,
+     ICE_GRID_SERVICE = 295,
+     ICE_GRID_ENABLE = 296,
+     ICE_GRID_DISABLE = 297
+   };
+#endif
+/* Tokens.  */
+#define ICE_GRID_HELP 258
+#define ICE_GRID_EXIT 259
+#define ICE_GRID_APPLICATION 260
+#define ICE_GRID_NODE 261
+#define ICE_GRID_REGISTRY 262
+#define ICE_GRID_SERVER 263
+#define ICE_GRID_ADAPTER 264
+#define ICE_GRID_PING 265
+#define ICE_GRID_LOAD 266
+#define ICE_GRID_SOCKETS 267
+#define ICE_GRID_ADD 268
+#define ICE_GRID_REMOVE 269
+#define ICE_GRID_LIST 270
+#define ICE_GRID_SHUTDOWN 271
+#define ICE_GRID_STRING 272
+#define ICE_GRID_START 273
+#define ICE_GRID_STOP 274
+#define ICE_GRID_PATCH 275
+#define ICE_GRID_SIGNAL 276
+#define ICE_GRID_STDOUT 277
+#define ICE_GRID_STDERR 278
+#define ICE_GRID_DESCRIBE 279
+#define ICE_GRID_PROPERTIES 280
+#define ICE_GRID_PROPERTY 281
+#define ICE_GRID_STATE 282
+#define ICE_GRID_PID 283
+#define ICE_GRID_ENDPOINTS 284
+#define ICE_GRID_ACTIVATION 285
+#define ICE_GRID_OBJECT 286
+#define ICE_GRID_FIND 287
+#define ICE_GRID_SHOW 288
+#define ICE_GRID_COPYING 289
+#define ICE_GRID_WARRANTY 290
+#define ICE_GRID_DIFF 291
+#define ICE_GRID_UPDATE 292
+#define ICE_GRID_INSTANTIATE 293
+#define ICE_GRID_TEMPLATE 294
+#define ICE_GRID_SERVICE 295
+#define ICE_GRID_ENABLE 296
+#define ICE_GRID_DISABLE 297
 
-/* Line 189 of yacc.c  */
-#line 1 "Grammar.y"
+
+
+
+/* Copy the first part of user declarations.  */
+#line 1 "src/IceGrid/Grammar.y"
 
 
 // **********************************************************************
@@ -110,9 +196,6 @@ yyerror(const char* s)
 
 
 
-/* Line 189 of yacc.c  */
-#line 115 "Grammar.tab.c"
-
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 1
@@ -131,71 +214,20 @@ yyerror(const char* s)
 # define YYTOKEN_TABLE 0
 #endif
 
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ICE_GRID_HELP = 258,
-     ICE_GRID_EXIT = 259,
-     ICE_GRID_APPLICATION = 260,
-     ICE_GRID_NODE = 261,
-     ICE_GRID_REGISTRY = 262,
-     ICE_GRID_SERVER = 263,
-     ICE_GRID_ADAPTER = 264,
-     ICE_GRID_PING = 265,
-     ICE_GRID_LOAD = 266,
-     ICE_GRID_SOCKETS = 267,
-     ICE_GRID_ADD = 268,
-     ICE_GRID_REMOVE = 269,
-     ICE_GRID_LIST = 270,
-     ICE_GRID_SHUTDOWN = 271,
-     ICE_GRID_STRING = 272,
-     ICE_GRID_START = 273,
-     ICE_GRID_STOP = 274,
-     ICE_GRID_PATCH = 275,
-     ICE_GRID_SIGNAL = 276,
-     ICE_GRID_STDOUT = 277,
-     ICE_GRID_STDERR = 278,
-     ICE_GRID_DESCRIBE = 279,
-     ICE_GRID_PROPERTIES = 280,
-     ICE_GRID_PROPERTY = 281,
-     ICE_GRID_STATE = 282,
-     ICE_GRID_PID = 283,
-     ICE_GRID_ENDPOINTS = 284,
-     ICE_GRID_ACTIVATION = 285,
-     ICE_GRID_OBJECT = 286,
-     ICE_GRID_FIND = 287,
-     ICE_GRID_SHOW = 288,
-     ICE_GRID_COPYING = 289,
-     ICE_GRID_WARRANTY = 290,
-     ICE_GRID_DIFF = 291,
-     ICE_GRID_UPDATE = 292,
-     ICE_GRID_INSTANTIATE = 293,
-     ICE_GRID_TEMPLATE = 294,
-     ICE_GRID_SERVICE = 295,
-     ICE_GRID_ENABLE = 296,
-     ICE_GRID_DISABLE = 297
-   };
-#endif
-
-
-
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
+
 /* Copy the second part of user declarations.  */
 
 
-/* Line 264 of yacc.c  */
-#line 199 "Grammar.tab.c"
+/* Line 216 of yacc.c.  */
+#line 231 "src/IceGrid/Grammar.cpp"
 
 #ifdef short
 # undef short
@@ -245,7 +277,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -270,14 +302,14 @@ typedef short int yytype_int16;
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int yyi)
+YYID (int i)
 #else
 static int
-YYID (yyi)
-    int yyi;
+YYID (i)
+    int i;
 #endif
 {
-  return yyi;
+  return i;
 }
 #endif
 
@@ -358,9 +390,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-};
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -394,12 +426,12 @@ union yyalloc
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+# define YYSTACK_RELOCATE(Stack)					\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -1421,7 +1453,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -1532,20 +1564,17 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
 
@@ -1579,11 +1608,11 @@ yy_reduce_print (yyvsp, yyrule)
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       		       );
-      YYFPRINTF (stderr, "\n");
+      fprintf (stderr, "\n");
     }
 }
 
@@ -1863,8 +1892,10 @@ yydestruct (yymsg, yytype, yyvaluep)
 	break;
     }
 }
+
 
 /* Prevent warnings from -Wmissing-prototypes.  */
+
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
@@ -1883,9 +1914,10 @@ int yyparse ();
 
 
 
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+
+/*----------.
+| yyparse.  |
+`----------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1909,46 +1941,22 @@ yyparse ()
 #endif
 #endif
 {
-/* The lookahead symbol.  */
+  /* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
-    /* Number of syntax errors so far.  */
-    int yynerrs;
-
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-
-       Refer to the stacks thru separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    YYSIZE_T yystacksize;
+/* Number of syntax errors so far.  */
+int yynerrs;
 
+  int yystate;
   int yyn;
   int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
@@ -1956,28 +1964,51 @@ YYSTYPE yylval;
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
+
   yyssp = yyss;
   yyvsp = yyvs;
 
@@ -2007,6 +2038,7 @@ YYSTYPE yylval;
 	YYSTYPE *yyvs1 = yyvs;
 	yytype_int16 *yyss1 = yyss;
 
+
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
@@ -2014,6 +2046,7 @@ YYSTYPE yylval;
 	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
+
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -2036,8 +2069,9 @@ YYSTYPE yylval;
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -2048,6 +2082,7 @@ YYSTYPE yylval;
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
+
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -2057,9 +2092,6 @@ YYSTYPE yylval;
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
   goto yybackup;
 
 /*-----------.
@@ -2068,16 +2100,16 @@ YYSTYPE yylval;
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
+     look-ahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -2109,16 +2141,20 @@ yybackup:
       goto yyreduce;
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the lookahead token.  */
+  /* Shift the look-ahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
 
   yystate = yyn;
   *++yyvsp = yylval;
@@ -2158,1049 +2194,815 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-
-/* Line 1455 of yacc.c  */
-#line 96 "Grammar.y"
+#line 96 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 3:
-
-/* Line 1455 of yacc.c  */
-#line 99 "Grammar.y"
+#line 99 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 4:
-
-/* Line 1455 of yacc.c  */
-#line 107 "Grammar.y"
+#line 107 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 5:
-
-/* Line 1455 of yacc.c  */
-#line 110 "Grammar.y"
+#line 110 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 6:
-
-/* Line 1455 of yacc.c  */
-#line 116 "Grammar.y"
+#line 116 "src/IceGrid/Grammar.y"
     {
     parser->checkInterrupted();
 ;}
     break;
 
   case 7:
-
-/* Line 1455 of yacc.c  */
-#line 125 "Grammar.y"
+#line 125 "src/IceGrid/Grammar.y"
     {
     parser->usage();
 ;}
     break;
 
   case 8:
-
-/* Line 1455 of yacc.c  */
-#line 129 "Grammar.y"
+#line 129 "src/IceGrid/Grammar.y"
     {
     return 0;
 ;}
     break;
 
   case 9:
-
-/* Line 1455 of yacc.c  */
-#line 133 "Grammar.y"
+#line 133 "src/IceGrid/Grammar.y"
     {
     parser->addApplication((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 10:
-
-/* Line 1455 of yacc.c  */
-#line 137 "Grammar.y"
+#line 137 "src/IceGrid/Grammar.y"
     {
     parser->usage("application", "add");
 ;}
     break;
 
   case 11:
-
-/* Line 1455 of yacc.c  */
-#line 141 "Grammar.y"
+#line 141 "src/IceGrid/Grammar.y"
     {
     parser->removeApplication((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 12:
-
-/* Line 1455 of yacc.c  */
-#line 145 "Grammar.y"
+#line 145 "src/IceGrid/Grammar.y"
     {
     parser->usage("application", "remove");
 ;}
     break;
 
   case 13:
-
-/* Line 1455 of yacc.c  */
-#line 149 "Grammar.y"
+#line 149 "src/IceGrid/Grammar.y"
     {
     parser->diffApplication((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 14:
-
-/* Line 1455 of yacc.c  */
-#line 153 "Grammar.y"
+#line 153 "src/IceGrid/Grammar.y"
     {
     parser->usage("application", "diff");
 ;}
     break;
 
   case 15:
-
-/* Line 1455 of yacc.c  */
-#line 157 "Grammar.y"
+#line 157 "src/IceGrid/Grammar.y"
     {
     parser->updateApplication((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 16:
-
-/* Line 1455 of yacc.c  */
-#line 161 "Grammar.y"
+#line 161 "src/IceGrid/Grammar.y"
     {
     parser->usage("application", "update");
 ;}
     break;
 
   case 17:
-
-/* Line 1455 of yacc.c  */
-#line 165 "Grammar.y"
+#line 165 "src/IceGrid/Grammar.y"
     {
     parser->describeApplication((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 18:
-
-/* Line 1455 of yacc.c  */
-#line 169 "Grammar.y"
+#line 169 "src/IceGrid/Grammar.y"
     {
     parser->usage("application", "describe");
 ;}
     break;
 
   case 19:
-
-/* Line 1455 of yacc.c  */
-#line 173 "Grammar.y"
+#line 173 "src/IceGrid/Grammar.y"
     {
     parser->patchApplication((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 20:
-
-/* Line 1455 of yacc.c  */
-#line 177 "Grammar.y"
+#line 177 "src/IceGrid/Grammar.y"
     {
     parser->usage("application", "patch");
 ;}
     break;
 
   case 21:
-
-/* Line 1455 of yacc.c  */
-#line 181 "Grammar.y"
+#line 181 "src/IceGrid/Grammar.y"
     {
     parser->listAllApplications((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 22:
-
-/* Line 1455 of yacc.c  */
-#line 185 "Grammar.y"
+#line 185 "src/IceGrid/Grammar.y"
     {
     parser->usage("application", "list");
 ;}
     break;
 
   case 23:
-
-/* Line 1455 of yacc.c  */
-#line 189 "Grammar.y"
+#line 189 "src/IceGrid/Grammar.y"
     {
     parser->describeServerTemplate((yyvsp[(4) - (5)]));
 ;}
     break;
 
   case 24:
-
-/* Line 1455 of yacc.c  */
-#line 193 "Grammar.y"
+#line 193 "src/IceGrid/Grammar.y"
     {
     parser->usage("server template", "describe");
 ;}
     break;
 
   case 25:
-
-/* Line 1455 of yacc.c  */
-#line 197 "Grammar.y"
+#line 197 "src/IceGrid/Grammar.y"
     {
     parser->instantiateServerTemplate((yyvsp[(4) - (5)]));
 ;}
     break;
 
   case 26:
-
-/* Line 1455 of yacc.c  */
-#line 201 "Grammar.y"
+#line 201 "src/IceGrid/Grammar.y"
     {
     parser->usage("server template", "instantiate");
 ;}
     break;
 
   case 27:
-
-/* Line 1455 of yacc.c  */
-#line 205 "Grammar.y"
+#line 205 "src/IceGrid/Grammar.y"
     {
     parser->usage("server template");
 ;}
     break;
 
   case 28:
-
-/* Line 1455 of yacc.c  */
-#line 209 "Grammar.y"
+#line 209 "src/IceGrid/Grammar.y"
     {
     parser->describeServiceTemplate((yyvsp[(4) - (5)]));
 ;}
     break;
 
   case 29:
-
-/* Line 1455 of yacc.c  */
-#line 213 "Grammar.y"
+#line 213 "src/IceGrid/Grammar.y"
     {
     parser->usage("service template", "describe");
 ;}
     break;
 
   case 30:
-
-/* Line 1455 of yacc.c  */
-#line 217 "Grammar.y"
+#line 217 "src/IceGrid/Grammar.y"
     {
     parser->usage("service template");
 ;}
     break;
 
   case 31:
-
-/* Line 1455 of yacc.c  */
-#line 221 "Grammar.y"
+#line 221 "src/IceGrid/Grammar.y"
     {
     parser->describeNode((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 32:
-
-/* Line 1455 of yacc.c  */
-#line 225 "Grammar.y"
+#line 225 "src/IceGrid/Grammar.y"
     {
     parser->usage("node", "describe");
 ;}
     break;
 
   case 33:
-
-/* Line 1455 of yacc.c  */
-#line 229 "Grammar.y"
+#line 229 "src/IceGrid/Grammar.y"
     {
     parser->pingNode((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 34:
-
-/* Line 1455 of yacc.c  */
-#line 233 "Grammar.y"
+#line 233 "src/IceGrid/Grammar.y"
     {
     parser->usage("node", "ping");
 ;}
     break;
 
   case 35:
-
-/* Line 1455 of yacc.c  */
-#line 237 "Grammar.y"
+#line 237 "src/IceGrid/Grammar.y"
     {
     parser->printLoadNode((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 36:
-
-/* Line 1455 of yacc.c  */
-#line 241 "Grammar.y"
+#line 241 "src/IceGrid/Grammar.y"
     {
     parser->usage("node", "load");
 ;}
     break;
 
   case 37:
-
-/* Line 1455 of yacc.c  */
-#line 245 "Grammar.y"
+#line 245 "src/IceGrid/Grammar.y"
     {
     parser->printNodeProcessorSockets((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 38:
-
-/* Line 1455 of yacc.c  */
-#line 249 "Grammar.y"
+#line 249 "src/IceGrid/Grammar.y"
     {
     parser->usage("node", "sockets");
 ;}
     break;
 
   case 39:
-
-/* Line 1455 of yacc.c  */
-#line 253 "Grammar.y"
+#line 253 "src/IceGrid/Grammar.y"
     {
     parser->shutdownNode((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 40:
-
-/* Line 1455 of yacc.c  */
-#line 257 "Grammar.y"
+#line 257 "src/IceGrid/Grammar.y"
     {
     parser->usage("node", "shutdown");
 ;}
     break;
 
   case 41:
-
-/* Line 1455 of yacc.c  */
-#line 261 "Grammar.y"
+#line 261 "src/IceGrid/Grammar.y"
     {
     parser->listAllNodes((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 42:
-
-/* Line 1455 of yacc.c  */
-#line 265 "Grammar.y"
+#line 265 "src/IceGrid/Grammar.y"
     {
     parser->usage("node", "list");
 ;}
     break;
 
   case 43:
-
-/* Line 1455 of yacc.c  */
-#line 269 "Grammar.y"
+#line 269 "src/IceGrid/Grammar.y"
     {
     parser->show("node", (yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 44:
-
-/* Line 1455 of yacc.c  */
-#line 273 "Grammar.y"
+#line 273 "src/IceGrid/Grammar.y"
     {
     parser->usage("node", "show");
 ;}
     break;
 
   case 45:
-
-/* Line 1455 of yacc.c  */
-#line 277 "Grammar.y"
+#line 277 "src/IceGrid/Grammar.y"
     {
     parser->describeRegistry((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 46:
-
-/* Line 1455 of yacc.c  */
-#line 281 "Grammar.y"
+#line 281 "src/IceGrid/Grammar.y"
     {
     parser->usage("registry", "describe");
 ;}
     break;
 
   case 47:
-
-/* Line 1455 of yacc.c  */
-#line 285 "Grammar.y"
+#line 285 "src/IceGrid/Grammar.y"
     {
     parser->pingRegistry((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 48:
-
-/* Line 1455 of yacc.c  */
-#line 289 "Grammar.y"
+#line 289 "src/IceGrid/Grammar.y"
     {
     parser->usage("registry", "ping");
 ;}
     break;
 
   case 49:
-
-/* Line 1455 of yacc.c  */
-#line 293 "Grammar.y"
+#line 293 "src/IceGrid/Grammar.y"
     {
     parser->shutdownRegistry((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 50:
-
-/* Line 1455 of yacc.c  */
-#line 297 "Grammar.y"
+#line 297 "src/IceGrid/Grammar.y"
     {
     parser->usage("registry", "shutdown");
 ;}
     break;
 
   case 51:
-
-/* Line 1455 of yacc.c  */
-#line 301 "Grammar.y"
+#line 301 "src/IceGrid/Grammar.y"
     {
     parser->listAllRegistries((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 52:
-
-/* Line 1455 of yacc.c  */
-#line 305 "Grammar.y"
+#line 305 "src/IceGrid/Grammar.y"
     {
     parser->usage("registry", "list");
 ;}
     break;
 
   case 53:
-
-/* Line 1455 of yacc.c  */
-#line 309 "Grammar.y"
+#line 309 "src/IceGrid/Grammar.y"
     {
     parser->show("registry", (yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 54:
-
-/* Line 1455 of yacc.c  */
-#line 313 "Grammar.y"
+#line 313 "src/IceGrid/Grammar.y"
     {
     parser->usage("registry", "show");
 ;}
     break;
 
   case 55:
-
-/* Line 1455 of yacc.c  */
-#line 317 "Grammar.y"
+#line 317 "src/IceGrid/Grammar.y"
     {
     parser->removeServer((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 56:
-
-/* Line 1455 of yacc.c  */
-#line 321 "Grammar.y"
+#line 321 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "remove");
 ;}
     break;
 
   case 57:
-
-/* Line 1455 of yacc.c  */
-#line 325 "Grammar.y"
+#line 325 "src/IceGrid/Grammar.y"
     {
     parser->describeServer((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 58:
-
-/* Line 1455 of yacc.c  */
-#line 329 "Grammar.y"
+#line 329 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "describe");
 ;}
     break;
 
   case 59:
-
-/* Line 1455 of yacc.c  */
-#line 333 "Grammar.y"
+#line 333 "src/IceGrid/Grammar.y"
     {
     parser->startServer((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 60:
-
-/* Line 1455 of yacc.c  */
-#line 337 "Grammar.y"
+#line 337 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "start");
 ;}
     break;
 
   case 61:
-
-/* Line 1455 of yacc.c  */
-#line 341 "Grammar.y"
+#line 341 "src/IceGrid/Grammar.y"
     {
     parser->stopServer((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 62:
-
-/* Line 1455 of yacc.c  */
-#line 345 "Grammar.y"
+#line 345 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "stop");
 ;}
     break;
 
   case 63:
-
-/* Line 1455 of yacc.c  */
-#line 349 "Grammar.y"
+#line 349 "src/IceGrid/Grammar.y"
     {
     parser->patchServer((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 64:
-
-/* Line 1455 of yacc.c  */
-#line 353 "Grammar.y"
+#line 353 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "patch");
 ;}
     break;
 
   case 65:
-
-/* Line 1455 of yacc.c  */
-#line 357 "Grammar.y"
+#line 357 "src/IceGrid/Grammar.y"
     {
     parser->signalServer((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 66:
-
-/* Line 1455 of yacc.c  */
-#line 361 "Grammar.y"
+#line 361 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "signal");
 ;}
     break;
 
   case 67:
-
-/* Line 1455 of yacc.c  */
-#line 365 "Grammar.y"
+#line 365 "src/IceGrid/Grammar.y"
     {
     parser->writeMessage((yyvsp[(3) - (4)]), 1);
 ;}
     break;
 
   case 68:
-
-/* Line 1455 of yacc.c  */
-#line 369 "Grammar.y"
+#line 369 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "stdout");
 ;}
     break;
 
   case 69:
-
-/* Line 1455 of yacc.c  */
-#line 373 "Grammar.y"
+#line 373 "src/IceGrid/Grammar.y"
     {
     parser->writeMessage((yyvsp[(3) - (4)]), 2);
 ;}
     break;
 
   case 70:
-
-/* Line 1455 of yacc.c  */
-#line 377 "Grammar.y"
+#line 377 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "stderr");
 ;}
     break;
 
   case 71:
-
-/* Line 1455 of yacc.c  */
-#line 381 "Grammar.y"
+#line 381 "src/IceGrid/Grammar.y"
     {
     parser->stateServer((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 72:
-
-/* Line 1455 of yacc.c  */
-#line 385 "Grammar.y"
+#line 385 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "start");
 ;}
     break;
 
   case 73:
-
-/* Line 1455 of yacc.c  */
-#line 389 "Grammar.y"
+#line 389 "src/IceGrid/Grammar.y"
     {
     parser->pidServer((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 74:
-
-/* Line 1455 of yacc.c  */
-#line 393 "Grammar.y"
+#line 393 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "pid");
 ;}
     break;
 
   case 75:
-
-/* Line 1455 of yacc.c  */
-#line 397 "Grammar.y"
+#line 397 "src/IceGrid/Grammar.y"
     {
     parser->propertiesServer((yyvsp[(3) - (4)]), false);
 ;}
     break;
 
   case 76:
-
-/* Line 1455 of yacc.c  */
-#line 401 "Grammar.y"
+#line 401 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "properties");
 ;}
     break;
 
   case 77:
-
-/* Line 1455 of yacc.c  */
-#line 405 "Grammar.y"
+#line 405 "src/IceGrid/Grammar.y"
     {
     parser->propertiesServer((yyvsp[(3) - (4)]), true);
 ;}
     break;
 
   case 78:
-
-/* Line 1455 of yacc.c  */
-#line 409 "Grammar.y"
+#line 409 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "property");
 ;}
     break;
 
   case 79:
-
-/* Line 1455 of yacc.c  */
-#line 413 "Grammar.y"
+#line 413 "src/IceGrid/Grammar.y"
     {
     parser->enableServer((yyvsp[(3) - (4)]), true);
 ;}
     break;
 
   case 80:
-
-/* Line 1455 of yacc.c  */
-#line 417 "Grammar.y"
+#line 417 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "enable");
 ;}
     break;
 
   case 81:
-
-/* Line 1455 of yacc.c  */
-#line 421 "Grammar.y"
+#line 421 "src/IceGrid/Grammar.y"
     {
     parser->enableServer((yyvsp[(3) - (4)]), false);
 ;}
     break;
 
   case 82:
-
-/* Line 1455 of yacc.c  */
-#line 425 "Grammar.y"
+#line 425 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "disable");
 ;}
     break;
 
   case 83:
-
-/* Line 1455 of yacc.c  */
-#line 429 "Grammar.y"
+#line 429 "src/IceGrid/Grammar.y"
     {
     parser->listAllServers((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 84:
-
-/* Line 1455 of yacc.c  */
-#line 433 "Grammar.y"
+#line 433 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "list");
 ;}
     break;
 
   case 85:
-
-/* Line 1455 of yacc.c  */
-#line 437 "Grammar.y"
+#line 437 "src/IceGrid/Grammar.y"
     {
     parser->show("server", (yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 86:
-
-/* Line 1455 of yacc.c  */
-#line 441 "Grammar.y"
+#line 441 "src/IceGrid/Grammar.y"
     {
     parser->usage("server", "show");
 ;}
     break;
 
   case 87:
-
-/* Line 1455 of yacc.c  */
-#line 445 "Grammar.y"
+#line 445 "src/IceGrid/Grammar.y"
     {
     parser->startService((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 88:
-
-/* Line 1455 of yacc.c  */
-#line 449 "Grammar.y"
+#line 449 "src/IceGrid/Grammar.y"
     {
     parser->usage("service", "start");
 ;}
     break;
 
   case 89:
-
-/* Line 1455 of yacc.c  */
-#line 453 "Grammar.y"
+#line 453 "src/IceGrid/Grammar.y"
     {
     parser->stopService((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 90:
-
-/* Line 1455 of yacc.c  */
-#line 457 "Grammar.y"
+#line 457 "src/IceGrid/Grammar.y"
     {
     parser->usage("service", "stop");
 ;}
     break;
 
   case 91:
-
-/* Line 1455 of yacc.c  */
-#line 461 "Grammar.y"
+#line 461 "src/IceGrid/Grammar.y"
     {
     parser->describeService((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 92:
-
-/* Line 1455 of yacc.c  */
-#line 465 "Grammar.y"
+#line 465 "src/IceGrid/Grammar.y"
     {
     parser->usage("service", "describe");
 ;}
     break;
 
   case 93:
-
-/* Line 1455 of yacc.c  */
-#line 469 "Grammar.y"
+#line 469 "src/IceGrid/Grammar.y"
     {
     parser->propertiesService((yyvsp[(3) - (4)]), false);
 ;}
     break;
 
   case 94:
-
-/* Line 1455 of yacc.c  */
-#line 473 "Grammar.y"
+#line 473 "src/IceGrid/Grammar.y"
     {
     parser->usage("service", "properties");
 ;}
     break;
 
   case 95:
-
-/* Line 1455 of yacc.c  */
-#line 477 "Grammar.y"
+#line 477 "src/IceGrid/Grammar.y"
     {
     parser->propertiesService((yyvsp[(3) - (4)]), true);
 ;}
     break;
 
   case 96:
-
-/* Line 1455 of yacc.c  */
-#line 481 "Grammar.y"
+#line 481 "src/IceGrid/Grammar.y"
     {
     parser->usage("service", "property");
 ;}
     break;
 
   case 97:
-
-/* Line 1455 of yacc.c  */
-#line 485 "Grammar.y"
+#line 485 "src/IceGrid/Grammar.y"
     {
     parser->listServices((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 98:
-
-/* Line 1455 of yacc.c  */
-#line 489 "Grammar.y"
+#line 489 "src/IceGrid/Grammar.y"
     {
     parser->usage("service", "list");
 ;}
     break;
 
   case 99:
-
-/* Line 1455 of yacc.c  */
-#line 493 "Grammar.y"
+#line 493 "src/IceGrid/Grammar.y"
     {
     parser->endpointsAdapter((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 100:
-
-/* Line 1455 of yacc.c  */
-#line 497 "Grammar.y"
+#line 497 "src/IceGrid/Grammar.y"
     {
     parser->usage("adapter", "endpoints");
 ;}
     break;
 
   case 101:
-
-/* Line 1455 of yacc.c  */
-#line 501 "Grammar.y"
+#line 501 "src/IceGrid/Grammar.y"
     {
     parser->removeAdapter((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 102:
-
-/* Line 1455 of yacc.c  */
-#line 505 "Grammar.y"
+#line 505 "src/IceGrid/Grammar.y"
     {
     parser->usage("adapter", "remove");
 ;}
     break;
 
   case 103:
-
-/* Line 1455 of yacc.c  */
-#line 509 "Grammar.y"
+#line 509 "src/IceGrid/Grammar.y"
     {
     parser->listAllAdapters((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 104:
-
-/* Line 1455 of yacc.c  */
-#line 513 "Grammar.y"
+#line 513 "src/IceGrid/Grammar.y"
     {
     parser->usage("adapter", "list");
 ;}
     break;
 
   case 105:
-
-/* Line 1455 of yacc.c  */
-#line 517 "Grammar.y"
+#line 517 "src/IceGrid/Grammar.y"
     {
     parser->addObject((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 106:
-
-/* Line 1455 of yacc.c  */
-#line 521 "Grammar.y"
+#line 521 "src/IceGrid/Grammar.y"
     {
     parser->usage("object", "add");
 ;}
     break;
 
   case 107:
-
-/* Line 1455 of yacc.c  */
-#line 525 "Grammar.y"
+#line 525 "src/IceGrid/Grammar.y"
     {
     parser->removeObject((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 108:
-
-/* Line 1455 of yacc.c  */
-#line 529 "Grammar.y"
+#line 529 "src/IceGrid/Grammar.y"
     {
     parser->usage("object", "remove");
 ;}
     break;
 
   case 109:
-
-/* Line 1455 of yacc.c  */
-#line 533 "Grammar.y"
+#line 533 "src/IceGrid/Grammar.y"
     {
     parser->findObject((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 110:
-
-/* Line 1455 of yacc.c  */
-#line 537 "Grammar.y"
+#line 537 "src/IceGrid/Grammar.y"
     {
     parser->usage("object", "find");
 ;}
     break;
 
   case 111:
-
-/* Line 1455 of yacc.c  */
-#line 541 "Grammar.y"
+#line 541 "src/IceGrid/Grammar.y"
     {
     parser->listObject((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 112:
-
-/* Line 1455 of yacc.c  */
-#line 545 "Grammar.y"
+#line 545 "src/IceGrid/Grammar.y"
     {
     parser->usage("object", "list");
 ;}
     break;
 
   case 113:
-
-/* Line 1455 of yacc.c  */
-#line 549 "Grammar.y"
+#line 549 "src/IceGrid/Grammar.y"
     {
     parser->describeObject((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 114:
-
-/* Line 1455 of yacc.c  */
-#line 553 "Grammar.y"
+#line 553 "src/IceGrid/Grammar.y"
     {
     parser->usage("object", "describe");
 ;}
     break;
 
   case 115:
-
-/* Line 1455 of yacc.c  */
-#line 557 "Grammar.y"
+#line 557 "src/IceGrid/Grammar.y"
     {
     parser->showCopying();
 ;}
     break;
 
   case 116:
-
-/* Line 1455 of yacc.c  */
-#line 561 "Grammar.y"
+#line 561 "src/IceGrid/Grammar.y"
     {
     parser->showWarranty();
 ;}
     break;
 
   case 117:
-
-/* Line 1455 of yacc.c  */
-#line 565 "Grammar.y"
+#line 565 "src/IceGrid/Grammar.y"
     {
     parser->usage((yyvsp[(2) - (3)]).front());
 ;}
     break;
 
   case 118:
-
-/* Line 1455 of yacc.c  */
-#line 569 "Grammar.y"
+#line 569 "src/IceGrid/Grammar.y"
     {
     if(((yyvsp[(2) - (4)]).front() == "server" || (yyvsp[(2) - (4)]).front() == "service") && (yyvsp[(3) - (4)]).front() == "template")
     {
@@ -3214,18 +3016,14 @@ yyreduce:
     break;
 
   case 119:
-
-/* Line 1455 of yacc.c  */
-#line 580 "Grammar.y"
+#line 580 "src/IceGrid/Grammar.y"
     {
     parser->usage((yyvsp[(2) - (5)]).front(), (yyvsp[(3) - (5)]).front());
 ;}
     break;
 
   case 120:
-
-/* Line 1455 of yacc.c  */
-#line 584 "Grammar.y"
+#line 584 "src/IceGrid/Grammar.y"
     {
     if(((yyvsp[(2) - (5)]).front() == "server" || (yyvsp[(2) - (5)]).front() == "service") && (yyvsp[(3) - (5)]).front() == "template")
     {
@@ -3239,9 +3037,7 @@ yyreduce:
     break;
 
   case 121:
-
-/* Line 1455 of yacc.c  */
-#line 595 "Grammar.y"
+#line 595 "src/IceGrid/Grammar.y"
     {
     if(((yyvsp[(2) - (6)]).front() == "server" || (yyvsp[(2) - (6)]).front() == "service") && (yyvsp[(3) - (6)]).front() == "template")
     {
@@ -3255,36 +3051,28 @@ yyreduce:
     break;
 
   case 122:
-
-/* Line 1455 of yacc.c  */
-#line 606 "Grammar.y"
+#line 606 "src/IceGrid/Grammar.y"
     {
     parser->usage((yyvsp[(2) - (4)]).front());
 ;}
     break;
 
   case 123:
-
-/* Line 1455 of yacc.c  */
-#line 610 "Grammar.y"
+#line 610 "src/IceGrid/Grammar.y"
     {
     parser->usage();
 ;}
     break;
 
   case 124:
-
-/* Line 1455 of yacc.c  */
-#line 614 "Grammar.y"
+#line 614 "src/IceGrid/Grammar.y"
     {
     parser->usage((yyvsp[(1) - (3)]).front());
 ;}
     break;
 
   case 125:
-
-/* Line 1455 of yacc.c  */
-#line 618 "Grammar.y"
+#line 618 "src/IceGrid/Grammar.y"
     {
     (yyvsp[(1) - (4)]).push_back((yyvsp[(2) - (4)]).front());
     parser->invalidCommand((yyvsp[(1) - (4)]));
@@ -3293,9 +3081,7 @@ yyreduce:
     break;
 
   case 126:
-
-/* Line 1455 of yacc.c  */
-#line 624 "Grammar.y"
+#line 624 "src/IceGrid/Grammar.y"
     {
     parser->invalidCommand((yyvsp[(1) - (3)]));
     yyerrok;
@@ -3303,9 +3089,7 @@ yyreduce:
     break;
 
   case 127:
-
-/* Line 1455 of yacc.c  */
-#line 629 "Grammar.y"
+#line 629 "src/IceGrid/Grammar.y"
     {
     parser->invalidCommand((yyvsp[(1) - (3)]));
     yyerrok;
@@ -3313,26 +3097,20 @@ yyreduce:
     break;
 
   case 128:
-
-/* Line 1455 of yacc.c  */
-#line 634 "Grammar.y"
+#line 634 "src/IceGrid/Grammar.y"
     {
     yyerrok;
 ;}
     break;
 
   case 129:
-
-/* Line 1455 of yacc.c  */
-#line 638 "Grammar.y"
+#line 638 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 130:
-
-/* Line 1455 of yacc.c  */
-#line 647 "Grammar.y"
+#line 647 "src/IceGrid/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
     (yyval).push_front((yyvsp[(1) - (2)]).front());
@@ -3340,9 +3118,7 @@ yyreduce:
     break;
 
   case 131:
-
-/* Line 1455 of yacc.c  */
-#line 652 "Grammar.y"
+#line 652 "src/IceGrid/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
     (yyval).push_front((yyvsp[(1) - (2)]).front());
@@ -3350,9 +3126,7 @@ yyreduce:
     break;
 
   case 132:
-
-/* Line 1455 of yacc.c  */
-#line 657 "Grammar.y"
+#line 657 "src/IceGrid/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (3)]);
     (yyval).push_front("help");
@@ -3361,9 +3135,7 @@ yyreduce:
     break;
 
   case 133:
-
-/* Line 1455 of yacc.c  */
-#line 663 "Grammar.y"
+#line 663 "src/IceGrid/Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (3)]);
     (yyval).push_front("help");
@@ -3372,322 +3144,243 @@ yyreduce:
     break;
 
   case 134:
-
-/* Line 1455 of yacc.c  */
-#line 669 "Grammar.y"
+#line 669 "src/IceGrid/Grammar.y"
     {
     (yyval) = YYSTYPE();
 ;}
     break;
 
   case 135:
-
-/* Line 1455 of yacc.c  */
-#line 678 "Grammar.y"
+#line 678 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 136:
-
-/* Line 1455 of yacc.c  */
-#line 681 "Grammar.y"
+#line 681 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 137:
-
-/* Line 1455 of yacc.c  */
-#line 684 "Grammar.y"
+#line 684 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 138:
-
-/* Line 1455 of yacc.c  */
-#line 687 "Grammar.y"
+#line 687 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 139:
-
-/* Line 1455 of yacc.c  */
-#line 690 "Grammar.y"
+#line 690 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 140:
-
-/* Line 1455 of yacc.c  */
-#line 693 "Grammar.y"
+#line 693 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 141:
-
-/* Line 1455 of yacc.c  */
-#line 696 "Grammar.y"
+#line 696 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 142:
-
-/* Line 1455 of yacc.c  */
-#line 699 "Grammar.y"
+#line 699 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 143:
-
-/* Line 1455 of yacc.c  */
-#line 702 "Grammar.y"
+#line 702 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 144:
-
-/* Line 1455 of yacc.c  */
-#line 705 "Grammar.y"
+#line 705 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 145:
-
-/* Line 1455 of yacc.c  */
-#line 708 "Grammar.y"
+#line 708 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 146:
-
-/* Line 1455 of yacc.c  */
-#line 711 "Grammar.y"
+#line 711 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 147:
-
-/* Line 1455 of yacc.c  */
-#line 714 "Grammar.y"
+#line 714 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 148:
-
-/* Line 1455 of yacc.c  */
-#line 717 "Grammar.y"
+#line 717 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 149:
-
-/* Line 1455 of yacc.c  */
-#line 720 "Grammar.y"
+#line 720 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 150:
-
-/* Line 1455 of yacc.c  */
-#line 723 "Grammar.y"
+#line 723 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 151:
-
-/* Line 1455 of yacc.c  */
-#line 726 "Grammar.y"
+#line 726 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 152:
-
-/* Line 1455 of yacc.c  */
-#line 729 "Grammar.y"
+#line 729 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 153:
-
-/* Line 1455 of yacc.c  */
-#line 732 "Grammar.y"
+#line 732 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 154:
-
-/* Line 1455 of yacc.c  */
-#line 735 "Grammar.y"
+#line 735 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 155:
-
-/* Line 1455 of yacc.c  */
-#line 738 "Grammar.y"
+#line 738 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 156:
-
-/* Line 1455 of yacc.c  */
-#line 741 "Grammar.y"
+#line 741 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 157:
-
-/* Line 1455 of yacc.c  */
-#line 744 "Grammar.y"
+#line 744 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 158:
-
-/* Line 1455 of yacc.c  */
-#line 747 "Grammar.y"
+#line 747 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 159:
-
-/* Line 1455 of yacc.c  */
-#line 750 "Grammar.y"
+#line 750 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 160:
-
-/* Line 1455 of yacc.c  */
-#line 753 "Grammar.y"
+#line 753 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 161:
-
-/* Line 1455 of yacc.c  */
-#line 756 "Grammar.y"
+#line 756 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 162:
-
-/* Line 1455 of yacc.c  */
-#line 759 "Grammar.y"
+#line 759 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 163:
-
-/* Line 1455 of yacc.c  */
-#line 762 "Grammar.y"
+#line 762 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 164:
-
-/* Line 1455 of yacc.c  */
-#line 765 "Grammar.y"
+#line 765 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 165:
-
-/* Line 1455 of yacc.c  */
-#line 768 "Grammar.y"
+#line 768 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 166:
-
-/* Line 1455 of yacc.c  */
-#line 771 "Grammar.y"
+#line 771 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 167:
-
-/* Line 1455 of yacc.c  */
-#line 774 "Grammar.y"
+#line 774 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 168:
-
-/* Line 1455 of yacc.c  */
-#line 777 "Grammar.y"
+#line 777 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 169:
-
-/* Line 1455 of yacc.c  */
-#line 780 "Grammar.y"
+#line 780 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 170:
-
-/* Line 1455 of yacc.c  */
-#line 783 "Grammar.y"
+#line 783 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 171:
-
-/* Line 1455 of yacc.c  */
-#line 786 "Grammar.y"
+#line 786 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
   case 172:
-
-/* Line 1455 of yacc.c  */
-#line 789 "Grammar.y"
+#line 789 "src/IceGrid/Grammar.y"
     {
 ;}
     break;
 
 
-
-/* Line 1455 of yacc.c  */
-#line 3691 "Grammar.tab.c"
+/* Line 1267 of yacc.c.  */
+#line 3384 "src/IceGrid/Grammar.cpp"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -3698,6 +3391,7 @@ yyreduce:
 
   *++yyvsp = yyval;
 
+
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -3762,7 +3456,7 @@ yyerrlab:
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
@@ -3779,7 +3473,7 @@ yyerrlab:
 	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -3836,6 +3530,9 @@ yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   *++yyvsp = yylval;
 
 
@@ -3860,7 +3557,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -3871,7 +3568,7 @@ yyexhaustedlab:
 #endif
 
 yyreturn:
-  if (yychar != YYEMPTY)
+  if (yychar != YYEOF && yychar != YYEMPTY)
      yydestruct ("Cleanup: discarding lookahead",
 		 yytoken, &yylval);
   /* Do not reclaim the symbols of the rule which action triggered
diff --git a/cpp/src/IceGrid/Grammar.h b/cpp/src/IceGrid/Grammar.h
index e39828c6ae7..8739da3d8b5 100644
--- a/cpp/src/IceGrid/Grammar.h
+++ b/cpp/src/IceGrid/Grammar.h
@@ -1,23 +1,24 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
+
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -28,11 +29,10 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -81,16 +81,57 @@
      ICE_GRID_DISABLE = 297
    };
 #endif
+/* Tokens.  */
+#define ICE_GRID_HELP 258
+#define ICE_GRID_EXIT 259
+#define ICE_GRID_APPLICATION 260
+#define ICE_GRID_NODE 261
+#define ICE_GRID_REGISTRY 262
+#define ICE_GRID_SERVER 263
+#define ICE_GRID_ADAPTER 264
+#define ICE_GRID_PING 265
+#define ICE_GRID_LOAD 266
+#define ICE_GRID_SOCKETS 267
+#define ICE_GRID_ADD 268
+#define ICE_GRID_REMOVE 269
+#define ICE_GRID_LIST 270
+#define ICE_GRID_SHUTDOWN 271
+#define ICE_GRID_STRING 272
+#define ICE_GRID_START 273
+#define ICE_GRID_STOP 274
+#define ICE_GRID_PATCH 275
+#define ICE_GRID_SIGNAL 276
+#define ICE_GRID_STDOUT 277
+#define ICE_GRID_STDERR 278
+#define ICE_GRID_DESCRIBE 279
+#define ICE_GRID_PROPERTIES 280
+#define ICE_GRID_PROPERTY 281
+#define ICE_GRID_STATE 282
+#define ICE_GRID_PID 283
+#define ICE_GRID_ENDPOINTS 284
+#define ICE_GRID_ACTIVATION 285
+#define ICE_GRID_OBJECT 286
+#define ICE_GRID_FIND 287
+#define ICE_GRID_SHOW 288
+#define ICE_GRID_COPYING 289
+#define ICE_GRID_WARRANTY 290
+#define ICE_GRID_DIFF 291
+#define ICE_GRID_UPDATE 292
+#define ICE_GRID_INSTANTIATE 293
+#define ICE_GRID_TEMPLATE 294
+#define ICE_GRID_SERVICE 295
+#define ICE_GRID_ENABLE 296
+#define ICE_GRID_DISABLE 297
+
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
 
-
diff --git a/cpp/src/IceGrid/IceGridAdmin.rc b/cpp/src/IceGrid/IceGridAdmin.rc
index 62048527836..1402c1c9d7a 100644
--- a/cpp/src/IceGrid/IceGridAdmin.rc
+++ b/cpp/src/IceGrid/IceGridAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid Admin\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "icegridadmin\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icegridadmin.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridDB.cpp b/cpp/src/IceGrid/IceGridDB.cpp
deleted file mode 100644
index 04cb5828d6f..00000000000
--- a/cpp/src/IceGrid/IceGridDB.cpp
+++ /dev/null
@@ -1,384 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <IceUtil/DisableWarnings.h>
-#include <IceUtil/Options.h>
-#include <IceUtil/FileUtil.h>
-#include <Ice/Application.h>
-#include <Freeze/Freeze.h>
-#include <Freeze/CatalogIndexList.h>
-#include <IceGrid/Admin.h>
-#include <DBTypes.h>
-#include <StringApplicationInfoDict.h>
-#include <StringAdapterInfoDict.h>
-#include <IdentityObjectInfoDict.h>
-#include <SerialsDict.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceGrid;
-
-class Client : public Application
-{
-public:
-
-    void usage();
-    virtual int run(int, char*[]);
-};
-
-#ifdef _WIN32
-
-int
-wmain(int argc, wchar_t* argv[])
-
-#else
-
-int
-main(int argc, char* argv[])
-
-#endif
-{
-    Client app;
-    return app.main(argc, argv);
-}
-
-void
-Client::usage()
-{
-    cerr << "Usage: " << appName() << " <options>\n";
-    cerr <<
-        "Options:\n"
-        "-h, --help             Show this message.\n"
-        "-v, --version          Display version.\n"
-        "--import FILE          Import database from FILE.\n"
-        "--export FILE          Export database to FILE.\n"
-        "--dbhome DIR           The database directory.\n"
-        "-d, --debug            Print debug messages.\n"
-        ;
-}
-
-int
-Client::run(int argc, char* argv[])
-{
-    IceUtilInternal::Options opts;
-    opts.addOpt("h", "help");
-    opts.addOpt("v", "version");
-    opts.addOpt("d", "debug");
-    opts.addOpt("", "import", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "export", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "dbhome", IceUtilInternal::Options::NeedArg);
-
-    vector<string> args;
-    try
-    {
-        args = opts.parse(argc, const_cast<const char**>(argv));
-    }
-    catch(const IceUtilInternal::BadOptException& e)
-    {
-        cerr << argv[0] << ": " << e.reason << endl;
-        usage();
-        return EXIT_FAILURE;
-    }
-    if(!args.empty())
-    {
-        cerr << argv[0] << ": too many arguments" << endl;
-        usage();
-        return EXIT_FAILURE;
-    }
-
-    if(opts.isSet("help"))
-    {
-        usage();
-        return EXIT_SUCCESS;
-    }
-
-    if(opts.isSet("version"))
-    {
-        cout << ICE_STRING_VERSION << endl;
-        return EXIT_SUCCESS;
-    }
-
-    if((!opts.isSet("import") && !opts.isSet("export")) || (opts.isSet("import") && opts.isSet("export")))
-    {
-        cerr << argv[0] << ": either --import or --export must be set" << endl;
-        usage();
-        return EXIT_FAILURE;
-    }
-
-    if(!opts.isSet("dbhome"))
-    {
-        cerr << argv[0] << ": database path must be specified" << endl;
-        usage();
-        return EXIT_FAILURE;
-    }
-
-    bool debug = opts.isSet("debug");
-    bool import = opts.isSet("import");
-    string dbFile = opts.optArg(import ? "import" : "export");
-    string dbPath = opts.optArg("dbhome");
-
-    try
-    {
-        IceGrid::AllData data;
-
-        EncodingVersion encoding; 
-        encoding.major = 1;
-        encoding.minor = 1;
-
-        communicator()->getProperties()->setProperty("Freeze.DbEnv.Registry.DbHome", dbPath);
-
-        if(import)
-        {
-            cout << "Importing database to directory `" << dbPath << "' from file `" << dbFile << "'" << endl;
-
-            if(!IceUtilInternal::directoryExists(dbPath))
-            {
-                cerr << argv[0] << ": output directory does not exist: " << dbPath << endl;
-                return EXIT_FAILURE;
-            }
-
-            if(!IceUtilInternal::isEmptyDirectory(dbPath))
-            {
-                cerr << argv[0] << ": output directory is not empty: " << dbPath << endl;
-                return EXIT_FAILURE;
-            }
-
-            ifstream fs(dbFile.c_str(), ios::binary);
-            if(fs.fail())
-            {
-                cerr << argv[0] << ": could not open input file: " << strerror(errno) << endl;
-                return EXIT_FAILURE;
-            }
-            fs.unsetf(ios::skipws);
-
-            fs.seekg(0, ios::end);
-            streampos fileSize = fs.tellg();
-            fs.seekg(0, ios::beg);
-
-            vector<Ice::Byte> buf;
-            buf.reserve(static_cast<size_t>(fileSize));
-            buf.insert(buf.begin(), istream_iterator<Ice::Byte>(fs), istream_iterator<Ice::Byte>());
-
-            fs.close();
-
-            string type;
-            int version;
-
-            Ice::InputStreamPtr stream = Ice::wrapInputStream(communicator(), buf, encoding);
-            stream->read(type);
-            if(type != "IceGrid")
-            {
-                cerr << argv[0] << ": incorrect input file type: " << type << endl;
-                return EXIT_FAILURE;
-            }
-            stream->read(version);
-            stream->read(data);
-
-            {
-                Freeze::ConnectionPtr connection = Freeze::createConnection(communicator(), "Registry");
-                Freeze::TransactionHolder txn(connection);
-
-                if(debug)
-                {
-                    cout << "Writing Applications Map:" << endl;
-                }
-
-                StringApplicationInfoDict applications(connection, "applications");
-                for(ApplicationInfoSeq::const_iterator p = data.applications.begin();
-                    p != data.applications.end();
-                    ++p)
-                {
-                    if(debug)
-                    {
-                        cout << "  NAME = " << p->descriptor.name << endl;
-                    }
-                    applications.put(StringApplicationInfoDict::value_type(p->descriptor.name, *p));
-                }
-
-
-                if(debug)
-                {
-                    cout << "Writing Adapters Map:" << endl;
-                }
-
-                StringAdapterInfoDict adapters(connection, "adapters");
-                for(AdapterInfoSeq::const_iterator p = data.adapters.begin(); p != data.adapters.end(); ++p)
-                {
-                    if(debug)
-                    {
-                        cout << "  NAME = " << p->id << endl;
-                    }
-                    adapters.put(StringAdapterInfoDict::value_type(p->id, *p));
-                }
-
-                if(debug)
-                {
-                    cout << "Writing Objects Map:" << endl;
-                }
-
-                IdentityObjectInfoDict objects(connection, "objects");
-                for(ObjectInfoSeq::const_iterator p = data.objects.begin(); p != data.objects.end(); ++p)
-                {
-                    if(debug)
-                    {
-                        cout << "  NAME = " << communicator()->identityToString(p->proxy->ice_getIdentity()) << endl;
-                    }
-                    objects.put(IdentityObjectInfoDict::value_type(p->proxy->ice_getIdentity(), *p));
-                }
-
-                if(debug)
-                {
-                    cout << "Writing Internal Objects Map:" << endl;
-                }
-
-                IdentityObjectInfoDict internalObjects(connection, "internal-objects");
-                for(ObjectInfoSeq::const_iterator p = data.internalObjects.begin();
-                    p != data.internalObjects.end();
-                    ++p)
-                {
-                    if(debug)
-                    {
-                        cout << "  NAME = " << communicator()->identityToString(p->proxy->ice_getIdentity()) << endl;
-                    }
-                    internalObjects.put(IdentityObjectInfoDict::value_type(p->proxy->ice_getIdentity(), *p));
-                }
-
-                if(debug)
-                {
-                    cout << "Writing Serials Map:" << endl;
-                }
-
-                SerialsDict serials(connection, "serials");
-                for(StringLongDict::const_iterator p = data.serials.begin(); p != data.serials.end(); ++p)
-                {
-                    if(debug)
-                    {
-                        cout << "  NAME = " << p->first << endl;
-                    }
-                    serials.put(SerialsDict::value_type(p->first, p->second));
-                }
-
-                txn.commit();
-            }
-        }
-        else
-        {
-            cout << "Exporting database from directory `" << dbPath << "' to file `" << dbFile << "'" << endl;
-
-            {
-                Freeze::ConnectionPtr connection = Freeze::createConnection(communicator(), "Registry");
-                Freeze::TransactionHolder txn(connection);
-
-                if(debug)
-                {
-                    cout << "Reading Application Map:" << endl;
-                }
-
-                IceGrid::StringApplicationInfoDict applications(connection, "applications", false);
-                for(IceGrid::StringApplicationInfoDict::const_iterator p = applications.begin();
-                    p != applications.end();
-                    ++p)
-                {
-                    if(debug)
-                    {
-                        cout << "  APPLICATION = " << p->first << endl;
-                    }
-                    data.applications.push_back(p->second);
-                }
-
-                if(debug)
-                {
-                    cout << "Reading Adapter Map:" << endl;
-                }
-
-                StringAdapterInfoDict adapters(connection, "adapters", false);
-                for(StringAdapterInfoDict::const_iterator p = adapters.begin(); p != adapters.end(); ++p)
-                {
-                    if(debug)
-                    {
-                        cout << "  ADAPTER = " << p->first << endl;
-                    }
-                    data.adapters.push_back(p->second);
-                }
-
-
-                if(debug)
-                {
-                    cout << "Reading Object Map:" << endl;
-                }
-
-                IdentityObjectInfoDict objects(connection, "objects", false);
-                for(IdentityObjectInfoDict::const_iterator p = objects.begin(); p != objects.end(); ++p)
-                {
-                    if(debug)
-                    {
-                        cout << "  IDENTITY = " << communicator()->identityToString(p->first) << endl;
-                    }
-                    data.objects.push_back(p->second);
-                }
-
-                if(debug)
-                {
-                    cout << "Reading Internal Object Map:" << endl;
-                }
-
-                IdentityObjectInfoDict internalObjects(connection, "internal-objects", false);
-                for(IdentityObjectInfoDict::const_iterator p = internalObjects.begin();
-                    p != internalObjects.end();
-                    ++p)
-                {
-                    if(debug)
-                    {
-                        cout << "  IDENTITY = " << communicator()->identityToString(p->first) << endl;
-                    }
-                    data.internalObjects.push_back(p->second);
-                }
-
-                if(debug)
-                {
-                    cout << "Reading Serials Map:" << endl;
-                }
-
-                SerialsDict serials(connection, "serials", false);
-                for(SerialsDict::const_iterator p = serials.begin(); p != serials.end(); ++p)
-                {
-                    if(debug)
-                    {
-                        cout << "  NAME = " << p->first << endl;
-                    }
-                    data.serials.insert(std::make_pair(p->first, p->second));
-                }
-
-                txn.rollback();
-            }
-
-            Ice::OutputStreamPtr stream = Ice::createOutputStream(communicator(), encoding);
-            stream->write("IceGrid");
-            stream->write(ICE_INT_VERSION);
-            stream->write(data);
-            pair<const Ice::Byte*, const Ice::Byte*> buf = stream->finished();
-
-            ofstream fs(dbFile.c_str(), ios::binary);
-            if(fs.fail())
-            {
-                cerr << argv[0] << ": could not open output file: " << strerror(errno) << endl;
-                return EXIT_FAILURE;
-            }
-            fs.write(reinterpret_cast<const char*>(buf.first), buf.second - buf.first);
-            fs.close();
-        }
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << argv[0] << ": " << (import ? "import" : "export") << " failed:\n" << ex << endl;
-        return EXIT_FAILURE;
-    }
-
-    return EXIT_SUCCESS;
-}
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index 834aa47a278..b835c65be04 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -41,14 +41,14 @@ namespace
 class ProcessI : public Process
 {
 public:
-    
+
     ProcessI(const ActivatorPtr&, const ProcessPtr&);
 
     virtual void shutdown(const Current&);
     virtual void writeMessage(const std::string&, Int, const Current&);
-    
+
 private:
-    
+
     ActivatorPtr _activator;
     ProcessPtr _origProcess;
 };
@@ -119,11 +119,11 @@ setNoIndexingAttribute(const string& pa)
 }
 #endif
 
-} 
+}
 
 
-CollocatedRegistry::CollocatedRegistry(const CommunicatorPtr& com, 
-                                       const ActivatorPtr& activator, 
+CollocatedRegistry::CollocatedRegistry(const CommunicatorPtr& com,
+                                       const ActivatorPtr& activator,
                                        bool nowarn,
                                        bool readonly,
                                        const string& initFromReplica,
@@ -139,7 +139,7 @@ CollocatedRegistry::shutdown()
     _activator->shutdown();
 }
 
-ProcessI::ProcessI(const ActivatorPtr& activator, const ProcessPtr& origProcess) : 
+ProcessI::ProcessI(const ActivatorPtr& activator, const ProcessPtr& origProcess) :
     _activator(activator),
     _origProcess(origProcess)
 {
@@ -239,7 +239,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
             }
 
             initFromReplica = argv[++i];
-        } 
+        }
         else if(strcmp(argv[i], "--deploy") == 0)
         {
             if(i + 1 >= argc)
@@ -293,7 +293,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
         out << "setting `Ice.ThreadPool.Server.Size' is not useful, ";
         out << "you should set individual adapter thread pools instead.";
     }
-    
+
     setupThreadPool(properties, "IceGrid.Node.ThreadPool", 1, 100);
 
     //
@@ -314,7 +314,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
         }
 
         communicator()->setDefaultLocator(_registry->getLocator());
-        
+
         //
         // Set the default locator property to point to the collocated
         // locator (this property is passed by the activator to each
@@ -336,7 +336,6 @@ NodeService::startImpl(int argc, char* argv[], int& status)
     // Initialize the database environment (first setup the directory structure if needed).
     //
     string dataPath = properties->getProperty("IceGrid.Node.Data");
-    string dbPath;
     if(dataPath.empty())
     {
         error("property `IceGrid.Node.Data' is not set");
@@ -349,7 +348,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
             FileException ex(__FILE__, __LINE__);
             ex.path = dataPath;
             ex.error = IceInternal::getSystemErrno();
-      
+
             ServiceError err(this);
             err << "property `IceGrid.Node.Data' is set to an invalid path:\n" << ex;
             return false;
@@ -360,7 +359,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
         //
         if(dataPath[dataPath.length() - 1] != '/')
         {
-            dataPath += "/"; 
+            dataPath += "/";
         }
 
         IcePatch2Internal::createDirectory(dataPath + "servers");
@@ -401,12 +400,6 @@ NodeService::startImpl(int argc, char* argv[], int& status)
     }
 
     //
-    // Setup the Freeze database environment home directory. The name of the database
-    // environment for the IceGrid node is the name of the node.
-    //
-    properties->setProperty("Freeze.DbEnv." + name + ".DbHome", dbPath);
-
-    //
     // Create the node object adapter.
     //
     _adapter = communicator()->createObjectAdapter("IceGrid.Node");
@@ -483,7 +476,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
     _adapter->add(_node, nodeProxy->ice_getIdentity());
 
     _adapter->addDefaultServant(new NodeServerAdminRouter(_node), _node->getServerAdminCategory());
-    
+
     //
     // Start the platform info thread if needed.
     //
@@ -491,7 +484,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
 
     //
     // Ensures that the locator is reachable.
-    // 
+    //
     if(!nowarn)
     {
         try
@@ -520,7 +513,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
         // Replace Admin facet
         ProcessPtr origProcess = ProcessPtr::dynamicCast(communicator()->removeAdminFacet("Process"));
         communicator()->addAdminFacet(new ProcessI(_activator, origProcess), "Process");
-       
+
         Identity adminId;
         adminId.name = "NodeAdmin-" + name;
         adminId.category = instanceName;
@@ -568,15 +561,15 @@ NodeService::startImpl(int argc, char* argv[], int& status)
             Ice::Identity regId;
             regId.category = instanceName;
             regId.name = "Registry";
-            
+
             RegistryPrx registry = RegistryPrx::checkedCast(communicator()->getDefaultLocator()->findObjectById(regId));
             if(!registry)
             {
                 throw "invalid registry";
             }
-        
+
             registry = registry->ice_preferSecure(true); // Use SSL if available.
-            
+
             IceGrid::AdminSessionPrx session;
             if(communicator()->getProperties()->getPropertyAsInt("IceGridAdmin.AuthenticateUsingSSL"))
             {
@@ -592,14 +585,14 @@ NodeService::startImpl(int argc, char* argv[], int& status)
                     getline(cin, id);
                     id = IceUtilInternal::trim(id);
                 }
-                
+
                 if(password.empty())
                 {
                     cout << "password: " << flush;
                     getline(cin, password);
                     password = IceUtilInternal::trim(password);
                 }
-                
+
                 session = registry->createAdminSession(id, password);
             }
             assert(session);
@@ -625,7 +618,7 @@ NodeService::startImpl(int argc, char* argv[], int& status)
         catch(const AccessDeniedException& ex)
         {
             ServiceWarning warn(this);
-            warn << "failed to deploy application `" << desc << "':\n" 
+            warn << "failed to deploy application `" << desc << "':\n"
                  << "registry database is locked by `" << ex.lockUserId << "'";
         }
         catch(const std::exception& ex)
@@ -763,7 +756,7 @@ NodeService::stop()
 }
 
 CommunicatorPtr
-NodeService::initializeCommunicator(int& argc, char* argv[], 
+NodeService::initializeCommunicator(int& argc, char* argv[],
                                     const InitializationData& initializationData)
 {
     InitializationData initData = initializationData;
diff --git a/cpp/src/IceGrid/IceGridNode.rc b/cpp/src/IceGrid/IceGridNode.rc
index beaff14b0e3..08a7e2d9a66 100644
--- a/cpp/src/IceGrid/IceGridNode.rc
+++ b/cpp/src/IceGrid/IceGridNode.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid Node\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "icegridnode\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icegridnode.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridRegistry.rc b/cpp/src/IceGrid/IceGridRegistry.rc
index 9b54aad6791..2b6489e0e96 100644
--- a/cpp/src/IceGrid/IceGridRegistry.rc
+++ b/cpp/src/IceGrid/IceGridRegistry.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid Registry\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "icegridregistry\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icegridregistry.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/Internal.ice b/cpp/src/IceGrid/Internal.ice
index fa19b46e6f9..0208d8903f0 100644
--- a/cpp/src/IceGrid/Internal.ice
+++ b/cpp/src/IceGrid/Internal.ice
@@ -14,12 +14,10 @@
 #include <Ice/Identity.ice>
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/ProcessF.ice>
-#include <Ice/Locator.ice>
 #include <Ice/Properties.ice>
 
 #include <Glacier2/Session.ice>
 #include <IceGrid/Admin.ice>
-#include <IceGrid/Observer.ice>
 #include <IceGrid/Registry.ice>
 
 module IceGrid
@@ -33,7 +31,7 @@ class InternalDbEnvDescriptor
 {
     /** The name of the database environment. */
     string name;
-    
+
     /** The database properties. */
     PropertyDescriptorSeq properties;
 };
@@ -70,7 +68,7 @@ class InternalServerDescriptor
 
     /** The application uuid. */
     string uuid;
-    
+
     /** The application revision. */
     int revision;
 
@@ -79,19 +77,19 @@ class InternalServerDescriptor
 
     /** The server executable. */
     string exe;
-    
+
     /** The server working directory. */
     string pwd;
 
     /** The user ID to use to run the server. */
     string user;
-    
+
     /** The server activation mode. */
     string activation;
 
     /** The server activation timeout. */
     string activationTimeout;
-    
+
     /** The server deactivation timeout. */
     string deactivationTimeout;
 
@@ -103,10 +101,10 @@ class InternalServerDescriptor
 
     /** Specifies if a process object is registered. */
     bool processRegistered;
-    
+
     /** The server command line options. */
     Ice::StringSeq options;
-    
+
     /** The server environment variables. */
     Ice::StringSeq envs;
 
@@ -121,6 +119,9 @@ class InternalServerDescriptor
 
     /** The configuration files of the server. */
     PropertyDescriptorSeqDict properties;
+
+    /** IceBox service names */
+    optional(1) Ice::StringSeq services;
 };
 
 /**
@@ -142,14 +143,14 @@ interface Adapter
 {
     /**
      *
-     * Activate this adapter. If this adapter can be activated, this 
-     * will activate the adapter and return the direct proxy of the 
+     * Activate this adapter. If this adapter can be activated, this
+     * will activate the adapter and return the direct proxy of the
      * adapter once it's active. If this adapter can be activated on
      * demand, this will return 0 if the adapter is inactive or the
      * adapter direct proxy it's active.
      *
      **/
-    ["amd"] Object* activate();    
+    ["amd"] Object* activate();
 
     /**
      *
@@ -208,7 +209,7 @@ interface FileReader
     /**
      *
      * Read lines (or size bytes) at the specified position from the given file.
-     * 
+     *
      **/
     ["cpp:const"] idempotent bool read(string filename, long pos, int size, out long newPos, out Ice::StringSeq lines)
         throws FileNotAvailableException;
@@ -236,7 +237,7 @@ interface Server extends FileReader
      **/
     ["amd"] void stop()
         throws ServerStopException;
-    
+
     /**
      *
      * Check if the given server can be loaded on this node.
@@ -253,7 +254,7 @@ interface Server extends FileReader
      *
      * Enable or disable the server.
      *
-     **/ 
+     **/
     void setEnabled(bool enable);
 
     /**
@@ -268,9 +269,9 @@ interface Server extends FileReader
      * Send signal to the server
      *
      **/
-    void sendSignal(string signal) 
+    void sendSignal(string signal)
         throws BadSignalException;
-    
+
     /**
      *
      * Write message on servers' stdout or stderr.
@@ -316,12 +317,12 @@ interface ReplicaObserver
      *
      * Initialization of the replica observer.
      *
-     **/ 
+     **/
     void replicaInit(InternalRegistryPrxSeq replicas);
 
     /**
      *
-     * Notification that a replica has been added. The node should 
+     * Notification that a replica has been added. The node should
      * establish a session with this new replica.
      *
      **/
@@ -364,8 +365,8 @@ interface Node extends FileReader, ReplicaObserver
      **/
     ["amd"] idempotent Server* loadServer(InternalServerDescriptor svr,
                                                  string replicaName,
-                                                 out AdapterPrxDict adapters, 
-                                                 out int actTimeout, 
+                                                 out AdapterPrxDict adapters,
+                                                 out int actTimeout,
                                                  out int deactTimeout)
         throws DeploymentException;
 
@@ -380,8 +381,8 @@ interface Node extends FileReader, ReplicaObserver
      **/
     ["amd"] idempotent Server* loadServerWithoutRestart(InternalServerDescriptor svr,
                                                         string replicaName,
-                                                        out AdapterPrxDict adapters, 
-                                                        out int actTimeout, 
+                                                        out AdapterPrxDict adapters,
+                                                        out int actTimeout,
                                                         out int deactTimeout)
         throws DeploymentException;
 
@@ -407,12 +408,12 @@ interface Node extends FileReader, ReplicaObserver
      * using a distribution directory to patch are active, this method
      * will raise a PatchException unless shutdown is set to true. In
      * which case the servers will be shutdown.
-     * 
+     *
      **/
-    ["amd"] idempotent void patch(PatcherFeedback* feedback, 
-                                  string application, 
-                                  string server, 
-                                  InternalDistributionDescriptor appDistrib, 
+    ["amd"] idempotent void patch(PatcherFeedback* feedback,
+                                  string application,
+                                  string server,
+                                  InternalDistributionDescriptor appDistrib,
                                   bool shutdown);
 
     /**
@@ -420,7 +421,7 @@ interface Node extends FileReader, ReplicaObserver
      * Establish a session to the given replica, this method only
      * returns once the registration was attempted (unlike
      * replicaAdded below).
-     * 
+     *
      **/
     void registerWithReplica(InternalRegistry* replica);
 
@@ -429,14 +430,14 @@ interface Node extends FileReader, ReplicaObserver
      * Get the node name.
      *
      **/
-    ["nonmutating", "cpp:const"] idempotent string getName();    
+    ["nonmutating", "cpp:const"] idempotent string getName();
 
     /**
      *
      * Get the node hostname.
      *
      **/
-    ["nonmutating", "cpp:const"] idempotent string getHostname();    
+    ["nonmutating", "cpp:const"] idempotent string getHostname();
 
     /**
      *
@@ -495,7 +496,7 @@ interface NodeSession
      *
      * Return the node session timeout.
      *
-     **/ 
+     **/
     ["nonmutating", "cpp:const"] idempotent int getTimeout();
 
     /**
@@ -508,7 +509,7 @@ interface NodeSession
     /**
      *
      * Ask the registry to load the servers on the node.
-     * 
+     *
      **/
     ["amd", "nonmutating", "cpp:const"] idempotent void loadServers();
 
@@ -576,7 +577,7 @@ interface ReplicaSession
      *
      * Return the replica session timeout.
      *
-     **/ 
+     **/
     ["cpp:const"] idempotent int getTimeout();
 
     /**
@@ -593,7 +594,7 @@ interface ReplicaSession
      * This method sets the endpoints of the replica. This allows the
      * master to create proxies with multiple endpoints for replicated
      * objects (e.g.: IceGrid::Query object).
-     * 
+     *
      **/
     idempotent void setEndpoints(StringObjectProxyDict endpoints);
 
@@ -621,7 +622,7 @@ interface ReplicaSession
      * before to continue.
      *
      **/
-    void receivedUpdate(TopicName name, int serial, string failure); 
+    void receivedUpdate(TopicName name, int serial, string failure);
 
     /**
      *
@@ -663,7 +664,7 @@ class InternalNodeInfo
     /**
      *
      * The operation system release level (as defined in uname()).
-     * 
+     *
      **/
     string release;
 
@@ -679,16 +680,16 @@ class InternalNodeInfo
      * The machine hardware type (as defined in uname()).
      *
      **/
-    string machine;    
+    string machine;
 
     /**
      *
-     * The number of processor threads (e.g. 8 on 
+     * The number of processor threads (e.g. 8 on
      * system with 1 quad-core CPU, with 2 threads per core)
      *
      **/
     int nProcessors;
-    
+
     /**
      *
      * The path to the node data directory.
@@ -731,11 +732,11 @@ interface InternalRegistry extends FileReader
      * @param info Some information on the node.
      *
      * @param prx The proxy of the node.
-     * 
+     *
      * @param loadInf The load information of the node.
-     * 
+     *
      * @return The node session proxy.
-     * 
+     *
      * @throws NodeActiveException Raised if the node is already
      * registered and currently active.
      *
@@ -752,9 +753,9 @@ interface InternalRegistry extends FileReader
      * @param info Some information on the replica.
      *
      * @param prx The proxy of the replica.
-     * 
+     *
      * @return The replica session proxy.
-     * 
+     *
      * @throws ReplicaActiveException Raised if the replica is already
      * registered and currently active.
      *
@@ -766,7 +767,7 @@ interface InternalRegistry extends FileReader
      *
      * Create a session with the given registry replica. This method
      * returns only once the session creation has been attempted.
-     * 
+     *
      **/
     void registerWithReplica(InternalRegistry* prx);
 
@@ -788,7 +789,7 @@ interface InternalRegistry extends FileReader
     /**
      *
      * Return applications, adapters, objects from this replica.
-     * 
+     *
      **/
     ["cpp:const"] idempotent ApplicationInfoSeq getApplications(out long serial);
     ["cpp:const"] idempotent AdapterInfoSeq getAdapters(out long serial);
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp
index fbe2332b624..a39b69ae487 100644
--- a/cpp/src/IceGrid/LocatorI.cpp
+++ b/cpp/src/IceGrid/LocatorI.cpp
@@ -23,7 +23,7 @@ namespace IceGrid
 //
 // Callback from asynchronous call to adapter->getDirectProxy() invoked in LocatorI::findAdapterById_async().
 //
-class AdapterGetDirectProxyCallback : virtual public IceUtil::Shared
+class AdapterGetDirectProxyCallback : public virtual IceUtil::Shared
 {
 public:
 
@@ -49,7 +49,7 @@ private:
     const LocatorAdapterInfo _adapter;
 };
 
-class AdapterActivateCallback : virtual public IceUtil::Shared
+class AdapterActivateCallback : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/IceGrid/LocatorI.h b/cpp/src/IceGrid/LocatorI.h
index 277c240e5dc..ffea80fc37a 100644
--- a/cpp/src/IceGrid/LocatorI.h
+++ b/cpp/src/IceGrid/LocatorI.h
@@ -11,7 +11,7 @@
 #define ICE_GRID_LOCATOR_I_H
 
 #include <IceGrid/Internal.h>
-#include <IceGrid/Locator.h>
+#include <IceGrid/Registry.h>
 
 #include <set>
 
@@ -37,7 +37,7 @@ class LocatorI : public Locator, public IceUtil::Mutex
 {
 public:
 
-    class Request : virtual public IceUtil::Shared
+    class Request : public virtual IceUtil::Shared
     {
     public:
 
@@ -55,7 +55,7 @@ public:
                                       const Ice::Current&) const;
 
     virtual void findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr&, const ::std::string&, 
-                                       const Ice::Current& = Ice::Current()) const;
+                                       const Ice::Current& = Ice::noExplicitCurrent) const;
 
     virtual Ice::LocatorRegistryPrx getRegistry(const Ice::Current&) const;
     virtual RegistryPrx getLocalRegistry(const Ice::Current&) const;
diff --git a/cpp/src/IceGrid/LocatorRegistryI.cpp b/cpp/src/IceGrid/LocatorRegistryI.cpp
index 38e2f1701ad..7e5dd15eab7 100644
--- a/cpp/src/IceGrid/LocatorRegistryI.cpp
+++ b/cpp/src/IceGrid/LocatorRegistryI.cpp
@@ -88,7 +88,7 @@ newSetDirectProxyCB(const AmdCB& cb, const TraceLevelsPtr& traceLevels, const st
     return new SetDirectProxyCB<AmdCB>(cb, traceLevels, id, p);
 }
 
-class ServerSetProcessCB : virtual public IceUtil::Shared
+class ServerSetProcessCB : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/IceGrid/LocatorRegistryI.h b/cpp/src/IceGrid/LocatorRegistryI.h
index 46221389fdd..c6c4d87955a 100644
--- a/cpp/src/IceGrid/LocatorRegistryI.h
+++ b/cpp/src/IceGrid/LocatorRegistryI.h
@@ -29,7 +29,7 @@ class LocatorRegistryI : public Ice::LocatorRegistry
 {
 public:
     
-    class AdapterSetDirectProxyCB : virtual public IceUtil::Shared
+    class AdapterSetDirectProxyCB : public virtual IceUtil::Shared
     {
     public:
         
diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile
deleted file mode 100644
index afa85e36c75..00000000000
--- a/cpp/src/IceGrid/Makefile
+++ /dev/null
@@ -1,189 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-ADMIN		= $(bindir)/icegridadmin
-DB		= $(bindir)/icegriddb
-NODE_SERVER	= $(bindir)/icegridnode
-REGISTRY_SERVER	= $(bindir)/icegridregistry
-
-TARGETS         = $(NODE_SERVER) $(REGISTRY_SERVER) $(ADMIN) $(DB)
-
-CSLICE_OBJS     = Internal.o \
-		  IceLocatorDiscovery.o
-
-ADMIN_OBJS	= Client.o \
-		  DescriptorBuilder.o \
-		  DescriptorHelper.o \
-		  DescriptorParser.o \
-		  FileParserI.o \
-		  Grammar.o \
-		  Parser.o \
-		  Scanner.o \
-		  Util.o \
-		  $(CSLICE_OBJS)
-
-COMMON_OBJS	= AdminRouter.o \
-		  DescriptorBuilder.o \
-		  DescriptorParser.o \
-		  FileCache.o \
-		  PlatformInfo.o \
-		  SessionManager.o \
-		  TraceLevels.o \
-		  $(CSLICE_OBJS)
-
-NODE_OBJS	= Activator.o \
-		  NodeAdminRouter.o \
-		  NodeI.o \
-		  NodeSessionManager.o \
-		  ServerAdapterI.o \
-		  ServerI.o
-
-REGISTRY_OBJS   = AdminCallbackRouter.o \
-		  AdapterCache.o \
-		  AdminI.o \
-		  AdminSessionI.o \
-		  Allocatable.o \
-		  AllocatableObjectCache.o \
-		  Database.o \
-		  DescriptorHelper.o \
-		  FileUserAccountMapperI.o \
-		  IdentityObjectInfoDict.o \
-		  InternalRegistryI.o \
-		  LocatorI.o \
-		  LocatorRegistryI.o \
-		  NodeCache.o \
-		  NodeSessionI.o \
-		  ObjectCache.o \
-		  PluginFacadeI.o \
-		  QueryI.o \
-		  ReapThread.o \
-		  RegistryAdminRouter.o \
-		  RegistryI.o \
-		  ReplicaCache.o \
-		  ReplicaSessionI.o \
-		  ReplicaSessionManager.o \
-		  SerialsDict.o \
-		  ServerCache.o \
-		  SessionI.o \
-		  SessionServantManager.o \
-		  StringAdapterInfoDict.o \
-		  StringApplicationInfoDict.o \
-		  Topics.o \
-		  Util.o \
-		  WellKnownObjectsManager.o
-
-NODE_SVR_OBJS 	= $(COMMON_OBJS) \
-		  $(NODE_OBJS) \
-		  $(REGISTRY_OBJS) \
-		  IceGridNode.o
-
-REGISTRY_SVR_OBJS = \
-		  $(COMMON_OBJS) \
-		  $(REGISTRY_OBJS) \
-		  IceGridRegistry.o
-
-DSLICE_OBJS	= DBTypes.o
-
-DB_OBJS		= IceGridDB.o \
-		  StringApplicationInfoDict.o \
-		  IdentityObjectInfoDict.o \
-		  StringAdapterInfoDict.o \
-		  SerialsDict.o \
-		  $(DSLICE_OBJS)
-
-OBJS		= $(ADMIN_OBJS) \
-		  $(COMMON_OBJS) \
-		  $(NODE_OBJS) \
-		  $(NODE_SVR_OBJS) \
-		  $(REGISTRY_SVR_OBJS) \
-		  $(DB_OBJS)
-
-SLICE_OBJS	= $(CSLICE_OBJS) \
-		  $(DSLICE_OBJS)
-
-SDIR		= $(slicedir)/IceGrid
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= $(CPPFLAGS) -I. -I.. $(READLINE_FLAGS)
-ICECPPFLAGS	:= $(ICECPPFLAGS) -I..
-SLICE2CPPFLAGS 	:= --checksum --ice --include-dir IceGrid $(SLICE2CPPFLAGS)
-SLICE2FREEZECMD	:= $(SLICE2FREEZE) --ice --include-dir IceGrid $(ICECPPFLAGS)
-
-$(ADMIN): $(ADMIN_OBJS) $(LIBTARGETS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(ADMIN_OBJS) -lGlacier2 $(EXPAT_RPATH_LINK) -lIceXML -lIceGrid -lIcePatch2 -lIceBox \
-	$(LIBS) $(READLINE_LIBS) $(OPENSSL_RPATH_LINK)
-
-$(DB): $(DB_OBJS) $(LIBTARGETS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(DB_OBJS) -lIceGrid -lGlacier2 -lFreeze $(LIBS)
-
-$(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) $(LIBTARGETS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(REGISTRY_SVR_OBJS) -lIceGrid -lIceStorm -lIceStormService -lGlacier2 -lIcePatch2 \
-	$(DB_RPATH_LINK) -lFreeze -lIceBox $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_RPATH_LINK) $(LIBS)
-
-$(NODE_SERVER): $(NODE_SVR_OBJS) $(LIBTARGETS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(NODE_SVR_OBJS) -lIceGrid -lIceStorm -lIceStormService -lIceBox -lGlacier2 \
-	$(DB_RPATH_LINK) -lFreeze -lIcePatch2 $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_RPATH_LINK) $(LIBS)
-
-../IceLocatorDiscovery/%.h %.cpp: $(slicedir)/IceLocatorDiscovery/%.ice $(SLICE2CPP) $(SLICEPARSERLIB)
-	rm -f $(*F).h $(*F).cpp
-	$(SLICE2CPP) $(SLICE2CPPFLAGS) $(slicedir)/IceLocatorDiscovery/$(*F).ice
-	@touch $(*F).cpp
-	@mkdir -p .depend
-	@$(SLICE2CPP) $(SLICE2CPPFLAGS) --depend $(slicedir)/IceLocatorDiscovery/$(*F).ice > .depend/$(*F).ice.d
-
-# The slice2freeze rules are structured like this to avoid issues with
-# parallel make.
-../IceGrid/StringApplicationInfoDict.h: StringApplicationInfoDict.cpp
-StringApplicationInfoDict.cpp: $(SDIR)/Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	rm -f StringApplicationInfoDict.h StringApplicationInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \
-	StringApplicationInfoDict $(SDIR)/Admin.ice
-
-../IceGrid/IdentityObjectInfoDict.h: IdentityObjectInfoDict.cpp
-IdentityObjectInfoDict.cpp: $(slicedir)/Ice/Identity.ice $(SDIR)/Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	rm -f IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \
-	--dict-index IceGrid::IdentityObjectInfoDict,type \
-	IdentityObjectInfoDict $(slicedir)/Ice/Identity.ice $(SDIR)/Admin.ice
-
-../IceGrid/StringAdapterInfoDict.h: StringAdapterInfoDict.cpp
-StringAdapterInfoDict.cpp: $(SDIR)/Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	rm -f StringAdapterInfoDict.h StringAdapterInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo \
-	--dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(SDIR)/Admin.ice
-
-../IceGrid/SerialsDict.h: SerialsDict.cpp
-SerialsDict.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	rm -f SerialsDict.h SerialsDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::SerialsDict,string,long SerialsDict
-
-clean::
-	-rm -f StringApplicationInfoDict.h StringApplicationInfoDict.cpp
-	-rm -f IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
-	-rm -f StringAdapterInfoDict.h StringAdapterInfoDict.cpp
-	-rm -f SerialsDict.h SerialsDict.cpp
-
-install:: all
-	$(call installprogram,$(ADMIN),$(DESTDIR)$(install_bindir))
-	$(call installprogram,$(DB),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/icegridadmin.1,$(DESTDIR)$(install_mandir))
-	$(call installprogram,$(NODE_SERVER),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/icegridnode.1,$(DESTDIR)$(install_mandir))
-	$(call installprogram,$(REGISTRY_SERVER),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/icegridregistry.1,$(DESTDIR)$(install_mandir))
-	$(call installdata,$(top_srcdir)/../man/man1/icegriddb.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak
deleted file mode 100644
index 316fd0371c7..00000000000
--- a/cpp/src/IceGrid/Makefile.mak
+++ /dev/null
@@ -1,234 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-ADMIN		= $(top_srcdir)\bin\icegridadmin.exe
-
-DB		= $(top_srcdir)\bin\icegriddb.exe
-
-NODE_SERVER_D	= $(top_srcdir)\bin\icegridnoded.exe
-NODE_SERVER_R	= $(top_srcdir)\bin\icegridnode.exe
-
-NODE_SERVER	= $(top_srcdir)\bin\icegridnode$(LIBSUFFIX).exe
-
-REGISTRY_SERVER_D = $(top_srcdir)\bin\icegridregistryd.exe
-REGISTRY_SERVER_R = $(top_srcdir)\bin\icegridregistry.exe
-
-REGISTRY_SERVER	= $(top_srcdir)\bin\icegridregistry$(LIBSUFFIX).exe
-
-TARGETS         = $(ADMIN) $(NODE_SERVER) $(REGISTRY_SERVER) $(DB)
-
-CSLICE_OBJS     = .\Internal.obj \
-		  .\IceLocatorDiscovery.obj
-
-DSLICE_OBJS     = .\DBTypes.obj
-
-all:: StringApplicationInfoDict.h StringApplicationInfoDict.cpp \
-	  IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp \
-	  StringAdapterInfoDict.h StringAdapterInfoDict.cpp \
-	  SerialsDict.h SerialsDict.cpp
-
-BISON_FLEX_OBJS = .\Grammar.obj \
-                  .\Scanner.obj
-
-ADMIN_OBJS	= .\Client.obj \
-		  .\DescriptorBuilder.obj \
-		  .\DescriptorHelper.obj \
-		  .\DescriptorParser.obj \
-		  .\FileParserI.obj \
-		  .\Parser.obj \
-		  .\Util.obj \
-		  $(CSLICE_OBJS) \
-                  $(BISON_FLEX_OBJS)
-
-COMMON_OBJS	= .\AdminRouter.obj \
-		  .\DescriptorBuilder.obj \
-		  .\DescriptorParser.obj \
-		  .\FileCache.obj \
-		  .\PlatformInfo.obj \
-		  .\SessionManager.obj \
-		  .\TraceLevels.obj \
-		  $(CSLICE_OBJS)
-
-NODE_OBJS	= .\Activator.obj \
-		  .\NodeAdminRouter.obj \
-		  .\NodeI.obj \
-		  .\NodeSessionManager.obj \
-		  .\ServerAdapterI.obj \
-		  .\ServerI.obj
-
-REGISTRY_OBJS	= .\AdapterCache.obj \
-		  .\AdminCallbackRouter.obj \
-		  .\AdminI.obj \
-		  .\AdminSessionI.obj \
-		  .\Allocatable.obj \
-		  .\AllocatableObjectCache.obj \
-		  .\Database.obj \
-		  .\DescriptorHelper.obj \
-		  .\FileUserAccountMapperI.obj \
-		  .\IdentityObjectInfoDict.obj \
-		  .\InternalRegistryI.obj \
-		  .\LocatorI.obj \
-		  .\LocatorRegistryI.obj \
-		  .\NodeCache.obj \
-		  .\NodeSessionI.obj \
-		  .\ObjectCache.obj \
-		  .\PluginFacadeI.obj \
-		  .\QueryI.obj \
-		  .\ReapThread.obj \
-		  .\RegistryAdminRouter.obj \
-		  .\RegistryI.obj \
-		  .\ReplicaCache.obj \
-		  .\ReplicaSessionI.obj \
-		  .\ReplicaSessionManager.obj \
-		  .\SerialsDict.obj \
-		  .\ServerCache.obj \
-		  .\SessionI.obj \
-		  .\SessionServantManager.obj \
-		  .\StringAdapterInfoDict.obj \
-		  .\StringApplicationInfoDict.obj \
-		  .\Topics.obj \
-		  .\Util.obj \
-		  .\WellKnownObjectsManager.obj
-
-NODE_SVR_OBJS	= $(COMMON_OBJS) \
-		  $(NODE_OBJS) \
-		  $(REGISTRY_OBJS) \
-		  .\IceGridNode.obj
-
-REGISTRY_SVR_OBJS = \
-		  $(COMMON_OBJS) \
-		  $(REGISTRY_OBJS) \
-		  .\IceGridRegistry.obj
-
-DB_OBJS		= .\IceGridDB.obj \
-		  .\IdentityObjectInfoDict.obj \
-		  .\SerialsDict.obj \
-		  .\StringAdapterInfoDict.obj \
-		  .\StringApplicationInfoDict.obj \
-		  $(DSLICE_OBJS)
-
-OBJS            = $(ADMIN_OBJS) \
-		  $(NODE_SVR_OBJS) \
-		  $(REGISTRY_SVR_OBJS) \
-		  $(DB_OBJS)
-
-HDIR		= $(headerdir)\IceGrid
-SDIR		= $(slicedir)\IceGrid
-
-SLICE2FREEZECMD = $(SLICE2FREEZE) -I.. --ice --include-dir IceGrid $(ICECPPFLAGS)
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-LINKWITH 	= $(LIBS)
-ALINKWITH 	= $(LIBS)
-DLINKWITH 	= $(LIBS)
-NLINKWITH	= $(LIBS) advapi32.lib pdh.lib ws2_32.lib
-
-SLICE2CPPFLAGS	= --checksum --ice --include-dir IceGrid $(SLICE2CPPFLAGS)
-CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -Zm200
-
-!if "$(GENERATE_PDB)" == "yes"
-APDBFLAGS       = /pdb:$(ADMIN:.exe=.pdb)
-DBPDBFLAGS      = /pdb:$(DB:.exe=.pdb)
-RPDBFLAGS       = /pdb:$(REGISTRY_SERVER:.exe=.pdb)
-NPDBFLAGS       = /pdb:$(NODE_SERVER:.exe=.pdb)
-!endif
-
-ARES_FILE       = IceGridAdmin.res
-DRES_FILE       = IceGridDB.res
-RRES_FILE       = IceGridRegistry.res
-NRES_FILE       = IceGridNode.res
-
-$(ADMIN): $(ADMIN_OBJS) IceGridAdmin.res
-	$(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(ADMIN_OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH) $(ARES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) &&\
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-$(DB): $(DB_OBJS) IceGridDB.res
-	$(LINK) $(LD_EXEFLAGS) $(DBPDBFLAGS) $(DB_OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(DLINKWITH) $(DRES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) &&\
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-$(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) IceGridRegistry.res
-	$(LINK) $(LD_EXEFLAGS) $(RPDBFLAGS) $(REGISTRY_SVR_OBJS) $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)$(NLINKWITH) $(RRES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-$(NODE_SERVER): $(NODE_SVR_OBJS) IceGridNode.res
-	$(LINK) $(LD_EXEFLAGS) $(NPDBFLAGS) $(NODE_SVR_OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(NLINKWITH) $(NRES_FILE)
-	@if exist $@.manifest \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-IceLocatorDiscovery.h IceLocatorDiscovery.cpp: $(slicedir)\IceLocatorDiscovery\IceLocatorDiscovery.ice "$(SLICE2CPP)" "$(SLICEPARSERLIB)"
-	del /q $(*F).h $(*F).cpp
-	"$(SLICE2CPP)" $(SLICE2CPPFLAGS) $(slicedir)\IceLocatorDiscovery\IceLocatorDiscovery.ice
-
-{$(slicedir)\IceLocatorDiscovery}.ice{$(SLICE_DEPEND_DIR)\}.d:
-	@echo Generating dependencies for $<
-	@"$(SLICE2CPP)" $(SLICE2CPPFLAGS) --depend $< | cscript /NoLogo $(top_srcdir)\..\config\makedepend-slice.vbs $(*F).ice
-
-StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \
-	StringApplicationInfoDict $(SDIR)\Admin.ice
-
-IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(slicedir)\Ice\Identity.ice $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \
-	--dict-index IceGrid::IdentityObjectInfoDict,type \
-	IdentityObjectInfoDict $(slicedir)\Ice\Identity.ice $(SDIR)\Admin.ice
-
-StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo \
-	--dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(SDIR)\Admin.ice
-
-SerialsDict.h SerialsDict.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q SerialsDict.h SerialsDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::SerialsDict,string,long SerialsDict
-
-clean::
-	-del /q DBTypes.cpp DBTypes.h
-	-del /q Internal.cpp Internal.h
-	-del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
-	-del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
-	-del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
-	-del /q SerialsDict.h SerialsDict.cpp
-	-del /q $(ADMIN:.exe=.*)
-	-del /q $(DB:.exe=.*)
-	-del /q $(NODE_SERVER_D:.exe=.*) $(NODE_SERVER_R:.exe=.*)
-	-del /q $(REGISTRY_SERVER_D:.exe=.*) $(REGISTRY_SERVER_R:.exe=.*)
-	-del /q IceGridAdmin.res IceGridNode.res IceGridRegistry.res
-
-install:: all
-	copy $(ADMIN) "$(install_bindir)"
-	copy $(DB) "$(install_bindir)"
-	copy $(NODE_SERVER) "$(install_bindir)"
-	copy $(REGISTRY_SERVER) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(ADMIN:.exe=.pdb) "$(install_bindir)"
-	copy $(DB:.exe=.pdb) "$(install_bindir)"
-	copy $(NODE_SERVER:.exe=.pdb) "$(install_bindir)"
-	copy $(REGISTRY_SERVER:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/IceGrid/Makefile.mk b/cpp/src/IceGrid/Makefile.mk
new file mode 100644
index 00000000000..6bbae208ab9
--- /dev/null
+++ b/cpp/src/IceGrid/Makefile.mk
@@ -0,0 +1,86 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+local_node_srcs		= Activator.cpp \
+			  NodeAdminRouter.cpp \
+			  NodeI.cpp \
+			  NodeSessionManager.cpp \
+			  ServerAdapterI.cpp \
+			  ServerI.cpp
+
+local_registry_srcs 	= Internal.ice \
+		     	  AdminRouter.cpp \
+			  DescriptorBuilder.cpp \
+			  DescriptorParser.cpp \
+			  FileCache.cpp \
+			  PlatformInfo.cpp \
+			  SessionManager.cpp \
+			  TraceLevels.cpp \
+			  IceLocatorDiscovery.cpp \
+			  AdminCallbackRouter.cpp \
+			  AdapterCache.cpp \
+			  AdminI.cpp \
+			  AdminSessionI.cpp \
+			  Allocatable.cpp \
+			  AllocatableObjectCache.cpp \
+			  Database.cpp \
+			  DescriptorHelper.cpp \
+			  FileUserAccountMapperI.cpp \
+			  InternalRegistryI.cpp \
+			  LocatorI.cpp \
+			  LocatorRegistryI.cpp \
+			  NodeCache.cpp \
+			  NodeSessionI.cpp \
+			  ObjectCache.cpp \
+			  PluginFacadeI.cpp \
+			  QueryI.cpp \
+			  ReapThread.cpp \
+			  RegistryAdminRouter.cpp \
+			  RegistryI.cpp \
+			  ReplicaCache.cpp \
+			  ReplicaSessionI.cpp \
+			  ReplicaSessionManager.cpp \
+			  ServerCache.cpp \
+			  SessionI.cpp \
+			  SessionServantManager.cpp \
+			  Topics.cpp \
+			  Util.cpp \
+			  WellKnownObjectsManager.cpp
+
+local_admin_srcs	= Internal.ice \
+		     	  Client.cpp \
+		     	  DescriptorBuilder.cpp \
+		     	  DescriptorHelper.cpp \
+		     	  DescriptorParser.cpp \
+		     	  FileParserI.cpp \
+		     	  Grammar.cpp \
+		     	  Parser.cpp \
+		     	  Scanner.cpp \
+		     	  Util.cpp
+
+$(project)_programs 		= icegridnode icegridregistry icegridadmin
+$(project)_sliceflags		:= -Isrc --include-dir IceGrid
+$(project)_generated_includedir := $(project)/generated/IceGrid
+$(project)_dependencies 	:= IceGrid Glacier2 Ice
+$(project)_targetdir		:= $(bindir)
+
+icegridnode_sources	 	:= $(addprefix $(currentdir)/,$(local_node_srcs) $(local_registry_srcs) IceGridNode.cpp)
+icegridnode_dependencies 	:= IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB
+icegridnode_libs		:= lmdb
+
+icegridregistry_sources	 	:= $(addprefix $(currentdir)/,$(local_registry_srcs) IceGridRegistry.cpp)
+icegridregistry_dependencies 	:= IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB $(local_dependencies)
+icegridregistry_libs		:= lmdb
+
+icegridadmin_dependencies 	:= IcePatch2 IceBox IceXML
+icegridadmin_sources	 	:= $(slicedir)/IceLocatorDiscovery/IceLocatorDiscovery.ice \
+				   $(addprefix $(currentdir)/,$(local_admin_srcs))
+
+
+projects += $(project)
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index d6b6963182e..8757dc0fe2b 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -47,6 +47,7 @@ struct ToInternalServerDescriptor : std::unary_function<CommunicatorDescriptorPt
         if(svc)
         {
             filename += "_" + svc->name;
+            _desc->services->push_back(svc->name);
         }
 
         PropertyDescriptorSeq& props = _desc->properties[filename];
@@ -177,7 +178,7 @@ struct ToInternalServerDescriptor : std::unary_function<CommunicatorDescriptorPt
     int _iceVersion;
 };
 
-class LoadCB : virtual public IceUtil::Shared
+class LoadCB : public virtual IceUtil::Shared
 {
 public:
 
@@ -244,7 +245,7 @@ private:
     const int _timeout;
 };
 
-class DestroyCB : virtual public IceUtil::Shared
+class DestroyCB : public virtual IceUtil::Shared
 {
 public:
 
@@ -663,7 +664,7 @@ NodeEntry::destroyServer(const ServerEntryPtr& entry, const ServerInfo& info, in
 
         if(noRestart)
         {
-            node->begin_destroyServerWithoutRestart(info.descriptor->id, info.uuid, info.revision, 
+            node->begin_destroyServerWithoutRestart(info.descriptor->id, info.uuid, info.revision,
                                                     _cache.getReplicaName(),
                                                     newCallback_Node_destroyServerWithoutRestart(
                                                         new DestroyCB(_cache.getTraceLevels(), entry, _name),
@@ -930,6 +931,7 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const
     server->activationTimeout = info.descriptor->activationTimeout;
     server->deactivationTimeout = info.descriptor->deactivationTimeout;
     server->applicationDistrib = info.descriptor->applicationDistrib;
+    server->services = Ice::StringSeq();
     if(!info.descriptor->distrib.icepatch.empty())
     {
         server->distrib = new InternalDistributionDescriptor(info.descriptor->distrib.icepatch,
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp
index 217f57164d7..e83d6c3cdc3 100644
--- a/cpp/src/IceGrid/NodeI.cpp
+++ b/cpp/src/IceGrid/NodeI.cpp
@@ -32,7 +32,7 @@ class LogPatcherFeedback : public IcePatch2::PatcherFeedback
 {
 public:
 
-    LogPatcherFeedback(const TraceLevelsPtr& traceLevels, const string& dest) : 
+    LogPatcherFeedback(const TraceLevelsPtr& traceLevels, const string& dest) :
         _traceLevels(traceLevels),
         _startedPatch(false),
         _lastProgress(0),
@@ -40,7 +40,7 @@ public:
     {
     }
 
-    void 
+    void
     setPatchingPath(const string& path)
     {
         _path = path;
@@ -149,12 +149,12 @@ public:
                 {
                     roundedSize = 1;
                 }
-                out << _dest << ": downloading " << (_path.empty() ? string("") : (_path + " ")) << roundedSize 
+                out << _dest << ": downloading " << (_path.empty() ? string("") : (_path + " ")) << roundedSize
                     << "KB ";
                 _startedPatch = true;
             }
         }
-        
+
         return true;
     }
 
@@ -166,7 +166,7 @@ public:
 
     virtual bool
     patchEnd()
-    {   
+    {
         return true;
     }
 
@@ -193,7 +193,7 @@ class NodeUp : public NodeI::Update
 {
 public:
 
-    NodeUp(const NodeIPtr& node, const NodeObserverPrx& observer, NodeDynamicInfo info) : 
+    NodeUp(const NodeIPtr& node, const NodeObserverPrx& observer, NodeDynamicInfo info) :
         NodeI::Update(node, observer), _info(info)
     {
     }
@@ -211,9 +211,9 @@ public:
         }
         return true;
     }
-    
+
 private:
-    
+
     NodeDynamicInfo _info;
 };
 
@@ -221,7 +221,7 @@ class UpdateServer : public NodeI::Update
 {
 public:
 
-    UpdateServer(const NodeIPtr& node, const NodeObserverPrx& observer, ServerDynamicInfo info) : 
+    UpdateServer(const NodeIPtr& node, const NodeObserverPrx& observer, ServerDynamicInfo info) :
         NodeI::Update(node, observer), _info(info)
     {
     }
@@ -231,7 +231,7 @@ public:
     {
         try
         {
-            _observer->begin_updateServer(_node->getName(), 
+            _observer->begin_updateServer(_node->getName(),
                                           _info,
                                           newCallback(static_cast<NodeI::Update*>(this), &NodeI::Update::completed));
         }
@@ -241,9 +241,9 @@ public:
         }
         return true;
     }
-    
+
 private:
-    
+
     ServerDynamicInfo _info;
 };
 
@@ -251,7 +251,7 @@ class UpdateAdapter : public NodeI::Update
 {
 public:
 
-    UpdateAdapter(const NodeIPtr& node, const NodeObserverPrx& observer, AdapterDynamicInfo info) : 
+    UpdateAdapter(const NodeIPtr& node, const NodeObserverPrx& observer, AdapterDynamicInfo info) :
         NodeI::Update(node, observer), _info(info)
     {
     }
@@ -261,7 +261,7 @@ public:
     {
         try
         {
-            _observer->begin_updateAdapter(_node->getName(), 
+            _observer->begin_updateAdapter(_node->getName(),
                                            _info,
                                            newCallback(static_cast<NodeI::Update*>(this), &NodeI::Update::completed));
         }
@@ -271,9 +271,9 @@ public:
         }
         return true;
     }
-    
+
 private:
-    
+
     AdapterDynamicInfo _info;
 };
 
@@ -295,7 +295,7 @@ NodeI::Update::finished(bool success)
 
 NodeI::NodeI(const Ice::ObjectAdapterPtr& adapter,
              NodeSessionManager& sessions,
-             const ActivatorPtr& activator, 
+             const ActivatorPtr& activator,
              const IceUtil::TimerPtr& timer,
              const TraceLevelsPtr& traceLevels,
              const NodePrx& proxy,
@@ -395,19 +395,19 @@ NodeI::loadServerWithoutRestart_async(const AMD_Node_loadServerWithoutRestartPtr
         {
         }
 
-        virtual void 
+        virtual void
         ice_response(const ServerPrx& server, const AdapterPrxDict& adapters, Ice::Int actTimeout, Ice::Int deacTimeout)
         {
             _cb->ice_response(server, adapters, actTimeout, deacTimeout);
         };
 
-        virtual void 
+        virtual void
         ice_exception(const ::std::exception& ex)
         {
             _cb->ice_exception(ex);
         }
 
-        virtual void 
+        virtual void
         ice_exception()
         {
             _cb->ice_exception();
@@ -448,19 +448,19 @@ NodeI::destroyServerWithoutRestart_async(const AMD_Node_destroyServerWithoutRest
         {
         }
 
-        virtual void 
+        virtual void
         ice_response()
         {
             _cb->ice_response();
         };
 
-        virtual void 
+        virtual void
         ice_exception(const ::std::exception& ex)
         {
             _cb->ice_exception(ex);
         }
 
-        virtual void 
+        virtual void
         ice_exception()
         {
             _cb->ice_exception();
@@ -476,10 +476,10 @@ NodeI::destroyServerWithoutRestart_async(const AMD_Node_destroyServerWithoutRest
 void
 NodeI::patch_async(const AMD_Node_patchPtr& amdCB,
                    const PatcherFeedbackPrx& feedback,
-                   const string& application, 
+                   const string& application,
                    const string& server,
                    const InternalDistributionDescriptorPtr& appDistrib,
-                   bool shutdown, 
+                   bool shutdown,
                    const Ice::Current&)
 {
     amdCB->ice_response();
@@ -528,8 +528,8 @@ NodeI::patch_async(const AMD_Node_patchPtr& amdCB,
             else
             {
                 //
-                // If the server to patch depends on the application, 
-                // we need to shutdown all the application servers 
+                // If the server to patch depends on the application,
+                // we need to shutdown all the application servers
                 // that depend on the application.
                 //
                 servers = getApplicationServers(application);
@@ -583,7 +583,7 @@ NodeI::patch_async(const AMD_Node_patchPtr& amdCB,
                     servers.erase(s++);
                 }
             }
-            
+
             if(!running.empty())
             {
                 if(running.size() == 1)
@@ -601,7 +601,7 @@ NodeI::patch_async(const AMD_Node_patchPtr& amdCB,
                 (*s)->waitForPatch();
             }
 
-            // 
+            //
             // Patch the application.
             //
             FileServerPrx icepatch;
@@ -664,7 +664,7 @@ NodeI::patch_async(const AMD_Node_patchPtr& amdCB,
         _patchInProgress.erase(application);
         notifyAll();
     }
- 
+
     try
     {
         if(failure.empty())
@@ -754,7 +754,7 @@ NodeI::shutdown()
     IceUtil::Mutex::Lock sync(_serversLock);
     for(map<string, set<ServerIPtr> >::const_iterator p = _serversByApplication.begin();
         p != _serversByApplication.end(); ++p)
-    {    
+    {
         for(set<ServerIPtr>::const_iterator q = p->second.begin(); q != p->second.end(); ++q)
         {
             (*q)->shutdown();
@@ -802,7 +802,7 @@ NodeI::getUserAccountMapper() const
 PlatformInfo&
 NodeI::getPlatformInfo() const
 {
-    return _platform; 
+    return _platform;
 }
 
 FileCachePtr
@@ -902,7 +902,7 @@ NodeI::checkConsistency(const NodeSessionPrx& session)
         }
         sort(servers.begin(), servers.end());
     }
-    
+
     for_each(commands.begin(), commands.end(), IceUtil::voidMemFun(&ServerCommand::execute));
 }
 
@@ -917,14 +917,14 @@ NodeI::addObserver(const NodeSessionPrx& session, const NodeObserverPrx& observe
 
     ServerDynamicInfoSeq serverInfos;
     AdapterDynamicInfoSeq adapterInfos;
-    for(map<string, ServerDynamicInfo>::const_iterator p = _serversDynamicInfo.begin(); 
+    for(map<string, ServerDynamicInfo>::const_iterator p = _serversDynamicInfo.begin();
         p != _serversDynamicInfo.end(); ++p)
     {
         assert(p->second.state != Destroyed && (p->second.state != Inactive || !p->second.enabled));
         serverInfos.push_back(p->second);
     }
 
-    for(map<string, AdapterDynamicInfo>::const_iterator q = _adaptersDynamicInfo.begin(); 
+    for(map<string, AdapterDynamicInfo>::const_iterator q = _adaptersDynamicInfo.begin();
         q != _adaptersDynamicInfo.end(); ++q)
     {
         assert(q->second.proxy);
@@ -1005,12 +1005,12 @@ NodeI::observerUpdateAdapter(const AdapterDynamicInfo& info)
     }
 }
 
-void 
+void
 NodeI::queueUpdate(const NodeObserverPrx& proxy, const UpdatePtr& update)
 {
     //Lock sync(*this); Called within the synchronization
     map<NodeObserverPrx, deque<UpdatePtr> >::iterator p = _observerUpdates.find(proxy);
-    if(p == _observerUpdates.end()) 
+    if(p == _observerUpdates.end())
     {
         if(update->send())
         {
@@ -1023,7 +1023,7 @@ NodeI::queueUpdate(const NodeObserverPrx& proxy, const UpdatePtr& update)
     }
 }
 
-void 
+void
 NodeI::dequeueUpdate(const NodeObserverPrx& proxy, const UpdatePtr& update, bool all)
 {
     IceUtil::Mutex::Lock sync(_observerMutex);
@@ -1070,7 +1070,7 @@ NodeI::removeServer(const ServerIPtr& server, const std::string& application)
         if(p->second.empty())
         {
             _serversByApplication.erase(p);
-            
+
             string appDir = _dataDir + "/distrib/" + application;
             if(IceUtilInternal::directoryExists(appDir))
             {
@@ -1126,7 +1126,7 @@ NodeI::checkConsistencyNoSync(const Ice::StringSeq& servers)
 
     vector<string> remove;
     set_difference(contents.begin(), contents.end(), servers.begin(), servers.end(), back_inserter(remove));
-                
+
     //
     // Remove the extra servers if possible.
     //
@@ -1161,7 +1161,7 @@ NodeI::checkConsistencyNoSync(const Ice::StringSeq& servers)
                     assert(false);
                 }
             }
-            
+
             try
             {
                 if(canRemoveServerDirectory(*p))
@@ -1193,7 +1193,7 @@ NodeI::checkConsistencyNoSync(const Ice::StringSeq& servers)
         //
         return commands;
     }
-        
+
     if(!remove.empty())
     {
         Ice::Warning out(_traceLevels->logger);
@@ -1221,11 +1221,21 @@ NodeI::canRemoveServerDirectory(const string& name)
     contents.erase("config");
     contents.erase("distrib");
     contents.erase("revision");
+    contents.erase("data");
+    Ice::StringSeq serviceDataDirs;
+    for(set<string>::const_iterator p = contents.begin(); p != contents.end(); ++p)
+    {
+        if(p->find("data_") != 0)
+        {
+            return false;
+        }
+        serviceDataDirs.push_back(*p);
+    }
     if(!contents.empty())
     {
         return false;
     }
-    
+
     c = readDirectory(_serversDir + "/" + name + "/config");
     for(Ice::StringSeq::const_iterator p = c.begin() ; p != c.end(); ++p)
     {
@@ -1234,16 +1244,42 @@ NodeI::canRemoveServerDirectory(const string& name)
             return false;
         }
     }
-    
-    c = readDirectory(_serversDir + "/" + name + "/dbs");
-    for(Ice::StringSeq::const_iterator p = c.begin() ; p != c.end(); ++p)
+
+    if(IceUtilInternal::directoryExists(_serversDir + "/" + name + "/dbs"))
+    {
+        c = readDirectory(_serversDir + "/" + name + "/dbs");
+        for(Ice::StringSeq::const_iterator p = c.begin() ; p != c.end(); ++p)
+        {
+            try
+            {
+                Ice::StringSeq files = readDirectory(_serversDir + "/" + name + "/dbs/" + *p);
+                files.erase(remove(files.begin(), files.end(), "DB_CONFIG"), files.end());
+                files.erase(remove(files.begin(), files.end(), "__Freeze"), files.end());
+                if(!files.empty())
+                {
+                    return false;
+                }
+            }
+            catch(const string&)
+            {
+                return false;
+            }
+        }
+    }
+
+    if(IceUtilInternal::directoryExists(_serversDir + "/" + name + "/data"))
+    {
+        if(!readDirectory(_serversDir + "/" + name + "/data").empty())
+        {
+            return false;
+        }
+    }
+
+    for(Ice::StringSeq::const_iterator p = serviceDataDirs.begin(); p != serviceDataDirs.end(); ++p)
     {
         try
         {
-            Ice::StringSeq files = readDirectory(_serversDir + "/" + name + "/dbs/" + *p);
-            files.erase(remove(files.begin(), files.end(), "DB_CONFIG"), files.end());
-            files.erase(remove(files.begin(), files.end(), "__Freeze"), files.end());
-            if(!files.empty())
+            if(!readDirectory(_serversDir + "/" + name + "/" + *p).empty())
             {
                 return false;
             }
@@ -1253,7 +1289,6 @@ NodeI::canRemoveServerDirectory(const string& name)
             return false;
         }
     }
-
     return true;
 }
 
@@ -1292,7 +1327,7 @@ NodeI::patch(const FileServerPrx& icepatch, const string& dest, const vector<str
 
     //
     // Update the files owner/group
-    //    
+    //
 }
 
 set<ServerIPtr>
@@ -1348,9 +1383,9 @@ NodeI::loadServer(const AMD_Node_loadServerPtr& amdCB,
     {
         Lock sync(*this);
         ++_serial;
-        
+
         Ice::Identity id = createServerIdentity(descriptor->id);
-        
+
         //
         // Check if we already have a servant for this server. If that's
         // the case, the server is already loaded and we just need to
@@ -1383,7 +1418,7 @@ NodeI::loadServer(const AMD_Node_loadServerPtr& amdCB,
                 //
                 throw Ice::ObjectNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
             }
-            
+
             try
             {
                 command = server->load(amdCB, descriptor, replicaName, noRestart);
@@ -1430,7 +1465,7 @@ NodeI::destroyServer(const AMD_Node_destroyServerPtr& amdCB,
     {
         Lock sync(*this);
         ++_serial;
-        
+
         ServerIPtr server;
         try
         {
@@ -1453,7 +1488,7 @@ NodeI::destroyServer(const AMD_Node_destroyServerPtr& amdCB,
         {
             server = new ServerI(this, 0, _serversDir, serverId, _waitTime);
         }
-        
+
         //
         // Destroy the server object if it's loaded.
         //
diff --git a/cpp/src/IceGrid/NodeI.h b/cpp/src/IceGrid/NodeI.h
index 914bbef4e6f..829a8444c07 100644
--- a/cpp/src/IceGrid/NodeI.h
+++ b/cpp/src/IceGrid/NodeI.h
@@ -42,7 +42,7 @@ class NodeI : public Node, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
-    class Update : virtual public IceUtil::Shared
+    class Update : public virtual IceUtil::Shared
     {
     public:
         
@@ -99,9 +99,9 @@ public:
     virtual void replicaAdded(const InternalRegistryPrx&, const Ice::Current&);
     virtual void replicaRemoved(const InternalRegistryPrx&, const Ice::Current&);
 
-    virtual std::string getName(const Ice::Current& = Ice::Current()) const;
-    virtual std::string getHostname(const Ice::Current& = Ice::Current()) const;
-    virtual LoadInfo getLoad(const Ice::Current& = Ice::Current()) const;
+    virtual std::string getName(const Ice::Current& = Ice::noExplicitCurrent) const;
+    virtual std::string getHostname(const Ice::Current& = Ice::noExplicitCurrent) const;
+    virtual LoadInfo getLoad(const Ice::Current& = Ice::noExplicitCurrent) const;
     virtual int getProcessorSocketCount(const Ice::Current&) const;
     virtual void shutdown(const Ice::Current&) const;
 
diff --git a/cpp/src/IceGrid/NodeSessionI.h b/cpp/src/IceGrid/NodeSessionI.h
index 77430692de8..4cce4acac40 100644
--- a/cpp/src/IceGrid/NodeSessionI.h
+++ b/cpp/src/IceGrid/NodeSessionI.h
@@ -60,13 +60,13 @@ public:
 
     virtual void keepAlive(const LoadInfo&, const Ice::Current&);
     virtual void setReplicaObserver(const ReplicaObserverPrx&, const Ice::Current&);
-    virtual int getTimeout(const Ice::Current& = Ice::Current()) const;
+    virtual int getTimeout(const Ice::Current& = Ice::noExplicitCurrent) const;
     virtual NodeObserverPrx getObserver(const Ice::Current&) const;
     virtual void loadServers_async(const AMD_NodeSession_loadServersPtr&, const Ice::Current&) const;
     virtual Ice::StringSeq getServers(const Ice::Current&) const;
     virtual void waitForApplicationUpdate_async(const AMD_NodeSession_waitForApplicationUpdatePtr&,
                                                 const std::string&, int, const Ice::Current&) const;
-    virtual void destroy(const Ice::Current& = Ice::Current());
+    virtual void destroy(const Ice::Current& = Ice::noExplicitCurrent);
     
     virtual IceUtil::Time timestamp() const;
     virtual void shutdown();
diff --git a/cpp/src/IceGrid/NodeSessionManager.cpp b/cpp/src/IceGrid/NodeSessionManager.cpp
index ce8f30eb245..dcf06b34a05 100644
--- a/cpp/src/IceGrid/NodeSessionManager.cpp
+++ b/cpp/src/IceGrid/NodeSessionManager.cpp
@@ -11,7 +11,6 @@
 #include <IceGrid/NodeSessionManager.h>
 #include <IceGrid/TraceLevels.h>
 #include <IceGrid/NodeI.h>
-#include <IceGrid/Query.h>
 
 using namespace std;
 using namespace IceGrid;
diff --git a/cpp/src/IceGrid/NodeSessionManager.h b/cpp/src/IceGrid/NodeSessionManager.h
index dade1f72267..49c000fd874 100644
--- a/cpp/src/IceGrid/NodeSessionManager.h
+++ b/cpp/src/IceGrid/NodeSessionManager.h
@@ -15,7 +15,7 @@
 #include <IceUtil/Monitor.h>
 
 #include <IceGrid/SessionManager.h>
-#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
 #include <IceGrid/Internal.h>
 #include <set>
 
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index cd5aeb55fcf..01c80978f1c 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -2923,7 +2923,7 @@ Parser::Parser(const CommunicatorPtr& communicator,
 #ifdef _WIN32
     if(!windowsConsoleConverter)
     {
-        windowsConsoleConverter = new IceUtil::WindowsStringConverter(GetConsoleOutputCP());
+        windowsConsoleConverter = IceUtil::createWindowsStringConverter(GetConsoleOutputCP());
     }
 #endif
 }
diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h
index 00a3cb739db..9104cccc57f 100644
--- a/cpp/src/IceGrid/Parser.h
+++ b/cpp/src/IceGrid/Parser.h
@@ -12,7 +12,7 @@
 
 #include <IceUtil/Handle.h>
 #include <IceGrid/Admin.h>
-#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
 #include <list>
 #include <stdio.h>
 
diff --git a/cpp/src/IceGrid/QueryI.h b/cpp/src/IceGrid/QueryI.h
index bf72700bb80..e675f19d344 100644
--- a/cpp/src/IceGrid/QueryI.h
+++ b/cpp/src/IceGrid/QueryI.h
@@ -10,7 +10,7 @@
 #ifndef ICE_GRID_QUERY_I_H
 #define ICE_GRID_QUERY_I_H
 
-#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
 #include <Ice/CommunicatorF.h>
 
 namespace IceGrid
diff --git a/cpp/src/IceGrid/ReapThread.cpp b/cpp/src/IceGrid/ReapThread.cpp
index 9aae268b5b6..a2994808faf 100644
--- a/cpp/src/IceGrid/ReapThread.cpp
+++ b/cpp/src/IceGrid/ReapThread.cpp
@@ -16,28 +16,41 @@ using namespace IceGrid;
 namespace
 {
 
-class ConnectionCallbackI : public Ice::ConnectionCallback
+class CloseCallbackI : public Ice::CloseCallback
 {
 public:
 
-    ConnectionCallbackI(const ReapThreadPtr& reaper) : _reaper(reaper)
+    CloseCallbackI(const ReapThreadPtr& reaper) : _reaper(reaper)
     {
     }
-    
+
     virtual void
-    heartbeat(const Ice::ConnectionPtr& con)
+    closed(const Ice::ConnectionPtr& con)
+    {
+        _reaper->connectionClosed(con);
+    }
+
+private:
+
+    const ReapThreadPtr _reaper;
+};
+
+class HeartbeatCallbackI : public Ice::HeartbeatCallback
+{
+public:
+
+    HeartbeatCallbackI(const ReapThreadPtr& reaper) : _reaper(reaper)
     {
-        _reaper->connectionHeartbeat(con);
     }
 
     virtual void
-    closed(const Ice::ConnectionPtr& con)
+    heartbeat(const Ice::ConnectionPtr& con)
     {
-        _reaper->connectionClosed(con);
+        _reaper->connectionHeartbeat(con);
     }
 
 private:
-    
+
     const ReapThreadPtr _reaper;
 };
 
@@ -45,7 +58,8 @@ private:
 
 ReapThread::ReapThread() :
     IceUtil::Thread("Icegrid reaper thread"),
-    _callback(new ConnectionCallbackI(this)),
+    _closeCallback(new CloseCallbackI(this)),
+    _heartbeatCallback(new HeartbeatCallbackI(this)),
     _terminated(false)
 {
 }
@@ -76,7 +90,7 @@ ReapThread::run()
             {
                 timedWait(_wakeInterval);
             }
-            
+
             if(_terminated)
             {
                 break;
@@ -118,7 +132,8 @@ ReapThread::run()
                         q->second.erase(p->item);
                         if(q->second.empty())
                         {
-                            p->connection->setCallback(0);
+                            p->connection->setCloseCallback(0);
+                            p->connection->setHeartbeatCallback(0);
                             _connections.erase(q);
                         }
                     }
@@ -152,10 +167,12 @@ ReapThread::terminate()
 
         for(map<Ice::ConnectionPtr, set<ReapablePtr> >::iterator p = _connections.begin(); p != _connections.end(); ++p)
         {
-            p->first->setCallback(0);
+            p->first->setCloseCallback(0);
+            p->first->setHeartbeatCallback(0);
         }
         _connections.clear();
-        _callback = 0;
+        _closeCallback = 0;
+        _heartbeatCallback = 0;
     }
 
     for(list<ReapableItem>::iterator p = reap.begin(); p != reap.end(); ++p)
@@ -198,7 +215,9 @@ ReapThread::add(const ReapablePtr& reapable, int timeout, const Ice::ConnectionP
         if(p == _connections.end())
         {
             p = _connections.insert(make_pair(connection, set<ReapablePtr>())).first;
-            connection->setCallback(_callback);
+            connection->setCloseCallback(_closeCallback);
+            connection->setHeartbeatCallback(_heartbeatCallback);
+
         }
         p->second.insert(reapable);
     }
@@ -213,7 +232,7 @@ ReapThread::add(const ReapablePtr& reapable, int timeout, const Ice::ConnectionP
         {
             notify();
         }
-        
+
         //
         // Since we just added a new session with a non null timeout there
         // must be a non-zero wakeInterval.
@@ -222,14 +241,15 @@ ReapThread::add(const ReapablePtr& reapable, int timeout, const Ice::ConnectionP
     }
 }
 
-void 
+void
 ReapThread::connectionHeartbeat(const Ice::ConnectionPtr& con)
 {
     Lock sync(*this);
     map<Ice::ConnectionPtr, set<ReapablePtr> >::const_iterator p = _connections.find(con);
     if(p == _connections.end())
     {
-        con->setCallback(0);
+        con->setCloseCallback(0);
+        con->setHeartbeatCallback(0);
         return;
     }
 
@@ -246,7 +266,8 @@ ReapThread::connectionClosed(const Ice::ConnectionPtr& con)
     map<Ice::ConnectionPtr, set<ReapablePtr> >::iterator p = _connections.find(con);
     if(p == _connections.end())
     {
-        con->setCallback(0);
+        con->setCloseCallback(0);
+        con->setHeartbeatCallback(0);
         return;
     }
 
@@ -258,7 +279,7 @@ ReapThread::connectionClosed(const Ice::ConnectionPtr& con)
 }
 
 //
-// Returns true if the calculated wake interval is less than the current wake 
+// Returns true if the calculated wake interval is less than the current wake
 // interval (or if the original wake interval was "forever").
 //
 bool
diff --git a/cpp/src/IceGrid/ReapThread.h b/cpp/src/IceGrid/ReapThread.h
index 3c184598b47..2c5cae00cab 100644
--- a/cpp/src/IceGrid/ReapThread.h
+++ b/cpp/src/IceGrid/ReapThread.h
@@ -42,10 +42,10 @@ template<class T>
 class SessionReapable : public Reapable
 {
     typedef IceUtil::Handle<T> TPtr;
-    
+
 public:
-    
-    SessionReapable(const Ice::LoggerPtr& logger, const TPtr& session) : 
+
+    SessionReapable(const Ice::LoggerPtr& logger, const TPtr& session) :
         _logger(logger), _session(session)
     {
     }
@@ -53,7 +53,7 @@ public:
     virtual ~SessionReapable()
     {
     }
-        
+
     virtual IceUtil::Time
     timestamp() const
     {
@@ -94,15 +94,15 @@ template<class T>
 class SessionReapableWithHeartbeat : public SessionReapable<T>
 {
     typedef IceUtil::Handle<T> TPtr;
-    
+
 public:
 
-    SessionReapableWithHeartbeat(const Ice::LoggerPtr& logger, const TPtr& session) : 
+    SessionReapableWithHeartbeat(const Ice::LoggerPtr& logger, const TPtr& session) :
         SessionReapable<T>(logger, session)
     {
     }
 
-    virtual void 
+    virtual void
     heartbeat() const
     {
         try
@@ -121,7 +121,7 @@ class ReapThread : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mute
 public:
 
     ReapThread();
-    
+
     virtual void run();
     void terminate();
     void add(const ReapablePtr&, int, const Ice::ConnectionPtr& = Ice::ConnectionPtr());
@@ -132,8 +132,9 @@ public:
 private:
 
     bool calcWakeInterval();
-    
-    Ice::ConnectionCallbackPtr _callback;
+
+    Ice::CloseCallbackPtr _closeCallback;
+    Ice::HeartbeatCallbackPtr _heartbeatCallback;
     IceUtil::Time _wakeInterval;
     bool _terminated;
     struct ReapableItem
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index 496a49a3ad8..d246b26dd9c 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -118,6 +118,19 @@ private:
     ProcessPtr _origProcess;
 };
 
+Ice::IPConnectionInfoPtr
+getIPConnectionInfo(const Ice::ConnectionInfoPtr& info)
+{
+    for(Ice::ConnectionInfoPtr p = info; p; p = p->underlying)
+    {
+        Ice::IPConnectionInfoPtr ipInfo = Ice::IPConnectionInfoPtr::dynamicCast(p);
+        if(ipInfo)
+        {
+            return ipInfo;
+        }
+    }
+    return ICE_NULLPTR;
+}
 
 ProcessI::ProcessI(const RegistryIPtr& registry, const ProcessPtr& origProcess) :
     _registry(registry),
@@ -322,11 +335,11 @@ RegistryI::startImpl()
     //
     // Create the registry database.
     //
-    string dbPath = _communicator->getProperties()->getProperty("IceGrid.Registry.Data");
+    string dbPath = _communicator->getProperties()->getProperty("IceGrid.Registry.LMDB.Path");
     if(dbPath.empty())
     {
         Ice::Error out(_communicator->getLogger());
-        out << "property `IceGrid.Registry.Data' is not set";
+        out << "property `IceGrid.Registry.LMDB.Path' is not set";
         return false;
     }
     else
@@ -337,13 +350,10 @@ RegistryI::startImpl()
             ex.error = IceInternal::getSystemErrno();
 
             Ice::Error out(_communicator->getLogger());
-            out << "property `IceGrid.Registry.Data' is set to an invalid path:\n" << ex;
+            out << "property `IceGrid.Registry.LMDB.Path' is set to an invalid path:\n" << ex;
             return false;
         }
     }
-    _communicator->getProperties()->setProperty("Freeze.DbEnv.Registry.DbHome", dbPath);
-    const string envName = "Registry";
-    Freeze::ConnectionPtr connection = Freeze::createConnection(_communicator, envName);
 
     //
     // Ensure that nothing is running on this port. This is also
@@ -388,11 +398,20 @@ RegistryI::startImpl()
                                                   _registryAdapter,
                                                   "IceGrid.Registry",
                                                   registryTopicManagerId,
-                                                  envName);
+                                                  "");
     const IceStorm::TopicManagerPrx topicManager = _iceStorm->getTopicManager();
 
-    _database = new Database(_registryAdapter, topicManager, _instanceName, _traceLevels, getInfo(), connection,
-                             "Registry", _readonly);
+    try
+    {
+        _database = new Database(_registryAdapter, topicManager, _instanceName, _traceLevels, getInfo(), _readonly);
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        Error out(_communicator->getLogger());
+        out << "couldn't open database:\n";
+        out << ex;
+        return false;
+    }
     _wellKnownObjects = new WellKnownObjectsManager(_database);
 
     if(!_initFromReplica.empty())
@@ -452,11 +471,11 @@ RegistryI::startImpl()
         {
             Ice::Long serial;
             IceGrid::InternalRegistryPrx registry = IceGrid::InternalRegistryPrx::checkedCast(proxy);
-	    ApplicationInfoSeq applications = registry->getApplications(serial);
+            ApplicationInfoSeq applications = registry->getApplications(serial);
             _database->syncApplications(applications, serial);
-	    AdapterInfoSeq adapters = registry->getAdapters(serial);
+            AdapterInfoSeq adapters = registry->getAdapters(serial);
             _database->syncAdapters(adapters, serial);
-	    ObjectInfoSeq objects = registry->getObjects(serial);
+            ObjectInfoSeq objects = registry->getObjects(serial);
             _database->syncObjects(objects, serial);
         }
         catch(const Ice::OperationNotExistException&)
@@ -1332,10 +1351,11 @@ RegistryI::getSSLInfo(const ConnectionPtr& connection, string& userDN)
             throw exc;
         }
 
-        sslinfo.remotePort = info->remotePort;
-        sslinfo.remoteHost = info->remoteAddress;
-        sslinfo.localPort = info->localPort;
-        sslinfo.localHost = info->localAddress;
+        Ice::IPConnectionInfoPtr ipInfo = getIPConnectionInfo(info);
+        sslinfo.remotePort = ipInfo->remotePort;
+        sslinfo.remoteHost = ipInfo->remoteAddress;
+        sslinfo.localPort = ipInfo->localPort;
+        sslinfo.localHost = ipInfo->localAddress;
         sslinfo.cipher = info->cipher;
         sslinfo.certs = info->certs;
         if(info->certs.size() > 0)
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h
index f371c096b30..25b8891ea26 100644
--- a/cpp/src/IceGrid/RegistryI.h
+++ b/cpp/src/IceGrid/RegistryI.h
@@ -12,8 +12,6 @@
 
 #include <IceUtil/Timer.h>
 #include <IceGrid/Registry.h>
-#include <IceGrid/Query.h>
-#include <IceGrid/Locator.h>
 #include <IceGrid/Internal.h>
 #include <IceGrid/PlatformInfo.h>
 #include <IceGrid/ReplicaSessionManager.h>
@@ -64,8 +62,8 @@ public:
     virtual SessionPrx createSessionFromSecureConnection(const Ice::Current&);
     virtual AdminSessionPrx createAdminSessionFromSecureConnection(const Ice::Current&);
 
-    virtual int getSessionTimeout(const Ice::Current& = Ice::Current()) const;
-    virtual int getACMTimeout(const Ice::Current& = Ice::Current()) const;
+    virtual int getSessionTimeout(const Ice::Current& = Ice::noExplicitCurrent) const;
+    virtual int getACMTimeout(const Ice::Current& = Ice::noExplicitCurrent) const;
     
     std::string getName() const;
     RegistryInfo getInfo() const;
diff --git a/cpp/src/IceGrid/ReplicaSessionI.cpp b/cpp/src/IceGrid/ReplicaSessionI.cpp
index c5cf1744443..acb3f2e56d2 100644
--- a/cpp/src/IceGrid/ReplicaSessionI.cpp
+++ b/cpp/src/IceGrid/ReplicaSessionI.cpp
@@ -28,7 +28,7 @@ operator==(const ObjectInfo& info, const Ice::Identity& id)
 
 }
 
-ReplicaSessionI::ReplicaSessionI(const DatabasePtr& database, 
+ReplicaSessionI::ReplicaSessionI(const DatabasePtr& database,
                                  const WellKnownObjectsManagerPtr& wellKnownObjects,
                                  const InternalReplicaInfoPtr& info,
                                  const InternalRegistryPrx& proxy,
@@ -95,7 +95,7 @@ ReplicaSessionI::getTimeout(const Ice::Current&) const
 }
 
 void
-ReplicaSessionI::setDatabaseObserver(const DatabaseObserverPrx& observer, 
+ReplicaSessionI::setDatabaseObserver(const DatabaseObserverPrx& observer,
                                      const IceUtil::Optional<StringLongDict>& slaveSerials,
                                      const Ice::Current&)
 {
@@ -140,7 +140,7 @@ ReplicaSessionI::setDatabaseObserver(const DatabaseObserverPrx& observer,
             os << " master and slave database with an administrative client and either:\n";
             os << " - restart the slave with --initdb-from-replica=Master\n";
             os << " - restart the master with --initdb-from-replica=" << _info->name;
-            
+
             Ice::Error out(_traceLevels->logger);
             out << os.str();
             throw DeploymentException(os.str());
@@ -160,7 +160,7 @@ ReplicaSessionI::setDatabaseObserver(const DatabaseObserverPrx& observer,
         if(_destroy)
         {
             throw Ice::ObjectNotExistException(__FILE__, __LINE__);
-        }   
+        }
         _observer = observer;
 
         serialApplicationObserver = applicationObserver->subscribe(_observer, _info->name);
@@ -181,7 +181,7 @@ ReplicaSessionI::setEndpoints(const StringObjectProxyDict& endpoints, const Ice:
         if(_destroy)
         {
             throw Ice::ObjectNotExistException(__FILE__, __LINE__);
-        }       
+        }
         _replicaEndpoints = endpoints;
     }
     _wellKnownObjects->updateReplicatedWellKnownObjects();
@@ -212,7 +212,7 @@ ReplicaSessionI::registerWellKnownObjects(const ObjectInfoSeq& objects, const Ic
 
 void
 ReplicaSessionI::setAdapterDirectProxy(const string& adapterId,
-                                       const string& replicaGroupId, 
+                                       const string& replicaGroupId,
                                        const Ice::ObjectPrx& proxy,
                                        const Ice::Current&)
 {
@@ -256,13 +256,13 @@ ReplicaSessionI::shutdown()
     destroyImpl(true);
 }
 
-const InternalRegistryPrx& 
+const InternalRegistryPrx&
 ReplicaSessionI::getInternalRegistry() const
 {
     return _internalRegistry;
 }
- 
-const InternalReplicaInfoPtr& 
+
+const InternalReplicaInfoPtr&
 ReplicaSessionI::getInfo() const
 {
     return _info;
@@ -300,7 +300,7 @@ ReplicaSessionI::destroyImpl(bool shutdown)
         if(_destroy)
         {
             throw Ice::ObjectNotExistException(__FILE__, __LINE__);
-        }       
+        }
         _destroy = true;
     }
 
diff --git a/cpp/src/IceGrid/ReplicaSessionI.h b/cpp/src/IceGrid/ReplicaSessionI.h
index 53b5e16c982..a2a191bff04 100644
--- a/cpp/src/IceGrid/ReplicaSessionI.h
+++ b/cpp/src/IceGrid/ReplicaSessionI.h
@@ -41,7 +41,7 @@ public:
     virtual void setAdapterDirectProxy(const std::string&, const std::string&, const Ice::ObjectPrx&, 
                                        const Ice::Current&);
     virtual void receivedUpdate(TopicName, int, const std::string&, const Ice::Current&);
-    virtual void destroy(const Ice::Current& = Ice::Current());
+    virtual void destroy(const Ice::Current& = Ice::noExplicitCurrent);
     
     virtual IceUtil::Time timestamp() const;
     virtual void shutdown();
diff --git a/cpp/src/IceGrid/ServerAdapterI.h b/cpp/src/IceGrid/ServerAdapterI.h
index 866db042a61..476960a604c 100644
--- a/cpp/src/IceGrid/ServerAdapterI.h
+++ b/cpp/src/IceGrid/ServerAdapterI.h
@@ -29,8 +29,8 @@ public:
     virtual ~ServerAdapterI();
 
     virtual void activate_async(const AMD_Adapter_activatePtr& cb, const Ice::Current&);
-    virtual Ice::ObjectPrx getDirectProxy(const Ice::Current& = Ice::Current()) const;
-    virtual void setDirectProxy(const ::Ice::ObjectPrx&, const ::Ice::Current& = Ice::Current());
+    virtual Ice::ObjectPrx getDirectProxy(const Ice::Current& = Ice::noExplicitCurrent) const;
+    virtual void setDirectProxy(const ::Ice::ObjectPrx&, const ::Ice::Current& = Ice::noExplicitCurrent);
     void destroy();
     void updateEnabled();
     void clear();
diff --git a/cpp/src/IceGrid/ServerCache.h b/cpp/src/IceGrid/ServerCache.h
index 079e592adb3..224d2c0e341 100644
--- a/cpp/src/IceGrid/ServerCache.h
+++ b/cpp/src/IceGrid/ServerCache.h
@@ -14,7 +14,7 @@
 #include <IceUtil/Shared.h>
 #include <IceGrid/Descriptor.h>
 #include <IceGrid/Internal.h>
-#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
 #include <IceGrid/Allocatable.h>
 #include <IceGrid/Cache.h>
 
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 40f68962228..404b1e77606 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -44,7 +44,7 @@ namespace IceGrid
 void
 chownRecursive(const string& path, uid_t uid, gid_t gid)
 {
-    struct dirent **namelist = 0;
+    vector<vector<Ice::Byte> > namelist;
     DIR* d;
     if((d = opendir(path.c_str())) == 0)
     {
@@ -52,26 +52,15 @@ chownRecursive(const string& path, uid_t uid, gid_t gid)
     }
 
     struct dirent* entry;
-    int n = 0;
     while((entry = readdir(d)) != 0)
     {
-        namelist = static_cast<struct dirent**>(
-                                            realloc(namelist, static_cast<size_t>((n + 1) * sizeof(struct dirent*))));
-        if(namelist == 0)
-        {
-            closedir(d);
-            throw "cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString();
-        }
+        size_t index = namelist.size();
+        namelist.resize(index + 1);
 
         size_t entrysize = sizeof(struct dirent) - sizeof(entry->d_name) + strlen(entry->d_name) + 1;
-        namelist[n] = static_cast<struct dirent*>(malloc(entrysize));
-        if(namelist[n] == 0)
-        {
-            closedir(d);
-            throw "cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString();
-        }
-        memcpy(namelist[n], entry, entrysize);
-        ++n;
+        namelist[index].resize(entrysize);
+
+        memcpy(&namelist[index][0], entry, entrysize);
     }
 
     if(closedir(d))
@@ -79,11 +68,10 @@ chownRecursive(const string& path, uid_t uid, gid_t gid)
         throw "cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString();
     }
 
-    for(int i = 0; i < n; ++i)
+    for(size_t i = 0; i < namelist.size(); ++i)
     {
-        string name = namelist[i]->d_name;
+        string name = reinterpret_cast<struct dirent*>(&namelist[i][0])->d_name;
         assert(!name.empty());
-        free(namelist[i]);
 
         if(name == ".")
         {
@@ -115,8 +103,6 @@ chownRecursive(const string& path, uid_t uid, gid_t gid)
             }
         }
     }
-
-    free(namelist);
 }
 #endif
 
@@ -2305,17 +2291,18 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
     //
     // Create or update the server directories exists.
     //
-    createOrUpdateDirectory(_serverDir);
-    createOrUpdateDirectory(_serverDir + "/config");
-    createOrUpdateDirectory(_serverDir + "/dbs");
-    createOrUpdateDirectory(_serverDir + "/distrib");
+    IcePatch2Internal::createDirectory(_serverDir);
+    IcePatch2Internal::createDirectory(_serverDir + "/config");
+    IcePatch2Internal::createDirectory(_serverDir + "/dbs");
+    IcePatch2Internal::createDirectory(_serverDir + "/distrib");
+    IcePatch2Internal::createDirectory(_serverDir + "/data");
 
     //
     // Create the configuration files, remove the old ones.
     //
     {
         //
-        // We do not want to esapce the properties if the Ice version is
+        // We do not want to escape the properties if the Ice version is
         // previous to Ice 3.3.
         //
         Ice::StringSeq knownFiles;
@@ -2369,6 +2356,47 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
     }
 
     //
+    // Update the service data directories if necessary and remove the old ones.
+    //
+    if(_desc->services)
+    {
+        Ice::StringSeq knownDirs;
+        for(Ice::StringSeq::const_iterator q = _desc->services->begin(); q != _desc->services->end(); ++q)
+        {
+            knownDirs.push_back("data_" + *q);
+            IcePatch2Internal::createDirectory(_serverDir + "/data_" + *q);
+        }
+        sort(knownDirs.begin(), knownDirs.end());
+
+        //
+        // Remove old directories
+        //
+        Ice::StringSeq dirs = IcePatch2Internal::readDirectory(_serverDir);
+        Ice::StringSeq svcDirs;
+        for(Ice::StringSeq::const_iterator p = dirs.begin(); p != dirs.end(); ++p)
+        {
+            if(p->find("data_") == 0)
+            {
+                svcDirs.push_back(*p);
+            }
+        }
+        Ice::StringSeq toDel;
+        set_difference(svcDirs.begin(), svcDirs.end(), knownDirs.begin(), knownDirs.end(), back_inserter(toDel));
+        for(Ice::StringSeq::const_iterator p = toDel.begin(); p != toDel.end(); ++p)
+        {
+            try
+            {
+                IcePatch2Internal::removeRecursive(_serverDir + "/" + *p);
+            }
+            catch(const string& msg)
+            {
+                Ice::Warning out(_node->getTraceLevels()->logger);
+                out << "couldn't remove directory `" + _serverDir + "/" + *p + "':\n" + msg;
+            }
+        }
+    }
+
+    //
     // Update the database environments if necessary and remove the
     // old ones.
     //
@@ -2379,7 +2407,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
             knownDbEnvs.push_back((*q)->name);
 
             string dbEnvHome = _serverDir + "/dbs/" + (*q)->name;
-            createOrUpdateDirectory(dbEnvHome);
+            IcePatch2Internal::createDirectory(dbEnvHome);
 
             if(!(*q)->properties.empty())
             {
@@ -3042,18 +3070,6 @@ ServerI::setStateNoSync(InternalServerState st, const std::string& reason)
     }
 }
 
-void
-ServerI::createOrUpdateDirectory(const string& dir)
-{
-    try
-    {
-        IcePatch2Internal::createDirectory(dir);
-    }
-    catch(const string&)
-    {
-    }
-}
-
 ServerState
 ServerI::toServerState(InternalServerState st) const
 {
diff --git a/cpp/src/IceGrid/ServerI.h b/cpp/src/IceGrid/ServerI.h
index f2fb9f507cd..0512664ce7c 100644
--- a/cpp/src/IceGrid/ServerI.h
+++ b/cpp/src/IceGrid/ServerI.h
@@ -12,7 +12,6 @@
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Timer.h>
-#include <Freeze/EvictorF.h>
 #include <IceGrid/Activator.h>
 #include <IceGrid/Internal.h>
 #include <set>
@@ -74,16 +73,16 @@ public:
 
     void waitForApplicationUpdateCompleted(const Ice::AsyncResultPtr&);
 
-    virtual void start_async(const AMD_Server_startPtr&, const ::Ice::Current& = Ice::Current());
-    virtual void stop_async(const AMD_Server_stopPtr&, const ::Ice::Current& = Ice::Current());
+    virtual void start_async(const AMD_Server_startPtr&, const ::Ice::Current& = Ice::noExplicitCurrent);
+    virtual void stop_async(const AMD_Server_stopPtr&, const ::Ice::Current& = Ice::noExplicitCurrent);
     virtual void sendSignal(const std::string&, const ::Ice::Current&);
     virtual void writeMessage(const std::string&, Ice::Int, const ::Ice::Current&);
 
-    virtual ServerState getState(const ::Ice::Current& = Ice::Current()) const;
-    virtual Ice::Int getPid(const ::Ice::Current& = Ice::Current()) const;
-   
+    virtual ServerState getState(const ::Ice::Current& = Ice::noExplicitCurrent) const;
+    virtual Ice::Int getPid(const ::Ice::Current& = Ice::noExplicitCurrent) const;
+
     virtual void setEnabled(bool, const ::Ice::Current&);
-    virtual bool isEnabled(const ::Ice::Current& = Ice::Current()) const;
+    virtual bool isEnabled(const ::Ice::Current& = Ice::noExplicitCurrent) const;
     virtual void setProcess_async(const AMD_Server_setProcessPtr&, const ::Ice::ProcessPrx&, const ::Ice::Current&);
 
     virtual Ice::Long getOffsetFromEnd(const std::string&, int, const Ice::Current&) const;
@@ -126,7 +125,7 @@ public:
     void updateRuntimePropertiesCallback(const Ice::Exception&, const InternalServerDescriptorPtr&);
 
 private:
-    
+
     void updateImpl(const InternalServerDescriptorPtr&);
     void checkRevision(const std::string&, const std::string&, int) const;
     void checkNoRestart(const InternalServerDescriptorPtr&);
@@ -139,8 +138,7 @@ private:
     void setState(InternalServerState, const std::string& = std::string());
     ServerCommandPtr nextCommand();
     void setStateNoSync(InternalServerState, const std::string& = std::string());
-    
-    void createOrUpdateDirectory(const std::string&);
+
     ServerState toServerState(InternalServerState) const;
     ServerActivation toServerActivation(const std::string&) const;
     ServerDynamicInfo getDynamicInfo() const;
@@ -181,7 +179,7 @@ private:
     LoadCommandPtr _load;
     PatchCommandPtr _patch;
     StartCommandPtr _start;
-    
+
     int _pid;
 };
 typedef IceUtil::Handle<ServerI> ServerIPtr;
diff --git a/cpp/src/IceGrid/SessionI.h b/cpp/src/IceGrid/SessionI.h
index c04829572b7..2eac4117fa2 100644
--- a/cpp/src/IceGrid/SessionI.h
+++ b/cpp/src/IceGrid/SessionI.h
@@ -35,7 +35,7 @@ typedef IceUtil::Handle<Allocatable> AllocatablePtr;
 class SessionI;
 typedef IceUtil::Handle<SessionI> SessionIPtr;
 
-class BaseSessionI : virtual public Ice::Object, public IceUtil::Mutex
+class BaseSessionI : public virtual Ice::Object, public IceUtil::Mutex
 {
 public:
 
@@ -106,7 +106,7 @@ protected:
     std::set<AllocatablePtr> _allocations;
 };
 
-class ClientSessionFactory : virtual public IceUtil::Shared
+class ClientSessionFactory : public virtual IceUtil::Shared
 {
 public:
 
@@ -128,7 +128,7 @@ private:
 };
 typedef IceUtil::Handle<ClientSessionFactory> ClientSessionFactoryPtr;
 
-class ClientSessionManagerI : virtual public Glacier2::SessionManager
+class ClientSessionManagerI : public virtual Glacier2::SessionManager
 {
 public:
 
@@ -141,7 +141,7 @@ private:
     const ClientSessionFactoryPtr _factory;
 };
 
-class ClientSSLSessionManagerI : virtual public Glacier2::SSLSessionManager
+class ClientSSLSessionManagerI : public virtual Glacier2::SSLSessionManager
 {
 public:
 
diff --git a/cpp/src/IceGrid/SessionManager.h b/cpp/src/IceGrid/SessionManager.h
index 5ae248770a8..1853e3b4a62 100644
--- a/cpp/src/IceGrid/SessionManager.h
+++ b/cpp/src/IceGrid/SessionManager.h
@@ -18,7 +18,7 @@
 #include <Ice/Logger.h>
 #include <Ice/LoggerUtil.h>
 
-#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
 #include <IceGrid/Internal.h>
 
 namespace IceGrid
diff --git a/cpp/src/IceGrid/Topics.h b/cpp/src/IceGrid/Topics.h
index 8d9f13219bc..ceaf6f4ca38 100644
--- a/cpp/src/IceGrid/Topics.h
+++ b/cpp/src/IceGrid/Topics.h
@@ -13,13 +13,13 @@
 #include <IceUtil/Mutex.h>
 #include <IceStorm/IceStorm.h>
 #include <IceGrid/Internal.h>
-#include <IceGrid/Observer.h>
+#include <IceGrid/Registry.h>
 #include <set>
 
 namespace IceGrid
 {
 
-class ObserverTopic : public IceUtil::Monitor<IceUtil::Mutex>, virtual public Ice::Object
+class ObserverTopic : public IceUtil::Monitor<IceUtil::Mutex>, public virtual Ice::Object
 {
 public:
 
diff --git a/cpp/src/IceGrid/WaitQueue.h b/cpp/src/IceGrid/WaitQueue.h
index a0374b10133..42559ea0185 100644
--- a/cpp/src/IceGrid/WaitQueue.h
+++ b/cpp/src/IceGrid/WaitQueue.h
@@ -18,7 +18,7 @@
 namespace IceGrid
 {
 
-class WaitItem : virtual public IceUtil::Shared
+class WaitItem : public virtual IceUtil::Shared
 {
 public:
     
diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.cpp b/cpp/src/IceGrid/WellKnownObjectsManager.cpp
index c35960681c4..4a8c5d0a4a0 100644
--- a/cpp/src/IceGrid/WellKnownObjectsManager.cpp
+++ b/cpp/src/IceGrid/WellKnownObjectsManager.cpp
@@ -7,6 +7,7 @@
 //
 // **********************************************************************
 
+#include <Ice/Endpoint.h>
 #include <Glacier2/PermissionsVerifier.h>
 #include <IceGrid/WellKnownObjectsManager.h>
 #include <IceGrid/Database.h>
diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.h b/cpp/src/IceGrid/WellKnownObjectsManager.h
index 89b02308c5c..aa9be0e8509 100644
--- a/cpp/src/IceGrid/WellKnownObjectsManager.h
+++ b/cpp/src/IceGrid/WellKnownObjectsManager.h
@@ -11,7 +11,7 @@
 #define ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H
 
 #include <IceGrid/Internal.h>
-#include <IceGrid/Locator.h>
+#include <IceGrid/Registry.h>
 
 namespace IceGrid
 {
diff --git a/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj
new file mode 100644
index 00000000000..18e87edf108
--- /dev/null
+++ b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{1F4CA1BE-B405-400F-912E-F0CC7E369D59}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories>
+    <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceGrid</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Client.cpp" />
+    <ClCompile Include="..\..\DescriptorBuilder.cpp" />
+    <ClCompile Include="..\..\DescriptorHelper.cpp" />
+    <ClCompile Include="..\..\DescriptorParser.cpp" />
+    <ClCompile Include="..\..\FileParserI.cpp" />
+    <ClCompile Include="..\..\Grammar.cpp" />
+    <ClCompile Include="..\..\Parser.cpp" />
+    <ClCompile Include="..\..\Scanner.cpp" />
+    <ClCompile Include="..\..\Util.cpp" />
+    <ClCompile Include="Win32\Debug\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Internal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Internal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Internal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Internal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice" />
+    <IceBuilder Include="..\..\Internal.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Win32\Debug\IceGrid\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceGrid\Internal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\Internal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\Internal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\Internal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceGridAdmin.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj.filters b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj.filters
new file mode 100644
index 00000000000..fc0cc2249bc
--- /dev/null
+++ b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj.filters
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{8f955c59-05c6-4d48-a18b-c5913f203b71}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{290f8c4c-103f-4e3b-aef2-7c36877ae354}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{e5f7a1d7-9701-4beb-a741-708205a1c55b}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{d95ccbae-6683-48d7-9643-9f623a374c5d}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{97801986-9ab8-4f06-9cfd-8f351529343c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{ae6a4c06-9e6e-4866-a149-239c25015e89}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{4853d01e-cbf4-49cd-a6aa-50a54cee8915}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{49b4366f-e8da-4a93-ba84-69b80c2272c1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{5d8dbd72-05a7-4c79-a840-239ed30a58c9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{aa369e6c-88ac-400a-8a96-15e75919feb0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{8a42fe0d-862a-4e65-8cff-62e7dd5bec0c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{20678ab0-a704-49a7-bec2-234514ebfad1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{1b092ab8-3f08-474b-9af7-6a612639abc8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{93b3f2f6-aba5-43f4-a2c2-c0fae31bec3a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{5d5f578d-ac2b-40ab-97b7-a5bbb717fedc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{0acbc132-d683-4909-bbd9-724d5ed531a9}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Client.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DescriptorBuilder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DescriptorHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DescriptorParser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FileParserI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Grammar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Scanner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Internal.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Internal.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Internal.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Internal.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\Internal.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Win32\Debug\IceGrid\IceLocatorDiscovery.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceGrid\Internal.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\IceLocatorDiscovery.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\Internal.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\IceLocatorDiscovery.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\Internal.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\IceLocatorDiscovery.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\Internal.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceGridAdmin.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj
new file mode 100644
index 00000000000..e8838e1e186
--- /dev/null
+++ b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{48EF9416-336F-4FA5-A376-FDFB7726ADBA}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories>
+    <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceGrid</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Link>
+      <AdditionalDependencies>advapi32.lib;pdh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Link>
+      <AdditionalDependencies>advapi32.lib;pdh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Link>
+      <AdditionalDependencies>advapi32.lib;pdh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link>
+      <AdditionalDependencies>advapi32.lib;pdh.lib;ws2_32.lib;%(AdditionalDependencies) </AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceGridNode.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice" />
+    <IceBuilder Include="..\..\Internal.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Activator.cpp" />
+    <ClCompile Include="..\..\AdapterCache.cpp" />
+    <ClCompile Include="..\..\AdminCallbackRouter.cpp" />
+    <ClCompile Include="..\..\AdminI.cpp" />
+    <ClCompile Include="..\..\AdminRouter.cpp" />
+    <ClCompile Include="..\..\AdminSessionI.cpp" />
+    <ClCompile Include="..\..\Allocatable.cpp" />
+    <ClCompile Include="..\..\AllocatableObjectCache.cpp" />
+    <ClCompile Include="..\..\Database.cpp" />
+    <ClCompile Include="..\..\DescriptorBuilder.cpp" />
+    <ClCompile Include="..\..\DescriptorHelper.cpp" />
+    <ClCompile Include="..\..\DescriptorParser.cpp" />
+    <ClCompile Include="..\..\FileCache.cpp" />
+    <ClCompile Include="..\..\FileUserAccountMapperI.cpp" />
+    <ClCompile Include="..\..\IceGridNode.cpp" />
+    <ClCompile Include="..\..\InternalRegistryI.cpp" />
+    <ClCompile Include="..\..\LocatorI.cpp" />
+    <ClCompile Include="..\..\LocatorRegistryI.cpp" />
+    <ClCompile Include="..\..\NodeAdminRouter.cpp" />
+    <ClCompile Include="..\..\NodeCache.cpp" />
+    <ClCompile Include="..\..\NodeI.cpp" />
+    <ClCompile Include="..\..\NodeSessionI.cpp" />
+    <ClCompile Include="..\..\NodeSessionManager.cpp" />
+    <ClCompile Include="..\..\ObjectCache.cpp" />
+    <ClCompile Include="..\..\PlatformInfo.cpp" />
+    <ClCompile Include="..\..\PluginFacadeI.cpp" />
+    <ClCompile Include="..\..\QueryI.cpp" />
+    <ClCompile Include="..\..\ReapThread.cpp" />
+    <ClCompile Include="..\..\RegistryAdminRouter.cpp" />
+    <ClCompile Include="..\..\RegistryI.cpp" />
+    <ClCompile Include="..\..\ReplicaCache.cpp" />
+    <ClCompile Include="..\..\ReplicaSessionI.cpp" />
+    <ClCompile Include="..\..\ReplicaSessionManager.cpp" />
+    <ClCompile Include="..\..\ServerAdapterI.cpp" />
+    <ClCompile Include="..\..\ServerCache.cpp" />
+    <ClCompile Include="..\..\ServerI.cpp" />
+    <ClCompile Include="..\..\SessionI.cpp" />
+    <ClCompile Include="..\..\SessionManager.cpp" />
+    <ClCompile Include="..\..\SessionServantManager.cpp" />
+    <ClCompile Include="..\..\Topics.cpp" />
+    <ClCompile Include="..\..\TraceLevels.cpp" />
+    <ClCompile Include="..\..\Util.cpp" />
+    <ClCompile Include="..\..\WellKnownObjectsManager.cpp" />
+    <ClCompile Include="Win32\Debug\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Internal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Internal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Internal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Internal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Win32\Debug\IceGrid\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceGrid\Internal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\Internal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\Internal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\Internal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj.filters b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj.filters
new file mode 100644
index 00000000000..13d1b5ec9c3
--- /dev/null
+++ b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj.filters
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{a2e4b8bb-0e39-44e7-928f-1dfa5477e307}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{61c417a8-15cb-4cd5-a37f-9848df56b1b7}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{7fb2c77a-174e-47cd-8a8a-7b263c9ef5a5}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{d8c85aaf-180b-4b32-bf44-464fc04fd259}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{09eb4089-9e03-47e1-8170-d11bee0bfb4e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{ec82c088-3ced-49e9-a738-6df61266a01f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{73400c95-dff4-4c5d-976b-497c613c4348}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{3a6c0a63-a70b-45a6-a290-06c596aa63ad}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{f2e6ca2b-2b0b-4318-ad71-95b996a8a29c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{4dba14e6-c098-497f-a2fb-5f7e06a5b14c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{de746eca-c9ac-4cc0-831c-401b7deaaebf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{bd63d891-7233-48b9-af77-00a190054bae}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{4fcd81e1-e50d-4775-9925-32b3643ea9c4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{f32eefe7-dc1a-4089-9469-cc1bf4524349}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{92bf38cb-63db-478b-8a94-8b61fb666810}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{be7136fd-0916-4102-9c4e-c0ac7e764c6f}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceGridNode.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\Internal.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Activator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AdapterCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AdminCallbackRouter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AdminI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AdminRouter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AdminSessionI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Allocatable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AllocatableObjectCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Database.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DescriptorBuilder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DescriptorHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DescriptorParser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FileCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FileUserAccountMapperI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\IceGridNode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\InternalRegistryI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LocatorI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LocatorRegistryI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NodeAdminRouter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NodeCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NodeI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NodeSessionI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NodeSessionManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ObjectCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PlatformInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PluginFacadeI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\QueryI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ReapThread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RegistryAdminRouter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RegistryI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ReplicaCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ReplicaSessionI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ReplicaSessionManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ServerAdapterI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ServerCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ServerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SessionI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SessionManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SessionServantManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Topics.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TraceLevels.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\WellKnownObjectsManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Internal.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Internal.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Internal.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Internal.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Win32\Debug\IceGrid\IceLocatorDiscovery.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceGrid\Internal.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\IceLocatorDiscovery.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\Internal.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\IceLocatorDiscovery.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\Internal.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\IceLocatorDiscovery.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\Internal.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceGrid/msbuild/icegridnode/packages.config b/cpp/src/IceGrid/msbuild/icegridnode/packages.config
new file mode 100644
index 00000000000..3f680df025a
--- /dev/null
+++ b/cpp/src/IceGrid/msbuild/icegridnode/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="lmdb.v120" version="0.9.18.0" targetFramework="native" />
+  <package id="lmdb.v140" version="0.9.18.0" targetFramework="native" />
+</packages>
diff --git a/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj
new file mode 100644
index 00000000000..eadefff96c7
--- /dev/null
+++ b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{64490115-464B-4DC3-B7C6-D0AF1B68B6F9}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories>
+    <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceGrid</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Link>
+      <AdditionalDependencies>advapi32.lib;pdh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Link>
+      <AdditionalDependencies>advapi32.lib;pdh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Link>
+      <AdditionalDependencies>advapi32.lib;pdh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link>
+      <AdditionalDependencies>advapi32.lib;pdh.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceGridRegistry.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\AdapterCache.cpp" />
+    <ClCompile Include="..\..\AdminCallbackRouter.cpp" />
+    <ClCompile Include="..\..\AdminI.cpp" />
+    <ClCompile Include="..\..\AdminRouter.cpp" />
+    <ClCompile Include="..\..\AdminSessionI.cpp" />
+    <ClCompile Include="..\..\Allocatable.cpp" />
+    <ClCompile Include="..\..\AllocatableObjectCache.cpp" />
+    <ClCompile Include="..\..\Database.cpp" />
+    <ClCompile Include="..\..\DescriptorBuilder.cpp" />
+    <ClCompile Include="..\..\DescriptorHelper.cpp" />
+    <ClCompile Include="..\..\DescriptorParser.cpp" />
+    <ClCompile Include="..\..\FileCache.cpp" />
+    <ClCompile Include="..\..\FileUserAccountMapperI.cpp" />
+    <ClCompile Include="..\..\IceGridRegistry.cpp" />
+    <ClCompile Include="..\..\InternalRegistryI.cpp" />
+    <ClCompile Include="..\..\LocatorI.cpp" />
+    <ClCompile Include="..\..\LocatorRegistryI.cpp" />
+    <ClCompile Include="..\..\NodeCache.cpp" />
+    <ClCompile Include="..\..\NodeSessionI.cpp" />
+    <ClCompile Include="..\..\ObjectCache.cpp" />
+    <ClCompile Include="..\..\PlatformInfo.cpp" />
+    <ClCompile Include="..\..\PluginFacadeI.cpp" />
+    <ClCompile Include="..\..\QueryI.cpp" />
+    <ClCompile Include="..\..\ReapThread.cpp" />
+    <ClCompile Include="..\..\RegistryAdminRouter.cpp" />
+    <ClCompile Include="..\..\RegistryI.cpp" />
+    <ClCompile Include="..\..\ReplicaCache.cpp" />
+    <ClCompile Include="..\..\ReplicaSessionI.cpp" />
+    <ClCompile Include="..\..\ReplicaSessionManager.cpp" />
+    <ClCompile Include="..\..\ServerCache.cpp" />
+    <ClCompile Include="..\..\SessionI.cpp" />
+    <ClCompile Include="..\..\SessionManager.cpp" />
+    <ClCompile Include="..\..\SessionServantManager.cpp" />
+    <ClCompile Include="..\..\Topics.cpp" />
+    <ClCompile Include="..\..\TraceLevels.cpp" />
+    <ClCompile Include="..\..\Util.cpp" />
+    <ClCompile Include="..\..\WellKnownObjectsManager.cpp" />
+    <ClCompile Include="Win32\Debug\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Internal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Internal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Internal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Internal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice" />
+    <IceBuilder Include="..\..\Internal.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Win32\Debug\IceGrid\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceGrid\Internal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\Internal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\Internal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\Internal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj.filters b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj.filters
new file mode 100644
index 00000000000..c307dce6759
--- /dev/null
+++ b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj.filters
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{439a8037-980a-4716-933d-68aef7edbf49}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{e0f1272f-fac5-4b44-a0c2-3dd5cb3cd936}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{f58f5818-76af-4ce4-b017-622bafea1c66}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{992a03a2-b13b-44aa-9ed9-12b1352d8ccf}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{8d5d3051-ae40-4b2a-bce6-b84fe214c7b6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{0e230c06-d47e-4ea5-abe3-20f6ee4362a1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{7f9689eb-3e08-4bc6-a2ca-b304740d2756}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{56449da7-3e6f-444c-a132-9667a142308e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{abe623a4-c9f9-49f5-a141-20141367915f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{efb93b21-3259-493e-b6f6-b904ab441ec6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{1ff2327e-4377-4670-b6c9-9aa7dbc73de4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{74877940-0df8-48d7-89cf-979fef01eb08}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{8937dc12-08c0-4edb-b797-d882be6eba4c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{77e024a5-6f6f-4086-b21a-452b73c1aa1a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{c0208461-f1c4-41a1-9b1c-fe5ea1720bae}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{5cbbebb3-b9f0-4838-acbb-13f210fbb117}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceGridRegistry.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\AdapterCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AdminCallbackRouter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AdminI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AdminRouter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AdminSessionI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Allocatable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AllocatableObjectCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Database.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DescriptorBuilder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DescriptorHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\DescriptorParser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FileCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FileUserAccountMapperI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\IceGridRegistry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\InternalRegistryI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LocatorI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\LocatorRegistryI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NodeCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NodeSessionI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ObjectCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PlatformInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PluginFacadeI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\QueryI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ReapThread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RegistryAdminRouter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RegistryI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ReplicaCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ReplicaSessionI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ReplicaSessionManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ServerCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SessionI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SessionManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SessionServantManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Topics.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TraceLevels.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\WellKnownObjectsManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Internal.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Internal.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Internal.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Internal.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\Internal.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Win32\Debug\IceGrid\IceLocatorDiscovery.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceGrid\Internal.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\IceLocatorDiscovery.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\Internal.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\IceLocatorDiscovery.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\Internal.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\IceLocatorDiscovery.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\Internal.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceGrid/msbuild/icegridregistry/packages.config b/cpp/src/IceGrid/msbuild/icegridregistry/packages.config
new file mode 100644
index 00000000000..3f680df025a
--- /dev/null
+++ b/cpp/src/IceGrid/msbuild/icegridregistry/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="lmdb.v120" version="0.9.18.0" targetFramework="native" />
+  <package id="lmdb.v140" version="0.9.18.0" targetFramework="native" />
+</packages>
diff --git a/cpp/src/IceGridLib/.depend.mak b/cpp/src/IceGridLib/.depend.mak
deleted file mode 100755
index 8c45d59ffd5..00000000000
--- a/cpp/src/IceGridLib/.depend.mak
+++ /dev/null
@@ -1,1143 +0,0 @@
-
-Admin.h: \
-    "$(slicedir)\IceGrid\Admin.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Exception.ice" \
-    "$(slicedir)/IceGrid/Descriptor.ice"
-
-Descriptor.h: \
-    "$(slicedir)\IceGrid\Descriptor.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-Exception.h: \
-    "$(slicedir)\IceGrid\Exception.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-FileParser.h: \
-    "$(slicedir)\IceGrid\FileParser.ice" \
-    "$(slicedir)/IceGrid/Admin.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Exception.ice" \
-    "$(slicedir)/IceGrid/Descriptor.ice"
-
-Locator.h: \
-    "$(slicedir)\IceGrid\Locator.ice" \
-    "$(slicedir)/Ice/Locator.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/ProcessF.ice"
-
-Observer.h: \
-    "$(slicedir)\IceGrid\Observer.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Exception.ice" \
-    "$(slicedir)/IceGrid/Descriptor.ice" \
-    "$(slicedir)/IceGrid/Admin.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice"
-
-PluginFacade.h: \
-    "$(slicedir)\IceGrid\PluginFacade.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/IceGrid/Admin.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Exception.ice" \
-    "$(slicedir)/IceGrid/Descriptor.ice"
-
-Query.h: \
-    "$(slicedir)\IceGrid\Query.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/IceGrid/Exception.ice"
-
-Registry.h: \
-    "$(slicedir)\IceGrid\Registry.ice" \
-    "$(slicedir)/IceGrid/Exception.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/IceGrid/Session.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Admin.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/IceGrid/Descriptor.ice"
-
-Session.h: \
-    "$(slicedir)\IceGrid\Session.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Exception.ice"
-
-UserAccountMapper.h: \
-    "$(slicedir)\IceGrid\UserAccountMapper.ice"
-
-PluginFacadeI.obj: \
-	PluginFacadeI.cpp \
-    "$(includedir)\IceGrid\IceGrid.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\FileParser.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\IceGrid\UserAccountMapper.h" \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-
-Admin.obj: \
-	Admin.cpp \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-
-Descriptor.obj: \
-	Descriptor.cpp \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-
-Exception.obj: \
-	Exception.cpp \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-
-FileParser.obj: \
-	FileParser.cpp \
-    "$(includedir)\IceGrid\FileParser.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-
-Locator.obj: \
-	Locator.cpp \
-    "$(includedir)\IceGrid\Locator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-
-Observer.obj: \
-	Observer.cpp \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-
-PluginFacade.obj: \
-	PluginFacade.cpp \
-    "$(includedir)\IceGrid\PluginFacade.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-
-Query.obj: \
-	Query.cpp \
-    "$(includedir)\IceGrid\Query.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-
-Registry.obj: \
-	Registry.cpp \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-
-Session.obj: \
-	Session.cpp \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-
-UserAccountMapper.obj: \
-	UserAccountMapper.cpp \
-    "$(includedir)\IceGrid\UserAccountMapper.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
diff --git a/cpp/src/IceGridLib/.gitignore b/cpp/src/IceGridLib/.gitignore
deleted file mode 100644
index 9d7a58ce79a..00000000000
--- a/cpp/src/IceGridLib/.gitignore
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
-Admin.cpp
-Descriptor.cpp
-Exception.cpp
-FileParser.cpp
-Locator.cpp
-Observer.cpp
-PluginFacade.cpp
-Query.cpp
-Registry.cpp
-Session.cpp
-UserAccountMapper.cpp
-Admin.h
-Descriptor.h
-Exception.h
-FileParser.h
-Locator.h
-Observer.h
-PluginFacade.h
-Query.h
-Registry.h
-Session.h
-UserAccountMapper.h
diff --git a/cpp/src/IceGridLib/IceGrid.rc b/cpp/src/IceGridLib/IceGrid.rc
index 65728ae1fb6..70b65f16c55 100644
--- a/cpp/src/IceGridLib/IceGrid.rc
+++ b/cpp/src/IceGridLib/IceGrid.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icegrid36d\0"
- #define ORIGINALFILENAME "icegrid36d.dll\0"
+ #define INTERNALNAME "icegrid37a2d\0"
+ #define ORIGINALFILENAME "icegrid37a2d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icegrid36\0"
- #define ORIGINALFILENAME "icegrid36.dll\0"
+ #define INTERNALNAME "icegrid37a2\0"
+ #define ORIGINALFILENAME "icegrid37a2.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid C++ Client Library\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGridLib/Makefile b/cpp/src/IceGridLib/Makefile
deleted file mode 100644
index 05ce1680988..00000000000
--- a/cpp/src/IceGridLib/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME     = $(call mklibfilename,IceGrid,$(VERSION))
-SONAME          = $(call mksoname,IceGrid,$(SOVERSION))
-LIBNAME		= $(call mklibname,IceGrid)
-
-LIBTARGETS	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-TARGETS         = $(LIBTARGETS) $(NODE_SERVER) $(REGISTRY_SERVER) $(ADMIN)
-
-SLICE_OBJS	= Admin.o \
-		  Descriptor.o \
-		  Exception.o \
-		  FileParser.o \
-		  Locator.o \
-		  Observer.o \
-		  PluginFacade.o \
-		  Query.o \
-		  Registry.o \
-		  Session.o \
-		  UserAccountMapper.o
-
-OBJS		= PluginFacadeI.o \
-		  $(SLICE_OBJS)
-
-
-HDIR		= $(headerdir)/IceGrid
-SDIR		= $(slicedir)/IceGrid
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= $(CPPFLAGS) -I.. $(OPENSSL_FLAGS) $(READLINE_FLAGS)
-ICECPPFLAGS	:= $(ICECPPFLAGS) -I..
-SLICE2CPPFLAGS 	:= --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_API $(SLICE2CPPFLAGS)
-LINKWITH        := -lGlacier2 $(BZIP2_RPATH_LINK) -lIce -lIceUtil
-
-ifeq ($(STATICLIBS),yes)
-$(libdir)/$(LIBNAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mklib,$@,$(OBJS))
-else
-$(libdir)/$(LIBFILENAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	@mkdir -p $(libdir)$(cpp11libdirsuffix)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-endif
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/IceGridLib/Makefile.mak b/cpp/src/IceGridLib/Makefile.mak
deleted file mode 100644
index 230ee3afb13..00000000000
--- a/cpp/src/IceGridLib/Makefile.mak
+++ /dev/null
@@ -1,83 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME		= $(top_srcdir)\lib\icegrid$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icegrid$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-TARGETS         = $(LIBNAME) $(DLLNAME)
-
-SLICE_OBJS	= .\Admin.obj \
-		  .\Descriptor.obj \
-		  .\Exception.obj \
-		  .\FileParser.obj \
-		  .\Locator.obj \
-		  .\Observer.obj \
-		  .\PluginFacade.obj \
-		  .\Query.obj \
-		  .\Registry.obj \
-		  .\Session.obj \
-		  .\UserAccountMapper.obj
-
-OBJS		= .\PluginFacadeI.obj \
-                  $(SLICE_OBJS)
-
-HDIR		= $(headerdir)\IceGrid
-SDIR		= $(slicedir)\IceGrid
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-LINKWITH 	= $(LIBS)
-
-SLICE2CPPFLAGS	= --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_API $(SLICE2CPPFLAGS)
-CPPFLAGS        = -I.. $(CPPFLAGS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = IceGrid.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceGrid.res
-	$(LINK) $(BASE):0x2B000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-		$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	-del /q Admin.cpp $(HDIR)\Admin.h
-	-del /q Descriptor.cpp $(HDIR)\Descriptor.h
-	-del /q Exception.cpp $(HDIR)\Exception.h
-	-del /q FileParser.cpp $(HDIR)\FileParser.h
-	-del /q Locator.cpp $(HDIR)\Locator.h
-	-del /q Observer.cpp $(HDIR)\Observer.h
-	-del /q PluginFacade.cpp $(HDIR)\PluginFacade.h
-	-del /q Query.cpp $(HDIR)\Query.h
-	-del /q Registry.cpp $(HDIR)\Registry.h
-	-del /q Session.cpp $(HDIR)\Session.h
-	-del /q UserAccountMapper.cpp $(HDIR)\UserAccountMapper.h
-	-del /q IceGrid.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/IceGridLib/Makefile.mk b/cpp/src/IceGridLib/Makefile.mk
new file mode 100644
index 00000000000..577f900fbd9
--- /dev/null
+++ b/cpp/src/IceGridLib/Makefile.mk
@@ -0,0 +1,16 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries	:= IceGrid
+
+IceGrid_targetdir	:= $(libdir)
+IceGrid_dependencies	:= Glacier2 Ice
+IceGrid_sliceflags	:= --include-dir IceGrid --dll-export ICE_GRID_API
+
+projects += $(project)
diff --git a/cpp/src/IceGridLib/PluginFacadeI.cpp b/cpp/src/IceGridLib/PluginFacadeI.cpp
index 0b1748a852b..19496104190 100644
--- a/cpp/src/IceGridLib/PluginFacadeI.cpp
+++ b/cpp/src/IceGridLib/PluginFacadeI.cpp
@@ -18,9 +18,12 @@ using namespace IceGrid;
 namespace
 {
 
+#ifdef ICE_CPP11_MAPPING
+std::shared_ptr<RegistryPluginFacade> pluginFacade;
+#else
 RegistryPluginFacade* pluginFacade = 0;
-
-};
+#endif
+}
 
 namespace IceGrid
 {
@@ -38,6 +41,9 @@ IceGrid::getRegistryPluginFacade()
 void
 IceGrid::setRegistryPluginFacade(const RegistryPluginFacadePtr& facade)
 {
+#ifdef ICE_CPP11_MAPPING
+    pluginFacade = facade;
+#else
     if(pluginFacade)
     {
         pluginFacade->__decRef();
@@ -47,4 +53,5 @@ IceGrid::setRegistryPluginFacade(const RegistryPluginFacadePtr& facade)
     {
         pluginFacade->__incRef();
     }
+#endif
 }
diff --git a/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj b/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj
new file mode 100644
index 00000000000..2addaad07fe
--- /dev/null
+++ b/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{142A9562-8DEC-4B1B-9B15-2CAD8304447B}</ProjectGuid>
+    <RootNamespace>IceGrid</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderDLLExport>ICE_GRID_API</IceBuilderDLLExport>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceGrid.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Admin.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Descriptor.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Exception.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\FileParser.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\PluginFacade.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Registry.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Session.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\PluginFacadeI.cpp" />
+    <ClCompile Include="Win32\Debug\Admin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FileParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PluginFacade.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Registry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\UserAccountMapper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Admin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FileParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PluginFacade.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Registry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\UserAccountMapper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Admin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FileParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PluginFacade.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Registry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\UserAccountMapper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Admin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FileParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PluginFacade.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Registry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\UserAccountMapper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\Admin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\FileParser.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\PluginFacade.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\Registry.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\UserAccountMapper.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\Admin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\FileParser.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\PluginFacade.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\Registry.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\UserAccountMapper.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\Admin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\FileParser.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\PluginFacade.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\Registry.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\UserAccountMapper.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\Admin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\FileParser.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\PluginFacade.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\Registry.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\UserAccountMapper.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceGrid\Config.h" />
+    <ClInclude Include="..\..\..\..\include\IceGrid\IceGrid.h" />
+    <ClInclude Include="..\..\..\..\include\IceGrid\ReplicaGroupFilter.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj.filters b/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj.filters
new file mode 100644
index 00000000000..402184e4429
--- /dev/null
+++ b/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj.filters
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{d07074eb-a264-439f-9709-467dcc45e696}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bb42e106-19a7-4222-9c82-c27c94e52a2a}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{d2124f84-df2b-46b7-b03b-9385b365f141}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{d1771d9e-b527-4a80-ba53-22851dd5cbc3}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{4e703415-35bf-4c8f-8501-0e0416aa80ea}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{d6cb9b27-7968-4819-be22-f66aa720a4bd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{31f0c88c-0465-4026-9b70-90b0a8eee328}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{944c24b3-e108-48d2-9a14-dd13c2d8cc2e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{65ef2178-4949-4567-88f3-16e171895521}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{ff405661-7a7c-48e3-b6d0-9e55ebc530e9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{5b8d22a6-d1cc-4032-9ecd-f653b1c56a48}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{f7d9b719-6575-4e11-8319-8eae2750f5a7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{a2cb9d0b-86f6-4fb7-8e9f-41ad9a893a10}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{8a29e740-1aff-4882-bcdb-3c9e0777ad40}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{da2b5143-4ad7-4fdf-845d-5a3224e86284}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{f4c0cc81-674f-4e51-87c6-6c63c73672a8}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceGrid.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Admin.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Descriptor.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Exception.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\FileParser.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\PluginFacade.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Registry.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Session.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\PluginFacadeI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Admin.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Descriptor.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Exception.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FileParser.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PluginFacade.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Registry.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Session.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\UserAccountMapper.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Admin.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Descriptor.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Exception.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FileParser.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PluginFacade.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Registry.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Session.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\UserAccountMapper.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Admin.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Descriptor.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Exception.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FileParser.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PluginFacade.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Registry.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Session.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\UserAccountMapper.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Admin.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Descriptor.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Exception.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FileParser.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PluginFacade.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Registry.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Session.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\UserAccountMapper.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\IceGrid\Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceGrid\IceGrid.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceGrid\ReplicaGroupFilter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\Admin.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\Descriptor.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\Exception.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\FileParser.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\PluginFacade.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\Registry.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\Session.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceGrid\UserAccountMapper.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\Admin.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\Descriptor.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\Exception.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\FileParser.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\PluginFacade.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\Registry.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\Session.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceGrid\UserAccountMapper.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\Admin.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\Descriptor.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\Exception.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\FileParser.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\PluginFacade.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\Registry.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\Session.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceGrid\UserAccountMapper.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\Admin.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\Descriptor.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\Exception.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\FileParser.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\PluginFacade.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\Registry.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\Session.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceGrid\UserAccountMapper.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj
new file mode 100644
index 00000000000..886ed61a4b0
--- /dev/null
+++ b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj
@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{18BF13D3-85D3-43A5-8C96-E52EB0672F72}</ProjectGuid>
+    <RootNamespace>IceGrid</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderDLLExport>ICE_GRID_API</IceBuilderDLLExport>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link />
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceGrid.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Admin.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Descriptor.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Exception.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\FileParser.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\PluginFacade.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Registry.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Session.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\PluginFacadeI.cpp" />
+    <ClCompile Include="Win32\Debug\Admin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FileParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PluginFacade.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Registry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\UserAccountMapper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Admin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FileParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PluginFacade.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Registry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\UserAccountMapper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Admin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FileParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PluginFacade.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Registry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\UserAccountMapper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Admin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FileParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PluginFacade.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Registry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\UserAccountMapper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\Admin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\FileParser.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\PluginFacade.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\Registry.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\UserAccountMapper.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\Admin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\FileParser.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\PluginFacade.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\Registry.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\UserAccountMapper.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\Admin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\FileParser.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\PluginFacade.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\Registry.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\UserAccountMapper.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\Admin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\FileParser.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\PluginFacade.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\Registry.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\UserAccountMapper.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceGrid\Config.h" />
+    <ClInclude Include="..\..\..\..\include\IceGrid\IceGrid.h" />
+    <ClInclude Include="..\..\..\..\include\IceGrid\ReplicaGroupFilter.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj.filters b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj.filters
new file mode 100644
index 00000000000..5b37afe9a75
--- /dev/null
+++ b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj.filters
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{e4ed126f-8995-4e88-937a-ba647dc7201e}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{56d1b7d8-d79c-48be-af4e-8ff2f595dd3b}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{e6b6931b-139a-4023-9579-a1730f5b5e9e}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{e87db146-ca79-4131-8ce8-2e8524f6c934}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{07d7a4c5-b640-4883-8fbd-fe0d79f5174f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{bcfc3bd4-7616-4257-b0f9-7518cd43e0c8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{8debb300-4bbf-44fe-b5b2-b26d19ec7832}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{933fae55-61cd-48b6-bbc5-7e8c5d25491c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{36938814-3651-4d34-a6ad-c16233475136}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{56fe6306-2cb8-4d56-9065-3a6109b47b89}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{b7621411-9c44-4b0a-aa90-e19076199755}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{fa89e328-f780-4998-ade9-470f1cb49793}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{e4f05a94-dacb-4539-a5e3-a3e7c4215ada}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{96d77642-bf1d-4234-9efa-c21662c80b67}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{398e85b1-e851-41ec-8e9c-2f66501d2cea}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{bcf8da85-f282-431c-83e9-625c59302966}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceGrid.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Admin.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Descriptor.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Exception.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\FileParser.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\PluginFacade.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Registry.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Session.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\PluginFacadeI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Admin.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Descriptor.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Exception.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FileParser.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PluginFacade.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Registry.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Session.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\UserAccountMapper.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Admin.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Descriptor.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Exception.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FileParser.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PluginFacade.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Registry.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Session.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\UserAccountMapper.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Admin.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Descriptor.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Exception.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FileParser.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PluginFacade.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Registry.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Session.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\UserAccountMapper.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Admin.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Descriptor.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Exception.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FileParser.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PluginFacade.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Registry.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Session.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\UserAccountMapper.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\IceGrid\Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceGrid\IceGrid.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceGrid\ReplicaGroupFilter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\Admin.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\Descriptor.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\Exception.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\FileParser.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\PluginFacade.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\Registry.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\Session.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceGrid\UserAccountMapper.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\Admin.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\Descriptor.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\Exception.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\FileParser.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\PluginFacade.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\Registry.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\Session.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceGrid\UserAccountMapper.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\Admin.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\Descriptor.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\Exception.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\FileParser.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\PluginFacade.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\Registry.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\Session.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceGrid\UserAccountMapper.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\Admin.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\Descriptor.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\Exception.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\FileParser.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\PluginFacade.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\Registry.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\Session.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceGrid\UserAccountMapper.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj b/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj
new file mode 100644
index 00000000000..6e0bcb71b16
--- /dev/null
+++ b/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj
@@ -0,0 +1,824 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}</ProjectGuid>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WindowsAppContainer>true</WindowsAppContainer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_GRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_GRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_GRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_GRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_GRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_GRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Admin.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Descriptor.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Exception.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\FileParser.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\PluginFacade.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Registry.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Session.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ARM\Debug\Admin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\FileParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\PluginFacade.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Registry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\UserAccountMapper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Admin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\FileParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\PluginFacade.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Registry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\UserAccountMapper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Admin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FileParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PluginFacade.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Registry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\UserAccountMapper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Admin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FileParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PluginFacade.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Registry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\UserAccountMapper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Admin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FileParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PluginFacade.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Registry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\UserAccountMapper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Admin.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FileParser.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PluginFacade.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Registry.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Session.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\UserAccountMapper.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\Admin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\FileParser.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\PluginFacade.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\Registry.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\UserAccountMapper.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\Admin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\FileParser.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\PluginFacade.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\Registry.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\UserAccountMapper.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\Admin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\FileParser.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\PluginFacade.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\Registry.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\UserAccountMapper.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\Admin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\FileParser.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\PluginFacade.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\Registry.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\UserAccountMapper.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\Admin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\FileParser.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\PluginFacade.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\Registry.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\UserAccountMapper.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\Admin.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\FileParser.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\PluginFacade.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\Registry.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\Session.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\UserAccountMapper.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj.filters b/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj.filters
new file mode 100644
index 00000000000..346a55110f4
--- /dev/null
+++ b/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj.filters
@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{5011a910-4162-4cdd-a91c-5554a8e2b1d6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{98b43bd5-2f60-4484-b554-a3fb1e7906b2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{d59ec234-1c75-4f17-8e1b-6233cd15e1ab}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{a36d1226-3519-4fc1-b698-ad1deb63509d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{4c3e6929-4dea-4646-8235-a1fcd270d9ff}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{ef3f90ca-b930-4173-9c7c-6ae7cc79c163}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{eaa796ff-5f07-4295-aa3f-ed0b0eb6e7e0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM">
+      <UniqueIdentifier>{d2e9734d-b595-4a88-8465-a8826479b03f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Debug">
+      <UniqueIdentifier>{5feb9343-8430-4773-ac32-8de9aab668c9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM">
+      <UniqueIdentifier>{8b5902f1-d075-4cf8-9a9b-0dfba19ecf86}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Debug">
+      <UniqueIdentifier>{3e0bc52f-b04f-4458-9574-d03d085c8953}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{6662166d-ecc0-44dc-8066-b894dfb23ea3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{9e418ca6-756e-481b-8192-541bd899caa5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{9ed9fa84-b4b8-452b-8809-b92a7f820248}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{c19606dc-0bb7-4b85-9187-d4c1ac5bcbaa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{f0076350-fe18-4e4b-8f29-293359da1dc6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{872460a7-d570-4b00-bd6b-a655d00adf84}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Release">
+      <UniqueIdentifier>{388667be-e921-4665-b8c3-3c98f39a12ef}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Release">
+      <UniqueIdentifier>{c0c90e8e-3ae7-4650-8e6b-42d41b922d7c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{9edeb0b1-2af1-4ca7-bc73-b694a9c6c1b5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{74475212-a250-4349-b212-3848eac1963b}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Admin.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Descriptor.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Exception.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\FileParser.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\PluginFacade.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Registry.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\Session.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceGrid\UserAccountMapper.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Win32\Debug\Admin.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Descriptor.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Exception.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FileParser.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\PluginFacade.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Registry.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Session.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\UserAccountMapper.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Admin.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Descriptor.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Exception.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\FileParser.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\PluginFacade.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Registry.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Session.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\UserAccountMapper.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Admin.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Descriptor.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Exception.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FileParser.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PluginFacade.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Registry.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Session.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\UserAccountMapper.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Admin.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Descriptor.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Exception.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FileParser.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PluginFacade.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Registry.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Session.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\UserAccountMapper.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Admin.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Descriptor.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Exception.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\FileParser.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\PluginFacade.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Registry.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Session.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\UserAccountMapper.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Admin.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Descriptor.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Exception.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FileParser.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PluginFacade.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Registry.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Session.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\UserAccountMapper.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\Admin.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\Descriptor.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\Exception.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\FileParser.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\PluginFacade.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\Registry.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\Session.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceGrid\UserAccountMapper.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\Admin.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\Descriptor.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\Exception.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\FileParser.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\PluginFacade.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\Registry.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\Session.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceGrid\UserAccountMapper.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\Admin.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\Descriptor.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\Exception.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\FileParser.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\PluginFacade.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\Registry.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\Session.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceGrid\UserAccountMapper.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\Admin.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\Descriptor.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\Exception.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\FileParser.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\PluginFacade.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\Registry.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\Session.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceGrid\UserAccountMapper.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\Admin.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\Descriptor.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\Exception.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\FileParser.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\PluginFacade.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\Registry.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\Session.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceGrid\UserAccountMapper.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\Admin.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\Descriptor.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\Exception.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\FileParser.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\PluginFacade.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\Registry.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\Session.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceGrid\UserAccountMapper.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceGridLib/winrt/.depend.mak b/cpp/src/IceGridLib/winrt/.depend.mak
deleted file mode 100755
index f916ad69488..00000000000
--- a/cpp/src/IceGridLib/winrt/.depend.mak
+++ /dev/null
@@ -1,938 +0,0 @@
-
-..\Admin.h: \
-    "$(slicedir)\IceGrid\Admin.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Exception.ice" \
-    "$(slicedir)/IceGrid/Descriptor.ice"
-
-..\Descriptor.h: \
-    "$(slicedir)\IceGrid\Descriptor.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-..\Exception.h: \
-    "$(slicedir)\IceGrid\Exception.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-..\FileParser.h: \
-    "$(slicedir)\IceGrid\FileParser.ice" \
-    "$(slicedir)/IceGrid/Admin.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Exception.ice" \
-    "$(slicedir)/IceGrid/Descriptor.ice"
-
-..\Locator.h: \
-    "$(slicedir)\IceGrid\Locator.ice" \
-    "$(slicedir)/Ice/Locator.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/ProcessF.ice"
-
-..\Observer.h: \
-    "$(slicedir)\IceGrid\Observer.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Exception.ice" \
-    "$(slicedir)/IceGrid/Descriptor.ice" \
-    "$(slicedir)/IceGrid/Admin.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice"
-
-..\Query.h: \
-    "$(slicedir)\IceGrid\Query.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/IceGrid/Exception.ice"
-
-..\Registry.h: \
-    "$(slicedir)\IceGrid\Registry.ice" \
-    "$(slicedir)/IceGrid/Exception.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/IceGrid/Session.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Admin.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/IceGrid/Descriptor.ice"
-
-..\Session.h: \
-    "$(slicedir)\IceGrid\Session.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Exception.ice"
-
-..\UserAccountMapper.h: \
-    "$(slicedir)\IceGrid\UserAccountMapper.ice"
-
-$(ARCH)\$(CONFIG)\Admin.obj: \
-	..\Admin.cpp \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-
-$(ARCH)\$(CONFIG)\Descriptor.obj: \
-	..\Descriptor.cpp \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-
-$(ARCH)\$(CONFIG)\Exception.obj: \
-	..\Exception.cpp \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-
-$(ARCH)\$(CONFIG)\FileParser.obj: \
-	..\FileParser.cpp \
-    "$(includedir)\IceGrid\FileParser.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-
-$(ARCH)\$(CONFIG)\Locator.obj: \
-	..\Locator.cpp \
-    "$(includedir)\IceGrid\Locator.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-
-$(ARCH)\$(CONFIG)\Observer.obj: \
-	..\Observer.cpp \
-    "$(includedir)\IceGrid\Observer.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-
-$(ARCH)\$(CONFIG)\Query.obj: \
-	..\Query.cpp \
-    "$(includedir)\IceGrid\Query.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-
-$(ARCH)\$(CONFIG)\Registry.obj: \
-	..\Registry.cpp \
-    "$(includedir)\IceGrid\Registry.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Admin.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-
-$(ARCH)\$(CONFIG)\Session.obj: \
-	..\Session.cpp \
-    "$(includedir)\IceGrid\Session.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Glacier2\Session.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Glacier2\SSLInfo.h" \
-    "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-
-$(ARCH)\$(CONFIG)\UserAccountMapper.obj: \
-	..\UserAccountMapper.cpp \
-    "$(includedir)\IceGrid\UserAccountMapper.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
diff --git a/cpp/src/IceGridLib/winrt/Makefile.mak b/cpp/src/IceGridLib/winrt/Makefile.mak
deleted file mode 100644
index f942460c6b7..00000000000
--- a/cpp/src/IceGridLib/winrt/Makefile.mak
+++ /dev/null
@@ -1,72 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir		= ..\..\..
-LIBNAME		= $(SDK_LIBRARY_PATH)\icegrid.lib
-TARGETS		= $(LIBNAME)
-SOURCE_DIR	= ..
-
-TARGETS		= $(LIBNAME)
-
-OBJS		= $(ARCH)\$(CONFIG)\Admin.obj \
-		  $(ARCH)\$(CONFIG)\Descriptor.obj \
-		  $(ARCH)\$(CONFIG)\Exception.obj \
-		  $(ARCH)\$(CONFIG)\FileParser.obj \
-		  $(ARCH)\$(CONFIG)\Locator.obj \
-		  $(ARCH)\$(CONFIG)\Observer.obj \
-		  $(ARCH)\$(CONFIG)\Query.obj \
-		  $(ARCH)\$(CONFIG)\Registry.obj \
-		  $(ARCH)\$(CONFIG)\Session.obj \
-		  $(ARCH)\$(CONFIG)\UserAccountMapper.obj
-
-SLICE_SRCS	= IceGrid\Admin.ice \
-		  IceGrid\Descriptor.ice \
-		  IceGrid\Exception.ice \
-		  IceGrid\FileParser.ice \
-		  IceGrid\Locator.ice \
-		  IceGrid\Observer.ice \
-		  IceGrid\Query.ice \
-		  IceGrid\Registry.ice \
-		  IceGrid\Session.ice \
-		  IceGrid\UserAccountMapper.ice
-
-SRCS		= $(OBJS:.obj=.cpp)
-SRCS		= $(SRCS:x86\=)
-SRCS		= $(SRCS:x64\=)
-SRCS		= $(SRCS:arm\=)
-SRCS		= $(SRCS:Retail\=..\)
-SRCS		= $(SRCS:Debug\=..\)
-
-HDIR		= $(headerdir)\IceGrid
-SDIR		= $(slicedir)\IceGrid
-
-PDBNAME		= $(LIBNAME:.lib=.pdb)
-CPPFLAGS        = /Fd$(PDBNAME) -I..\.. $(CPPFLAGS) -DICE_BUILDING_ICEGRID -DWIN32_LEAN_AND_MEAN
-SLICE2CPPFLAGS	= --checksum --ice --include-dir IceGrid
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-$(LIBNAME): $(OBJS) sdks
-	$(AR) $(ARFLAGS) $(OBJS) /out:$(LIBNAME)
-
-clean::
-	-del /q $(SOURCE_DIR)\Admin.cpp $(HDIR)\Admin.h
-	-del /q $(SOURCE_DIR)\Descriptor.cpp $(HDIR)\Descriptor.h
-	-del /q $(SOURCE_DIR)\Exception.cpp $(HDIR)\Exception.h
-	-del /q $(SOURCE_DIR)\FileParser.cpp $(HDIR)\FileParser.h
-	-del /q $(SOURCE_DIR)\Locator.cpp $(HDIR)\Locator.h
-	-del /q $(SOURCE_DIR)\Observer.cpp $(HDIR)\Observer.h
-	-del /q $(SOURCE_DIR)\Query.cpp $(HDIR)\Query.h
-	-del /q $(SOURCE_DIR)\Registry.cpp $(HDIR)\Registry.h
-	-del /q $(SOURCE_DIR)\Session.cpp $(HDIR)\Session.h
-	-del /q $(SOURCE_DIR)\UserAccountMapper.cpp $(HDIR)\UserAccountMapper.h
-	-del /q $(ARCH)\$(CONFIG)\*.obj
-	-del /q $(PDBNAME)
-
-install:: all
diff --git a/cpp/src/IceIAP/Connector.h b/cpp/src/IceIAP/Connector.h
new file mode 100644
index 00000000000..f2bd4281d95
--- /dev/null
+++ b/cpp/src/IceIAP/Connector.h
@@ -0,0 +1,58 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_IAP_CONNECTOR_H
+#define ICE_IAP_CONNECTOR_H
+
+#include <Ice/TransceiverF.h>
+#include <Ice/ProtocolInstanceF.h>
+#include <Ice/TraceLevelsF.h>
+#include <Ice/LoggerF.h>
+#include <Ice/Connector.h>
+
+#import <Foundation/Foundation.h>
+#import <ExternalAccessory/ExternalAccessory.h>
+
+namespace IceObjC
+{
+
+class iAPEndpointI;
+
+class Instance;
+typedef IceUtil::Handle<Instance> InstancePtr;
+
+class iAPConnector : public IceInternal::Connector
+{
+public:
+
+    virtual IceInternal::TransceiverPtr connect();
+
+    virtual Ice::Short type() const;
+    virtual std::string toString() const;
+
+    virtual bool operator==(const IceInternal::Connector&) const;
+    virtual bool operator!=(const IceInternal::Connector&) const;
+    virtual bool operator<(const IceInternal::Connector&) const;
+
+private:
+
+    iAPConnector(const IceInternal::ProtocolInstancePtr&, Ice::Int, const std::string&, NSString*, EAAccessory*);
+    virtual ~iAPConnector();
+    friend class iAPEndpointI;
+
+    const IceInternal::ProtocolInstancePtr _instance;
+    const Ice::Int _timeout;
+    const std::string _connectionId;
+    NSString* _protocol;
+    EAAccessory* _accessory;
+};
+
+}
+
+#endif
diff --git a/cpp/src/IceIAP/Connector.mm b/cpp/src/IceIAP/Connector.mm
new file mode 100644
index 00000000000..b7c57ddb31b
--- /dev/null
+++ b/cpp/src/IceIAP/Connector.mm
@@ -0,0 +1,153 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include "Transceiver.h"
+#include "EndpointI.h"
+#include "Connector.h"
+
+#include <Ice/ProtocolInstance.h>
+#include <Ice/Exception.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+TransceiverPtr
+IceObjC::iAPConnector::connect()
+{
+    EASession* session = [[EASession alloc] initWithAccessory:_accessory forProtocol:_protocol];
+    if(!session)
+    {
+        throw Ice::ConnectFailedException(__FILE__, __LINE__, 0);
+    }
+    return new iAPTransceiver(_instance, session);
+}
+
+Short
+IceObjC::iAPConnector::type() const
+{
+    return _instance->type();
+}
+
+string
+IceObjC::iAPConnector::toString() const
+{
+    ostringstream os;
+    os << [_accessory.name UTF8String];
+    os << " model `" << [_accessory.modelNumber UTF8String] << "'";
+    os << " made by `" << [_accessory.manufacturer UTF8String] << "'";
+    os << " protocol `" << [_protocol UTF8String] << "'";
+    return os.str();
+}
+
+bool
+IceObjC::iAPConnector::operator==(const IceInternal::Connector& r) const
+{
+    const iAPConnector* p = dynamic_cast<const iAPConnector*>(&r);
+    if(!p)
+    {
+        return false;
+    }
+
+    if(_timeout != p->_timeout)
+    {
+        return false;
+    }
+
+    if(_connectionId != p->_connectionId)
+    {
+        return false;
+    }
+
+    if(![_accessory isEqual:p->_accessory])
+    {
+        return false;
+    }
+
+    if(![_protocol isEqual:p->_protocol])
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool
+IceObjC::iAPConnector::operator!=(const IceInternal::Connector& r) const
+{
+    return !operator==(r);
+}
+
+bool
+IceObjC::iAPConnector::operator<(const IceInternal::Connector& r) const
+{
+    const iAPConnector* p = dynamic_cast<const iAPConnector*>(&r);
+    if(!p)
+    {
+        return type() < r.type();
+    }
+
+    if(_timeout < p->_timeout)
+    {
+        return true;
+    }
+    else if(p->_timeout < _timeout)
+    {
+        return false;
+    }
+
+    if(_connectionId < p->_connectionId)
+    {
+        return true;
+    }
+    else if(p->_connectionId < _connectionId)
+    {
+        return false;
+    }
+
+    if([_accessory hash] < [p->_accessory hash])
+    {
+        return true;
+    }
+    else if([p->_accessory hash] < [_accessory hash])
+    {
+        return false;
+    }
+
+    NSInteger order = [_protocol compare:p->_protocol];
+    if(order == NSOrderedAscending)
+    {
+        return true;
+    }
+    else if(order == NSOrderedDescending)
+    {
+        return false;
+    }
+
+    return false;
+}
+
+IceObjC::iAPConnector::iAPConnector(const ProtocolInstancePtr& instance,
+                                    Ice::Int timeout,
+                                    const string& connectionId,
+                                    NSString* protocol,
+                                    EAAccessory* accessory) :
+    _instance(instance),
+    _timeout(timeout),
+    _connectionId(connectionId),
+    _protocol([protocol retain]),
+    _accessory([accessory retain])
+{
+}
+
+IceObjC::iAPConnector::~iAPConnector()
+{
+    [_protocol release];
+    [_accessory release];
+}
diff --git a/cpp/src/IceIAP/EndpointI.h b/cpp/src/IceIAP/EndpointI.h
new file mode 100644
index 00000000000..c4016073453
--- /dev/null
+++ b/cpp/src/IceIAP/EndpointI.h
@@ -0,0 +1,110 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_IAP_ENDPOINT_I_H
+#define ICE_IAP_ENDPOINT_I_H
+
+#include <Ice/ProtocolInstanceF.h>
+#include <Ice/EndpointI.h>
+#include <Ice/EndpointFactory.h>
+
+namespace IceObjC
+{
+
+class iAPEndpointI;
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+typedef ::std::shared_ptr<iAPEndpointI> iAPEndpointIPtr;
+#else
+typedef IceUtil::Handle<iAPEndpointI> iAPEndpointIPtr;
+#endif
+
+class iAPEndpointI : public IceInternal::EndpointI, public Ice::EnableSharedFromThis<iAPEndpointI>
+{
+public:
+
+    iAPEndpointI(const IceInternal::ProtocolInstancePtr&, const std::string&, const std::string&, const std::string&,
+                 const std::string&, Ice::Int, const std::string&, bool);
+    iAPEndpointI(const IceInternal::ProtocolInstancePtr&);
+    iAPEndpointI(const IceInternal::ProtocolInstancePtr&, Ice::InputStream*);
+
+    virtual void streamWriteImpl(Ice::OutputStream*) const;
+
+    virtual Ice::EndpointInfoPtr getInfo() const;
+    virtual Ice::Short type() const;
+    virtual const std::string& protocol() const;
+    virtual bool datagram() const;
+    virtual bool secure() const;
+
+    virtual Ice::Int timeout() const;
+    virtual IceInternal::EndpointIPtr timeout(Ice::Int) const;
+    virtual const std::string& connectionId() const;
+    virtual IceInternal::EndpointIPtr connectionId(const std::string&) const;
+    virtual bool compress() const;
+    virtual IceInternal::EndpointIPtr compress(bool) const;
+
+    virtual IceInternal::TransceiverPtr transceiver() const;
+    virtual void connectors_async(Ice::EndpointSelectionType, const IceInternal::EndpointI_connectorsPtr&) const;
+    virtual IceInternal::AcceptorPtr acceptor(const std::string&) const;
+
+    virtual std::vector<IceInternal::EndpointIPtr> expand() const;
+    virtual bool equivalent(const IceInternal::EndpointIPtr&) const;
+
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const Ice::Endpoint&) const;
+    virtual bool operator<(const Ice::Endpoint&) const;
+#else
+    virtual bool operator==(const Ice::LocalObject&) const;
+    virtual bool operator<(const Ice::LocalObject&) const;
+#endif
+
+    virtual std::string options() const;
+    virtual ::Ice::Int hash() const;
+
+private:
+
+    virtual bool checkOption(const std::string&, const std::string&, const std::string&);
+
+    //
+    // All members are const, because endpoints are immutable.
+    //
+    const IceInternal::ProtocolInstancePtr _instance;
+    const std::string _manufacturer;
+    const std::string _modelNumber;
+    const std::string _name;
+    const std::string _protocol;
+    const Ice::Int _timeout;
+    const std::string _connectionId;
+    const bool _compress;
+};
+
+class iAPEndpointFactory : public IceInternal::EndpointFactory
+{
+public:
+
+    iAPEndpointFactory(const IceInternal::ProtocolInstancePtr&);
+
+    virtual ~iAPEndpointFactory();
+
+    virtual Ice::Short type() const;
+    virtual std::string protocol() const;
+    virtual IceInternal::EndpointIPtr create(std::vector<std::string>&, bool) const;
+    virtual IceInternal::EndpointIPtr read(Ice::InputStream*) const;
+    virtual void destroy();
+
+    virtual IceInternal::EndpointFactoryPtr clone(const IceInternal::ProtocolInstancePtr&,
+                                                  const IceInternal::EndpointFactoryPtr&) const;
+
+private:
+
+    IceInternal::ProtocolInstancePtr _instance;
+};
+
+}
+
+#endif
diff --git a/cpp/src/IceIAP/EndpointI.mm b/cpp/src/IceIAP/EndpointI.mm
new file mode 100644
index 00000000000..44a0526d9ab
--- /dev/null
+++ b/cpp/src/IceIAP/EndpointI.mm
@@ -0,0 +1,706 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include "EndpointI.h"
+#include "Connector.h"
+
+#include <IceIAP/EndpointInfo.h>
+
+#include <Ice/Network.h>
+#include <Ice/InputStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/LocalException.h>
+#include <Ice/ProtocolInstance.h>
+#include <Ice/DefaultsAndOverrides.h>
+#include <Ice/Initialize.h>
+#include <Ice/EndpointFactoryManager.h>
+#include <Ice/Properties.h>
+#include <Ice/HashUtil.h>
+#include <Ice/ProtocolPluginFacade.h>
+#include <Ice/RegisterPlugins.h>
+
+#include <CoreFoundation/CoreFoundation.h>
+
+#include <fstream>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+namespace
+{
+
+class iAPEndpointFactoryPlugin : public Ice::Plugin
+{
+public:
+
+    iAPEndpointFactoryPlugin(const Ice::CommunicatorPtr& com)
+    {
+        ProtocolPluginFacadePtr pluginFacade = getProtocolPluginFacade(com);
+
+        // iAP transport
+        ProtocolInstancePtr instance = new ProtocolInstance(com, iAPEndpointType, "iap", false);
+        pluginFacade->addEndpointFactory(new IceObjC::iAPEndpointFactory(instance));
+
+        // SSL based on iAP transport
+        EndpointFactoryPtr ssl = pluginFacade->getEndpointFactory(SSLEndpointType);
+        if(ssl)
+        {
+            ProtocolInstancePtr sslinstance = new ProtocolInstance(com, iAPSEndpointType, "iaps", true);
+            pluginFacade->addEndpointFactory(ssl->clone(sslinstance, new IceObjC::iAPEndpointFactory(sslinstance)));
+        }
+    }
+
+    virtual void initialize() {}
+    virtual void destroy() {}
+};
+
+}
+
+extern "C" ICE_IAP_API Plugin*
+createIceIAP(const CommunicatorPtr& com, const string&, const StringSeq&)
+{
+    return new iAPEndpointFactoryPlugin(com);
+}
+
+namespace Ice
+{
+
+ICE_IAP_API void
+registerIceIAP(bool loadOnInitialize)
+{
+    Ice::registerPluginFactory("IceIAP", createIceIAP, loadOnInitialize);
+}
+
+}
+
+//
+// Objective-C function to allow Objective-C programs to register plugin.
+//
+extern "C" ICE_IAP_API void
+ICEregisterIceIAP(bool loadOnInitialize)
+{
+    Ice::registerIceIAP(loadOnInitialize);
+}
+
+IceObjC::iAPEndpointI::iAPEndpointI(const ProtocolInstancePtr& instance, const string& m,
+                                    const string& o, const string& n, const string& p, Int ti,
+                                    const string& conId, bool co) :
+    _instance(instance),
+    _manufacturer(m),
+    _modelNumber(o),
+    _name(n),
+    _protocol(p),
+    _timeout(ti),
+    _connectionId(conId),
+    _compress(co)
+{
+}
+
+IceObjC::iAPEndpointI::iAPEndpointI(const ProtocolInstancePtr& instance) :
+    _instance(instance),
+    _timeout(-1),
+    _compress(false)
+{
+}
+
+IceObjC::iAPEndpointI::iAPEndpointI(const ProtocolInstancePtr& instance, InputStream* s) :
+    _instance(instance),
+    _timeout(-1),
+    _compress(false)
+{
+    s->read(const_cast<string&>(_manufacturer), false);
+    s->read(const_cast<string&>(_modelNumber), false);
+    s->read(const_cast<string&>(_name), false);
+    s->read(const_cast<string&>(_protocol), false);
+    s->read(const_cast<Int&>(_timeout));
+    s->read(const_cast<bool&>(_compress));
+}
+
+void
+IceObjC::iAPEndpointI::streamWriteImpl(OutputStream* s) const
+{
+    s->write(_manufacturer, false);
+    s->write(_modelNumber, false);
+    s->write(_name, false);
+    s->write(_protocol, false);
+    s->write(_timeout);
+    s->write(_compress);
+}
+
+EndpointInfoPtr
+IceObjC::iAPEndpointI::getInfo() const
+{
+    IceIAP::EndpointInfoPtr info = ICE_MAKE_SHARED(InfoI<IceIAP::EndpointInfo>, shared_from_this());
+    info->timeout = _timeout;
+    info->compress = _compress;
+    info->manufacturer = _manufacturer;
+    info->modelNumber = _modelNumber;
+    info->name = _name;
+    info->protocol = _protocol;
+    return info;
+}
+
+Short
+IceObjC::iAPEndpointI::type() const
+{
+    return _instance->type();
+}
+
+const string&
+IceObjC::iAPEndpointI::protocol() const
+{
+    return _instance->protocol();
+}
+
+bool
+IceObjC::iAPEndpointI::datagram() const
+{
+    return false;
+}
+
+bool
+IceObjC::iAPEndpointI::secure() const
+{
+    return _instance->secure();
+}
+
+Int
+IceObjC::iAPEndpointI::timeout() const
+{
+    return _timeout;
+}
+
+EndpointIPtr
+IceObjC::iAPEndpointI::timeout(Int t) const
+{
+    if(t == _timeout)
+    {
+        return shared_from_this();
+    }
+    else
+    {
+        return ICE_MAKE_SHARED(iAPEndpointI, _instance, _manufacturer, _modelNumber, _name, _protocol, t, _connectionId,
+                               _compress);
+    }
+}
+
+const string&
+IceObjC::iAPEndpointI::connectionId() const
+{
+    return _connectionId;
+}
+
+EndpointIPtr
+IceObjC::iAPEndpointI::connectionId(const string& cId) const
+{
+    if(cId == _connectionId)
+    {
+        return shared_from_this();
+    }
+    else
+    {
+        return ICE_MAKE_SHARED(iAPEndpointI, _instance, _manufacturer, _modelNumber, _name, _protocol, _timeout, cId,
+                               _compress);
+    }
+}
+
+bool
+IceObjC::iAPEndpointI::compress() const
+{
+    return _compress;
+}
+
+EndpointIPtr
+IceObjC::iAPEndpointI::compress(bool c) const
+{
+    if(c == _compress)
+    {
+        return shared_from_this();
+    }
+    else
+    {
+        return ICE_MAKE_SHARED(iAPEndpointI, _instance, _manufacturer, _modelNumber, _name, _protocol, _timeout,
+                               _connectionId, c);
+    }
+}
+
+TransceiverPtr
+IceObjC::iAPEndpointI::transceiver() const
+{
+    return 0;
+}
+
+void
+IceObjC::iAPEndpointI::connectors_async(Ice::EndpointSelectionType selType,
+                                        const EndpointI_connectorsPtr& callback) const
+{
+    try
+    {
+        vector<ConnectorPtr> c;
+
+        EAAccessoryManager* manager = [EAAccessoryManager sharedAccessoryManager];
+        if(manager == nil)
+        {
+            throw Ice::ConnectFailedException(__FILE__, __LINE__, 0);
+        }
+
+        NSString* protocol = _protocol.empty() ? @"com.zeroc.ice" : [[NSString alloc] initWithUTF8String:_protocol.c_str()];
+        NSArray* array = [manager connectedAccessories];
+        NSEnumerator* enumerator = [array objectEnumerator];
+        EAAccessory* accessory = nil;
+        while((accessory = [enumerator nextObject]))
+        {
+            if(!accessory.connected)
+            {
+                continue;
+            }
+            if(!_manufacturer.empty() && _manufacturer != [accessory.manufacturer UTF8String])
+            {
+                continue;
+            }
+            if(!_modelNumber.empty() && _modelNumber != [accessory.modelNumber UTF8String])
+            {
+                continue;
+            }
+            if(!_name.empty() && _name != [accessory.name UTF8String])
+            {
+                continue;
+            }
+            if(![accessory.protocolStrings containsObject:protocol])
+            {
+                continue;
+            }
+            c.push_back(new iAPConnector(_instance, _timeout, _connectionId, protocol, accessory));
+        }
+        [protocol release];
+        if(c.empty())
+        {
+            throw Ice::ConnectFailedException(__FILE__, __LINE__, 0);
+        }
+        callback->connectors(c);
+    }
+    catch(const Ice::LocalException& ex)
+    {
+        callback->exception(ex);
+    }
+}
+
+AcceptorPtr
+IceObjC::iAPEndpointI::acceptor(const string&) const
+{
+    assert(false);
+    return 0;
+}
+
+vector<EndpointIPtr>
+IceObjC::iAPEndpointI::expand() const
+{
+    vector<EndpointIPtr> endps;
+    endps.push_back(shared_from_this());
+    return endps;
+}
+
+bool
+IceObjC::iAPEndpointI::equivalent(const EndpointIPtr& endpoint) const
+{
+    const iAPEndpointI* endpointI = dynamic_cast<const iAPEndpointI*>(endpoint.get());
+    if(!endpointI)
+    {
+        return false;
+    }
+    return endpointI->_manufacturer == _manufacturer &&
+           endpointI->_modelNumber == _modelNumber &&
+           endpointI->_name == _name &&
+           endpointI->_protocol == _protocol;
+}
+
+bool
+#ifdef ICE_CPP11_MAPPING
+IceObjC::iAPEndpointI::operator==(const Ice::Endpoint& r) const
+#else
+IceObjC::iAPEndpointI::operator==(const Ice::LocalObject& r) const
+#endif
+{
+    const iAPEndpointI* p = dynamic_cast<const iAPEndpointI*>(&r);
+    if(!p)
+    {
+        return false;
+    }
+
+    if(this == p)
+    {
+        return true;
+    }
+
+    if(_manufacturer != p->_manufacturer)
+    {
+        return false;
+    }
+
+    if(_modelNumber != p->_modelNumber)
+    {
+        return false;
+    }
+
+    if(_name != p->_name)
+    {
+        return false;
+    }
+
+    if(_protocol != p->_protocol)
+    {
+        return false;
+    }
+
+    if(_timeout != p->_timeout)
+    {
+        return false;
+    }
+
+    if(_connectionId != p->_connectionId)
+    {
+        return false;
+    }
+
+    if(_compress != p->_compress)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool
+#ifdef ICE_CPP11_MAPPING
+IceObjC::iAPEndpointI::operator<(const Ice::Endpoint& r) const
+#else
+IceObjC::iAPEndpointI::operator<(const Ice::LocalObject& r) const
+#endif
+{
+    const iAPEndpointI* p = dynamic_cast<const iAPEndpointI*>(&r);
+    if(!p)
+    {
+        const IceInternal::EndpointI* e = dynamic_cast<const IceInternal::EndpointI*>(&r);
+        if(!e)
+        {
+            return false;
+        }
+        return type() < e->type();
+    }
+
+    if(this == p)
+    {
+        return false;
+    }
+
+    if(_manufacturer < p->_manufacturer)
+    {
+        return true;
+    }
+    else if(p->_manufacturer < _manufacturer)
+    {
+        return false;
+    }
+
+    if(_modelNumber < p->_modelNumber)
+    {
+        return true;
+    }
+    else if(p->_modelNumber < _modelNumber)
+    {
+        return false;
+    }
+
+    if(_name < p->_name)
+    {
+        return true;
+    }
+    else if(p->_name < _name)
+    {
+        return false;
+    }
+
+    if(_protocol < p->_protocol)
+    {
+        return true;
+    }
+    else if(p->_protocol < _protocol)
+    {
+        return false;
+    }
+
+    if(_timeout < p->_timeout)
+    {
+        return true;
+    }
+    else if(p->_timeout < _timeout)
+    {
+        return false;
+    }
+
+    if(_connectionId < p->_connectionId)
+    {
+        return true;
+    }
+    else if(p->_connectionId < _connectionId)
+    {
+        return false;
+    }
+
+    if(!_compress && p->_compress)
+    {
+        return true;
+    }
+    else if(p->_compress < _compress)
+    {
+        return false;
+    }
+
+    return false;
+}
+
+string
+IceObjC::iAPEndpointI::options() const
+{
+    //
+    // WARNING: Certain features, such as proxy validation in Glacier2,
+    // depend on the format of proxy strings. Changes to toString() and
+    // methods called to generate parts of the reference string could break
+    // these features. Please review for all features that depend on the
+    // format of proxyToString() before changing this and related code.
+    //
+    ostringstream s;
+    if(!_manufacturer.empty())
+    {
+        s << " -m ";
+        bool addQuote = _manufacturer.find(':') != string::npos;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+        s << _manufacturer;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+    }
+
+    if(!_modelNumber.empty())
+    {
+        s << " -o ";
+        bool addQuote = _modelNumber.find(':') != string::npos;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+        s << _modelNumber;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+    }
+
+    if(!_name.empty())
+    {
+        s << " -n ";
+        bool addQuote = _name.find(':') != string::npos;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+        s << _name;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+    }
+
+    if(!_protocol.empty())
+    {
+        s << " -p ";
+        bool addQuote = _protocol.find(':') != string::npos;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+        s << _protocol;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+    }
+
+    if(_timeout != -1)
+    {
+        s << " -t " << _timeout;
+    }
+
+    if(_compress)
+    {
+        s << " -z";
+    }
+    return s.str();
+}
+
+Ice::Int
+IceObjC::iAPEndpointI::hash() const
+{
+    Ice::Int h = 5381;
+    hashAdd(h, _manufacturer);
+    hashAdd(h, _modelNumber);
+    hashAdd(h, _name);
+    hashAdd(h, _protocol);
+    hashAdd(h, _timeout);
+    hashAdd(h, _connectionId);
+    return h;
+}
+
+bool
+IceObjC::iAPEndpointI::checkOption(const string& option, const string& argument, const string& endpoint)
+{
+    switch(option[1])
+    {
+        case 'm':
+        {
+            if(argument.empty())
+            {
+                EndpointParseException ex(__FILE__, __LINE__);
+                ex.str = "no argument provided for -h option in endpoint " + endpoint;
+                throw ex;
+            }
+            const_cast<string&>(_manufacturer) = argument;
+            break;
+        }
+
+        case 'o':
+        {
+            if(argument.empty())
+            {
+                EndpointParseException ex(__FILE__, __LINE__);
+                ex.str = "no argument provided for -h option in endpoint " + endpoint;
+                throw ex;
+            }
+            const_cast<string&>(_modelNumber) = argument;
+            break;
+        }
+
+        case 'n':
+        {
+            if(argument.empty())
+            {
+                EndpointParseException ex(__FILE__, __LINE__);
+                ex.str = "no argument provided for -h option in endpoint " + endpoint;
+                throw ex;
+            }
+            const_cast<string&>(_name) = argument;
+            break;
+        }
+
+        case 'p':
+        {
+            if(argument.empty())
+            {
+                EndpointParseException ex(__FILE__, __LINE__);
+                ex.str = "no argument provided for -h option in endpoint " + endpoint;
+                throw ex;
+            }
+            const_cast<string&>(_protocol) = argument;
+            break;
+        }
+
+        case 't':
+        {
+            if(argument == "infinite")
+            {
+                const_cast<Int&>(_timeout) = -1;
+            }
+            else
+            {
+                istringstream t(argument);
+                if(!(t >> const_cast<Int&>(_timeout)) || !t.eof() || _timeout < 1)
+                {
+                    EndpointParseException ex(__FILE__, __LINE__);
+                    ex.str = "invalid timeout value `" + argument + "' in endpoint " + endpoint;
+                    throw ex;
+                }
+            }
+            break;
+        }
+
+        case 'z':
+        {
+            if(!argument.empty())
+            {
+                EndpointParseException ex(__FILE__, __LINE__);
+                ex.str = "no argument provided for -h option in endpoint " + endpoint;
+                throw ex;
+            }
+            const_cast<bool&>(_compress) = true;
+            break;
+        }
+
+        default:
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+IceObjC::iAPEndpointFactory::iAPEndpointFactory(const ProtocolInstancePtr& instance) :
+    _instance(instance)
+{
+}
+
+IceObjC::iAPEndpointFactory::~iAPEndpointFactory()
+{
+}
+
+Short
+IceObjC::iAPEndpointFactory::type() const
+{
+    return _instance->type();
+}
+
+string
+IceObjC::iAPEndpointFactory::protocol() const
+{
+    return _instance->protocol();
+}
+
+EndpointIPtr
+IceObjC::iAPEndpointFactory::create(vector<string>& args, bool oaEndpoint) const
+{
+    if(oaEndpoint)
+    {
+        return 0;
+    }
+    EndpointIPtr endpt = ICE_MAKE_SHARED(iAPEndpointI, _instance);
+    endpt->initWithOptions(args);
+    return endpt;
+}
+
+EndpointIPtr
+IceObjC::iAPEndpointFactory::read(InputStream* s) const
+{
+    return ICE_MAKE_SHARED(iAPEndpointI, _instance, s);
+}
+
+void
+IceObjC::iAPEndpointFactory::destroy()
+{
+    _instance = 0;
+}
+
+EndpointFactoryPtr
+IceObjC::iAPEndpointFactory::clone(const ProtocolInstancePtr& instance, const IceInternal::EndpointFactoryPtr&) const
+{
+    return new iAPEndpointFactory(instance);
+}
diff --git a/cpp/src/IceIAP/Makefile.mk b/cpp/src/IceIAP/Makefile.mk
new file mode 100644
index 00000000000..daeffbead19
--- /dev/null
+++ b/cpp/src/IceIAP/Makefile.mk
@@ -0,0 +1,20 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries	= IceIAP
+
+IceIAP_configs		:= xcodesdk cpp11-xcodesdk
+IceIAP_platforms	:= iphoneos iphonesimulator
+
+IceIAP_targetdir	:= $(libdir)
+IceIAP_dependencies	:= Ice
+IceIAP_sliceflags	:= --include-dir IceIAP --dll-export ICE_IAP_API
+IceIAP_cppflags  	:= -DICE_IAP_API_EXPORTS
+
+projects += $(project)
diff --git a/cpp/src/IceIAP/Transceiver.h b/cpp/src/IceIAP/Transceiver.h
new file mode 100644
index 00000000000..b82ed27c395
--- /dev/null
+++ b/cpp/src/IceIAP/Transceiver.h
@@ -0,0 +1,86 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_IAP_TRANSCEIVER_H
+#define ICE_IAP_TRANSCEIVER_H
+
+#include <Ice/ProtocolInstanceF.h>
+#include <Ice/Transceiver.h>
+#include <Ice/Network.h>
+#include <Ice/Selector.h>
+
+#import <Foundation/Foundation.h>
+#import <ExternalAccessory/ExternalAccessory.h>
+
+@class iAPTransceiverCallback;
+
+namespace IceObjC
+{
+
+class iAPTransceiver : public IceInternal::Transceiver, public IceInternal::StreamNativeInfo
+{
+    enum State
+    {
+        StateNeedConnect,
+        StateConnectPending,
+        StateConnected
+    };
+
+public:
+
+    iAPTransceiver(const IceInternal::ProtocolInstancePtr&, EASession*);
+    virtual ~iAPTransceiver();
+
+    virtual void initStreams(IceInternal::SelectorReadyCallback*);
+    virtual IceInternal::SocketOperation registerWithRunLoop(IceInternal::SocketOperation);
+    virtual IceInternal::SocketOperation unregisterFromRunLoop(IceInternal::SocketOperation, bool);
+    virtual void closeStreams();
+
+    virtual IceInternal::NativeInfoPtr getNativeInfo();
+
+    virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&);
+#ifdef ICE_CPP11_MAPPING
+    virtual IceInternal::SocketOperation closing(bool, std::exception_ptr);
+#else
+    virtual IceInternal::SocketOperation closing(bool, const Ice::LocalException&);
+#endif
+    virtual void close();
+    virtual IceInternal::SocketOperation write(IceInternal::Buffer&);
+    virtual IceInternal::SocketOperation read(IceInternal::Buffer&);
+
+    virtual std::string protocol() const;
+    virtual std::string toString() const;
+    virtual std::string toDetailedString() const;
+    virtual Ice::ConnectionInfoPtr getInfo() const;
+    virtual void checkSendSize(const IceInternal::Buffer&);
+    virtual void setBufferSize(int, int);
+
+private:
+
+    void checkError(NSError*, const char*, int);
+
+    IceInternal::ProtocolInstancePtr _instance;
+    EASession* _session;
+    NSInputStream* _readStream;
+    NSOutputStream* _writeStream;
+    iAPTransceiverCallback* _callback;
+    bool _readStreamRegistered;
+    bool _writeStreamRegistered;
+    bool _opening;
+
+    IceUtil::Mutex _mutex;
+    bool _error;
+
+    State _state;
+    std::string _desc;
+};
+
+}
+
+#endif
diff --git a/cpp/src/IceIAP/Transceiver.mm b/cpp/src/IceIAP/Transceiver.mm
new file mode 100644
index 00000000000..23496965421
--- /dev/null
+++ b/cpp/src/IceIAP/Transceiver.mm
@@ -0,0 +1,477 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include "Transceiver.h"
+#include "EndpointI.h"
+
+#include <IceIAP/ConnectionInfo.h>
+
+#include <Ice/LocalException.h>
+#include <Ice/ProtocolInstance.h>
+#include <Ice/Buffer.h>
+
+#import <Foundation/NSRunLoop.h>
+#import <Foundation/NSError.h>
+#import <Foundation/NSString.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+@interface iAPTransceiverCallback : NSObject<NSStreamDelegate>
+{
+@private
+
+    SelectorReadyCallback* callback;
+}
+-(id) init:(SelectorReadyCallback*)cb;
+@end
+
+@implementation iAPTransceiverCallback
+-(id) init:(SelectorReadyCallback*)cb;
+{
+    if(![super init])
+    {
+        return nil;
+    }
+    callback = cb;
+    return self;
+}
+
+- (void)stream:(NSStream *)stream handleEvent:(NSStreamEvent)eventCode
+{
+    switch(eventCode)
+    {
+    case NSStreamEventHasBytesAvailable:
+        callback->readyCallback(SocketOperationRead);
+        break;
+    case NSStreamEventHasSpaceAvailable:
+        callback->readyCallback(SocketOperationWrite);
+        break;
+    case NSStreamEventOpenCompleted:
+        if([[stream class] isSubclassOfClass:[NSInputStream class]])
+        {
+            callback->readyCallback(static_cast<SocketOperation>(SocketOperationConnect | SocketOperationRead));
+        }
+        else
+        {
+            callback->readyCallback(static_cast<SocketOperation>(SocketOperationConnect | SocketOperationWrite));
+        }
+        break;
+    default:
+        if([[stream class] isSubclassOfClass:[NSInputStream class]])
+        {
+            callback->readyCallback(SocketOperationRead, -1); // Error
+        }
+        else
+        {
+            callback->readyCallback(SocketOperationWrite, -1); // Error
+        }
+    }
+}
+@end
+
+void
+IceObjC::iAPTransceiver::initStreams(SelectorReadyCallback* callback)
+{
+    _callback = [[iAPTransceiverCallback alloc] init:callback];
+    [_writeStream setDelegate:_callback];
+    [_readStream setDelegate:_callback];
+}
+
+SocketOperation
+IceObjC::iAPTransceiver::registerWithRunLoop(SocketOperation op)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    SocketOperation readyOp = SocketOperationNone;
+    if(op & SocketOperationConnect)
+    {
+        if([_writeStream streamStatus] != NSStreamStatusNotOpen || [_readStream streamStatus] != NSStreamStatusNotOpen)
+        {
+            return SocketOperationConnect;
+        }
+
+        _opening = true;
+
+        [_writeStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+        [_readStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+
+        _writeStreamRegistered = true; // Note: this must be set after the schedule call
+        _readStreamRegistered = true; // Note: this must be set after the schedule call
+
+        [_writeStream open];
+        [_readStream open];
+    }
+    else
+    {
+        if(op & SocketOperationWrite)
+        {
+            if([_writeStream hasSpaceAvailable])
+            {
+                readyOp = static_cast<SocketOperation>(readyOp | SocketOperationWrite);
+            }
+            else if(!_writeStreamRegistered)
+            {
+                [_writeStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+                _writeStreamRegistered = true; // Note: this must be set after the schedule call
+                if([_writeStream hasSpaceAvailable])
+                {
+                    readyOp = static_cast<SocketOperation>(readyOp | SocketOperationWrite);
+                }
+            }
+        }
+
+        if(op & SocketOperationRead)
+        {
+            if([_readStream hasBytesAvailable])
+            {
+                readyOp = static_cast<SocketOperation>(readyOp | SocketOperationRead);
+            }
+            else if(!_readStreamRegistered)
+            {
+                [_readStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+                _readStreamRegistered = true; // Note: this must be set after the schedule call
+                if([_readStream hasBytesAvailable])
+                {
+                    readyOp = static_cast<SocketOperation>(readyOp | SocketOperationRead);
+                }
+            }
+        }
+    }
+    return readyOp;
+}
+
+SocketOperation
+IceObjC::iAPTransceiver::unregisterFromRunLoop(SocketOperation op, bool error)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    _error |= error;
+
+    if(_opening)
+    {
+        // Wait for the stream to be ready for write
+        if(op == SocketOperationWrite)
+        {
+            _writeStreamRegistered = false;
+        }
+
+        //
+        // We don't wait for the stream to be ready for read (even if
+        // it's a client connection) because there's no guarantees that
+        // the server might actually send data right away. If we use
+        // the WebSocket transport, the server actually waits for the
+        // client to write the HTTP upgrade request.
+        //
+        //if(op & SocketOperationRead && (_fd != INVALID_SOCKET || !(op & SocketOperationConnect)))
+        if(op == (SocketOperationRead | SocketOperationConnect))
+        {
+            _readStreamRegistered = false;
+        }
+
+        if(error || (!_readStreamRegistered && !_writeStreamRegistered))
+        {
+            [_writeStream removeFromRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+            [_readStream removeFromRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+            _opening = false;
+            return SocketOperationConnect;
+        }
+        else
+        {
+            return SocketOperationNone;
+        }
+    }
+    else
+    {
+        if(op & SocketOperationWrite && _writeStreamRegistered)
+        {
+            [_writeStream removeFromRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+            _writeStreamRegistered = false;
+        }
+
+        if(op & SocketOperationRead && _readStreamRegistered)
+        {
+            [_readStream removeFromRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+            _readStreamRegistered = false;
+        }
+    }
+    return op;
+}
+
+void
+IceObjC::iAPTransceiver::closeStreams()
+{
+    [_writeStream setDelegate:nil];
+    [_readStream setDelegate:nil];
+
+    [_callback release];
+    _callback = 0;
+
+    [_writeStream close];
+    [_readStream close];
+}
+
+IceInternal::NativeInfoPtr
+IceObjC::iAPTransceiver::getNativeInfo()
+{
+    return this;
+}
+
+SocketOperation
+IceObjC::iAPTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if(_state == StateNeedConnect)
+    {
+        _state = StateConnectPending;
+        return SocketOperationConnect;
+    }
+
+    if(_state <= StateConnectPending)
+    {
+        if(_error)
+        {
+            NSError* err = nil;
+            if([_writeStream streamStatus] == NSStreamStatusError)
+            {
+                err = [_writeStream streamError];
+            }
+            if([_readStream streamStatus] == NSStreamStatusError)
+            {
+                err = [_readStream streamError];
+            }
+            checkError(err, __FILE__, __LINE__);
+        }
+        _state = StateConnected;
+    }
+    assert(_state == StateConnected);
+    return SocketOperationNone;
+}
+
+SocketOperation
+#ifdef ICE_CPP11_MAPPING
+IceObjC::iAPTransceiver::closing(bool initiator, exception_ptr)
+#else
+IceObjC::iAPTransceiver::closing(bool initiator, const Ice::LocalException&)
+#endif
+{
+    // If we are initiating the connection closure, wait for the peer
+    // to close the TCP/IP connection. Otherwise, close immediately.
+    return initiator ? SocketOperationRead : SocketOperationNone;
+}
+
+void
+IceObjC::iAPTransceiver::close()
+{
+}
+
+SocketOperation
+IceObjC::iAPTransceiver::write(Buffer& buf)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if(_error)
+    {
+        assert([_writeStream streamStatus] == NSStreamStatusError);
+        checkError([_writeStream streamError], __FILE__, __LINE__);
+    }
+
+    // Its impossible for the packetSize to be more than an Int.
+    int packetSize = static_cast<int>(buf.b.end() - buf.i);
+    while(buf.i != buf.b.end())
+    {
+        if(![_writeStream hasSpaceAvailable])
+        {
+            return SocketOperationWrite;
+        }
+        assert([_writeStream streamStatus] >= NSStreamStatusOpen);
+
+        NSInteger ret = [_writeStream write:reinterpret_cast<const UInt8*>(&*buf.i) maxLength:packetSize];
+        if(ret == SOCKET_ERROR)
+        {
+            if([_writeStream streamStatus] == NSStreamStatusAtEnd)
+            {
+                ConnectionLostException ex(__FILE__, __LINE__);
+                ex.error = getSocketErrno();
+                throw ex;
+            }
+
+            assert([_writeStream streamStatus] == NSStreamStatusError);
+            checkError([_writeStream streamError], __FILE__, __LINE__);
+            if(noBuffers() && packetSize > 1024)
+            {
+                packetSize /= 2;
+            }
+            continue;
+        }
+
+        buf.i += ret;
+
+        if(packetSize > buf.b.end() - buf.i)
+        {
+            packetSize = static_cast<int>(buf.b.end() - buf.i);
+        }
+    }
+
+    return SocketOperationNone;
+}
+
+SocketOperation
+IceObjC::iAPTransceiver::read(Buffer& buf)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if(_error)
+    {
+        assert([_readStream streamStatus] == NSStreamStatusError);
+        checkError([_readStream streamError], __FILE__, __LINE__);
+    }
+
+    // Its impossible for the packetSize to be more than an Int.
+    int packetSize = static_cast<int>(buf.b.end() - buf.i);
+    while(buf.i != buf.b.end())
+    {
+        if(![_readStream hasBytesAvailable] && [_readStream streamStatus] != NSStreamStatusError)
+        {
+            return SocketOperationRead;
+        }
+        assert([_readStream streamStatus] >= NSStreamStatusOpen);
+
+        NSInteger ret = [_readStream read:reinterpret_cast<UInt8*>(&*buf.i) maxLength:packetSize];
+        if(ret == 0)
+        {
+            ConnectionLostException ex(__FILE__, __LINE__);
+            ex.error = 0;
+            throw ex;
+        }
+
+        if(ret == SOCKET_ERROR)
+        {
+            if([_readStream streamStatus] == NSStreamStatusAtEnd)
+            {
+                ConnectionLostException ex(__FILE__, __LINE__);
+                ex.error = getSocketErrno();
+                throw ex;
+            }
+
+            assert([_readStream streamStatus] == NSStreamStatusError);
+            checkError([_readStream streamError], __FILE__, __LINE__);
+            if(noBuffers() && packetSize > 1024)
+            {
+                packetSize /= 2;
+            }
+            continue;
+        }
+
+        buf.i += ret;
+
+        if(packetSize > buf.b.end() - buf.i)
+        {
+            packetSize = static_cast<int>(buf.b.end() - buf.i);
+        }
+    }
+
+    return SocketOperationNone;
+}
+
+string
+IceObjC::iAPTransceiver::protocol() const
+{
+    return _instance->protocol();
+}
+
+string
+IceObjC::iAPTransceiver::toString() const
+{
+    return _desc;
+}
+
+string
+IceObjC::iAPTransceiver::toDetailedString() const
+{
+    return toString();
+}
+
+Ice::ConnectionInfoPtr
+IceObjC::iAPTransceiver::getInfo() const
+{
+    IceIAP::ConnectionInfoPtr info = ICE_MAKE_SHARED(IceIAP::ConnectionInfo);
+    info->manufacturer = [_session.accessory.manufacturer UTF8String];
+    info->name = [_session.accessory.name UTF8String];
+    info->modelNumber = [_session.accessory.modelNumber UTF8String];
+    info->firmwareRevision = [_session.accessory.firmwareRevision UTF8String];
+    info->hardwareRevision = [_session.accessory.hardwareRevision UTF8String];
+    info->protocol = [_session.protocolString UTF8String];
+    return info;
+}
+
+void
+IceObjC::iAPTransceiver::checkSendSize(const Buffer& buf)
+{
+}
+
+void
+IceObjC::iAPTransceiver::setBufferSize(int, int)
+{
+}
+
+IceObjC::iAPTransceiver::iAPTransceiver(const ProtocolInstancePtr& instance, EASession* session) :
+    StreamNativeInfo(INVALID_SOCKET),
+    _instance(instance),
+    _session([session retain]),
+    _readStream([session inputStream]),
+    _writeStream([session outputStream]),
+    _readStreamRegistered(false),
+    _writeStreamRegistered(false),
+    _error(false),
+    _state(StateNeedConnect)
+{
+    ostringstream os;
+    os << "name = " << [session.accessory.name UTF8String] << "\n";
+    os << "protocol = " << [session.protocolString UTF8String];
+    _desc = os.str();
+}
+
+IceObjC::iAPTransceiver::~iAPTransceiver()
+{
+    [_session release];
+}
+
+void
+IceObjC::iAPTransceiver::checkError(NSError* err, const char* file, int line)
+{
+    NSString* domain = [err domain];
+    if([domain compare:NSPOSIXErrorDomain] == NSOrderedSame)
+    {
+        errno = [err code];
+        [err release];
+        if(connectionRefused())
+        {
+            ConnectionRefusedException ex(file, line);
+            ex.error = getSocketErrno();
+            throw ex;
+        }
+        else if(connectFailed())
+        {
+            ConnectFailedException ex(file, line);
+            ex.error = getSocketErrno();
+            throw ex;
+        }
+        else
+        {
+            SocketException ex(file, line);
+            ex.error = getSocketErrno();
+            throw ex;
+        }
+    }
+
+    // Otherwise throw a generic exception.
+    CFNetworkException ex(file, line);
+    ex.domain = [domain UTF8String];
+    ex.error = [err code];
+    [err release];
+    throw ex;
+}
diff --git a/cpp/src/IceLocatorDiscovery/.depend.mak b/cpp/src/IceLocatorDiscovery/.depend.mak
deleted file mode 100755
index f1487dcdf54..00000000000
--- a/cpp/src/IceLocatorDiscovery/.depend.mak
+++ /dev/null
@@ -1,220 +0,0 @@
-
-IceLocatorDiscovery.h: \
-    "$(slicedir)\IceLocatorDiscovery\IceLocatorDiscovery.ice" \
-    "$(slicedir)/Ice/Locator.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/ProcessF.ice"
-
-PluginI.obj: \
-	PluginI.cpp \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "PluginI.h" \
-    "IceLocatorDiscovery.h" \
-
-IceLocatorDiscovery.obj: \
-	IceLocatorDiscovery.cpp \
-    "IceLocatorDiscovery.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
diff --git a/cpp/src/IceLocatorDiscovery/.gitignore b/cpp/src/IceLocatorDiscovery/.gitignore
deleted file mode 100644
index 45e29d8dd2d..00000000000
--- a/cpp/src/IceLocatorDiscovery/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
-IceLocatorDiscovery.cpp
-IceLocatorDiscovery.h
diff --git a/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc b/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc
index a6268af65ad..8c8b03ac8ca 100755
--- a/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc
+++ b/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icelocatordiscovery36d\0"
- #define ORIGINALFILENAME "icelocatordiscovery36d.dll\0"
+ #define INTERNALNAME "icelocatordiscovery37a2d\0"
+ #define ORIGINALFILENAME "icelocatordiscovery37a2d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icelocatordiscovery36\0"
- #define ORIGINALFILENAME "icelocatordiscovery36.dll\0"
+ #define INTERNALNAME "icelocatordiscovery37a2\0"
+ #define ORIGINALFILENAME "icelocatordiscovery37a2.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceLocatorDiscovery C++ Plug-in\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceLocatorDiscovery/Makefile b/cpp/src/IceLocatorDiscovery/Makefile
deleted file mode 100644
index 86c96002ceb..00000000000
--- a/cpp/src/IceLocatorDiscovery/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME     = $(call mklibfilename,IceLocatorDiscovery,$(VERSION))
-SONAME          = $(call mksoname,IceLocatorDiscovery,$(SOVERSION))
-LIBNAME		= $(call mklibname,IceLocatorDiscovery)
-
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-
-SLICE_OBJS      = IceLocatorDiscovery.o
-
-OBJS		= PluginI.o \
-		  $(SLICE_OBJS)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I.. $(CPPFLAGS) -DICE_LOCATOR_DISCOVERY_API_EXPORTS
-SLICE2CPPFLAGS	:= --ice --include-dir IceLocatorDiscovery $(SLICE2CPPFLAGS)
-
-LINKWITH        := -lIce -lIceUtil $(CXXLIBS)
-
-ifeq ($(STATICLIBS),yes)
-$(libdir)/$(LIBNAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mklib,$@,$(OBJS))
-else
-$(libdir)/$(LIBFILENAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	@mkdir -p $(libdir)$(cpp11libdirsuffix)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-endif
-
-../IceLocatorDiscovery/%.h %.cpp: $(slicedir)/IceLocatorDiscovery/%.ice $(SLICE2CPP) $(SLICEPARSERLIB)
-	rm -f $(*F).h $(*F).cpp
-	$(SLICE2CPP) $(SLICE2CPPFLAGS) $(slicedir)/IceLocatorDiscovery/$(*F).ice
-	@touch $(*F).cpp
-	@mkdir -p .depend
-	@$(SLICE2CPP) $(SLICE2CPPFLAGS) --depend $(slicedir)/IceLocatorDiscovery/$(*F).ice > .depend/$(*F).ice.d
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/IceLocatorDiscovery/Makefile.mak b/cpp/src/IceLocatorDiscovery/Makefile.mak
deleted file mode 100644
index f06e86c6159..00000000000
--- a/cpp/src/IceLocatorDiscovery/Makefile.mak
+++ /dev/null
@@ -1,65 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME     	= $(top_srcdir)\lib\icelocatordiscovery$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icelocatordiscovery$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-SDIR 		= $(slicedir)\IceLocatorDiscovery
-SLICE_OBJS	= .\IceLocatorDiscovery.obj 
-
-OBJS		= .\PluginI.obj \
-		  $(SLICE_OBJS)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -DICE_LOCATOR_DISCOVERY_API_EXPORTS
-SLICE2CPPFLAGS	= --ice --include-dir IceLocatorDiscovery $(SLICE2CPPFLAGS)
-
-LINKWITH        = $(LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = IceLocatorDiscovery.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceLocatorDiscovery.res
-	$(LINK) $(BASE):0x28000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-IceLocatorDiscovery.h IceLocatorDiscovery.cpp: $(slicedir)\IceLocatorDiscovery\IceLocatorDiscovery.ice "$(SLICE2CPP)" "$(SLICEPARSERLIB)"
-	del /q $(*F).h $(*F).cpp
-	"$(SLICE2CPP)" $(SLICE2CPPFLAGS) $(slicedir)\IceLocatorDiscovery\IceLocatorDiscovery.ice
-
-clean::
-	-del /q IceLocatorDiscovery.cpp IceLocatorDiscovery.h
-	-del /q IceLocatorDiscovery.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/IceLocatorDiscovery/Makefile.mk b/cpp/src/IceLocatorDiscovery/Makefile.mk
new file mode 100644
index 00000000000..952b70d3a61
--- /dev/null
+++ b/cpp/src/IceLocatorDiscovery/Makefile.mk
@@ -0,0 +1,18 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries := IceLocatorDiscovery
+
+IceLocatorDiscovery_targetdir			:= $(libdir)
+IceLocatorDiscovery_dependencies    		:= Ice
+IceLocatorDiscovery_sliceflags      		:= --include-dir IceLocatorDiscovery
+IceLocatorDiscovery_generated_includedir 	:= $(project)/generated/IceLocatorDiscovery
+IceLocatorDiscovery_cppflags			:= -DICE_LOCATOR_DISCOVERY_API_EXPORTS
+
+projects += $(project)
diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp
index 50be22e3741..42ecec87026 100644
--- a/cpp/src/IceLocatorDiscovery/PluginI.cpp
+++ b/cpp/src/IceLocatorDiscovery/PluginI.cpp
@@ -18,26 +18,21 @@ using namespace IceLocatorDiscovery;
 
 #ifndef ICE_LOCATOR_DISCOVERY_API
 #   ifdef ICE_LOCATOR_DISCOVERY_API_EXPORTS
-#       define ICE_LOCATOR_DISCOVERY_API ICE_DECLSPEC_EXPORT
+#   define ICE_LOCATOR_DISCOVERY_API ICE_DECLSPEC_EXPORT
 #   else
-#       define ICE_LOCATOR_DISCOVERY_API /**/
+#   define ICE_LOCATOR_DISCOVERY_API /**/
 #   endif
 #endif
 
 //
 // Plugin factory function.
 //
-extern "C"
-{
-
-ICE_LOCATOR_DISCOVERY_API Ice::Plugin*
+extern "C" ICE_LOCATOR_DISCOVERY_API Ice::Plugin*
 createIceLocatorDiscovery(const Ice::CommunicatorPtr& communicator, const string&, const Ice::StringSeq&)
 {
     return new PluginI(communicator);
 }
 
-}
-
 namespace Ice
 {
 
@@ -49,15 +44,40 @@ registerIceLocatorDiscovery(bool loadOnInitialize)
 
 }
 
+//
+// Objective-C function to allow Objective-C programs to register plugin.
+//
+extern "C" ICE_LOCATOR_DISCOVERY_API void
+ICEregisterIceLocatorDiscovery(bool loadOnInitialize)
+{
+    Ice::registerIceLocatorDiscovery(loadOnInitialize);
+}
+
 namespace
 {
 
 class LocatorI; // Forward declaration
 
-class Request : public IceUtil::Shared
+class Request : public Ice::EnableSharedFromThis<Request>
 {
 public:
 
+#ifdef ICE_CPP11_MAPPING
+    Request(LocatorI* locator,
+            const string& operation,
+            Ice::OperationMode mode,
+            const pair<const Ice::Byte*, const Ice::Byte*>& inParams,
+            const Ice::Context& ctx,
+            function<void(bool, const pair<const Ice::Byte*, const Ice::Byte*>&)> responseCB,
+            function<void(exception_ptr)> exceptionCB) :
+        _locator(locator),
+        _operation(operation),
+        _mode(mode),
+        _context(ctx),
+        _inParams(inParams.first, inParams.second),
+        _responseCB(move(responseCB)),
+        _exceptionCB(move(exceptionCB))
+#else
     Request(LocatorI* locator,
             const string& operation,
             Ice::OperationMode mode,
@@ -70,11 +90,16 @@ public:
         _context(ctx),
         _inParams(inParams.first, inParams.second),
         _amdCB(amdCB)
+#endif
     {
     }
 
-    void invoke(const Ice::LocatorPrx&);
+    void invoke(const Ice::LocatorPrxPtr&);
+#ifdef ICE_CPP11_MAPPING
+    void response(const bool, pair<const Ice::Byte*, const Ice::Byte*>);
+#else
     void response(const bool, const pair<const Ice::Byte*, const Ice::Byte*>&);
+#endif
     void exception(const Ice::Exception&);
 
 protected:
@@ -84,31 +109,47 @@ protected:
     const Ice::OperationMode _mode;
     const Ice::Context _context;
     const Ice::ByteSeq _inParams;
+#ifdef ICE_CPP11_MAPPING
+    function<void(bool, const pair<const Ice::Byte*, const Ice::Byte*>&)> _responseCB;
+    function<void(exception_ptr)> _exceptionCB;
+    exception_ptr _exception;
+#else
     const Ice::AMD_Object_ice_invokePtr _amdCB;
-
-    Ice::LocatorPrx _locatorPrx;
     IceUtil::UniquePtr<Ice::Exception> _exception;
+#endif
+
+    Ice::LocatorPrxPtr _locatorPrx;
 };
-typedef IceUtil::Handle<Request> RequestPtr;
+ICE_DEFINE_PTR(RequestPtr, Request);
 
-class LocatorI : public Ice::BlobjectArrayAsync, private IceUtil::TimerTask, private IceUtil::Monitor<IceUtil::Mutex>
+class LocatorI : public Ice::BlobjectArrayAsync,
+                 public IceUtil::TimerTask,
+                 private IceUtil::Monitor<IceUtil::Mutex>,
+                 public Ice::EnableSharedFromThis<LocatorI>
 {
 public:
 
-    LocatorI(const LookupPrx&, const Ice::PropertiesPtr&, const string&, const Ice::LocatorPrx&);
-    void setLookupReply(const LookupReplyPrx&);
+    LocatorI(const LookupPrxPtr&, const Ice::PropertiesPtr&, const string&, const Ice::LocatorPrxPtr&);
+    void setLookupReply(const LookupReplyPrxPtr&);
 
+#ifdef ICE_CPP11_MAPPING
+    virtual void ice_invokeAsync(pair<const Ice::Byte*, const Ice::Byte*>,
+                                 function<void(bool, pair<const Ice::Byte*, const Ice::Byte*>)>,
+                                 function<void(exception_ptr)>,
+                                 const Ice::Current&);
+#else
     virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&, const pair<const Ice::Byte*, const Ice::Byte*>&,
                                   const Ice::Current&);
+#endif
 
-    void foundLocator(const Ice::LocatorPrx&);
-    void invoke(const Ice::LocatorPrx&, const RequestPtr&);
+    void foundLocator(const Ice::LocatorPrxPtr&);
+    void invoke(const Ice::LocatorPrxPtr&, const RequestPtr&);
 
 private:
 
     virtual void runTimerTask();
 
-    const LookupPrx _lookup;
+    const LookupPrxPtr _lookup;
     const IceUtil::Time _timeout;
     const int _retryCount;
     const IceUtil::Time _retryDelay;
@@ -116,15 +157,15 @@ private:
 
     string _instanceName;
     bool _warned;
-    LookupReplyPrx _lookupReply;
-    Ice::LocatorPrx _locator;
-    Ice::LocatorPrx _voidLocator;
+    LookupReplyPrxPtr _lookupReply;
+    Ice::LocatorPrxPtr _locator;
+    Ice::LocatorPrxPtr _voidLocator;
 
     IceUtil::Time _nextRetry;
     int _pendingRetryCount;
     vector<RequestPtr> _pendingRequests;
 };
-typedef IceUtil::Handle<LocatorI> LocatorIPtr;
+ICE_DEFINE_PTR(LocatorIPtr, LocatorI);
 
 class LookupReplyI : public LookupReply
 {
@@ -134,7 +175,7 @@ public:
     {
     }
 
-    virtual void foundLocator(const Ice::LocatorPrx&, const Ice::Current&);
+    virtual void foundLocator(ICE_IN(Ice::LocatorPrxPtr), const Ice::Current&);
 
 private:
 
@@ -155,6 +196,25 @@ class VoidLocatorI : public Ice::Locator
 {
 public:
 
+#ifdef ICE_CPP11_MAPPING
+    virtual void
+    findObjectByIdAsync(::Ice::Identity,
+                        function<void(const shared_ptr<::Ice::ObjectPrx>&)> response,
+                        function<void(exception_ptr)>,
+                        const Ice::Current&) const
+    {
+        response(nullptr);
+    }
+
+    virtual void
+    findAdapterByIdAsync(string,
+                         function<void(const shared_ptr<::Ice::ObjectPrx>&)> response,
+                         function<void(exception_ptr)>,
+                         const Ice::Current&) const
+    {
+        response(nullptr);
+    }
+#else
     virtual void
     findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& amdCB,
                          const Ice::Identity&,
@@ -170,11 +230,12 @@ public:
     {
         amdCB->ice_response(0);
     }
+#endif
 
-    virtual Ice::LocatorRegistryPrx
+    virtual Ice::LocatorRegistryPrxPtr
     getRegistry(const Ice::Current&) const
     {
-        return 0;
+        return ICE_NULLPTR;
     }
 };
 
@@ -237,17 +298,40 @@ PluginI::initialize()
         lookupEndpoints = os.str();
     }
 
-    Ice::ObjectPrx lookupPrx = _communicator->stringToProxy("IceLocatorDiscovery/Lookup -d:" + lookupEndpoints);
+    Ice::ObjectPrxPtr lookupPrx = _communicator->stringToProxy("IceLocatorDiscovery/Lookup -d:" + lookupEndpoints);
     lookupPrx = lookupPrx->ice_collocationOptimized(false); // No collocation optimization for the multicast proxy!
     try
     {
         // Ensure we can establish a connection to the multicast proxy
         // but don't block.
+#ifdef ICE_CPP11_MAPPING
+        promise<bool> sent;
+        promise<void> completed;
+
+        lookupPrx->ice_getConnectionAsync(
+            [&](shared_ptr<Ice::Connection>)
+            {
+                completed.set_value();
+            },
+            [&](exception_ptr ex)
+            {
+                completed.set_exception(ex);
+            },
+            [&](bool sentSynchronously)
+            {
+                sent.set_value(sentSynchronously);
+            });
+        if(sent.get_future().get())
+        {
+            completed.get_future().get();
+        }
+#else
         Ice::AsyncResultPtr result = lookupPrx->begin_ice_getConnection();
         if(result->sentSynchronously())
         {
             lookupPrx->end_ice_getConnection(result);
         }
+#endif
     }
     catch(const Ice::LocalException& ex)
     {
@@ -258,17 +342,17 @@ PluginI::initialize()
         throw Ice::PluginInitializationException(__FILE__, __LINE__, os.str());
     }
 
-    Ice::LocatorPrx voidLocator = Ice::LocatorPrx::uncheckedCast(_locatorAdapter->addWithUUID(new VoidLocatorI()));
+    Ice::LocatorPrxPtr voidLocator = ICE_UNCHECKED_CAST(Ice::LocatorPrx, _locatorAdapter->addWithUUID(ICE_MAKE_SHARED(VoidLocatorI)));
 
     string instanceName = properties->getProperty("IceLocatorDiscovery.InstanceName");
     Ice::Identity id;
     id.name = "Locator";
     id.category = !instanceName.empty() ? instanceName : IceUtil::generateUUID();
-    LocatorIPtr locator = new LocatorI(LookupPrx::uncheckedCast(lookupPrx), properties, instanceName, voidLocator);
-    _communicator->setDefaultLocator(Ice::LocatorPrx::uncheckedCast(_locatorAdapter->add(locator, id)));
+    LocatorIPtr locator = ICE_MAKE_SHARED(LocatorI, ICE_UNCHECKED_CAST(LookupPrx, lookupPrx), properties, instanceName, voidLocator);
+    _communicator->setDefaultLocator(ICE_UNCHECKED_CAST(Ice::LocatorPrx, _locatorAdapter->add(locator, id)));
 
-    Ice::ObjectPrx lookupReply = _replyAdapter->addWithUUID(new LookupReplyI(locator))->ice_datagram();
-    locator->setLookupReply(LookupReplyPrx::uncheckedCast(lookupReply));
+    Ice::ObjectPrxPtr lookupReply = _replyAdapter->addWithUUID(ICE_MAKE_SHARED(LookupReplyI, locator))->ice_datagram();
+    locator->setLookupReply(ICE_UNCHECKED_CAST(LookupReplyPrx, lookupReply));
 
     _replyAdapter->activate();
     _locatorAdapter->activate();
@@ -282,8 +366,56 @@ PluginI::destroy()
 }
 
 void
-Request::invoke(const Ice::LocatorPrx& l)
+Request::invoke(const Ice::LocatorPrxPtr& l)
 {
+#ifdef ICE_CPP11_MAPPING
+    if(l != _locatorPrx)
+    {
+        _locatorPrx = l;
+        try
+        {
+            auto self = shared_from_this();
+            l->ice_invokeAsync(_operation, _mode, _inParams,
+                               [self](bool ok, vector<Ice::Byte> outParams)
+                               {
+                                   pair<const Ice::Byte*, const Ice::Byte*> outPair;
+                                   if(outParams.empty())
+                                   {
+                                       outPair.first = outPair.second = 0;
+                                   }
+                                   else
+                                   {
+                                       outPair.first = &outParams[0];
+                                       outPair.second = outPair.first + outParams.size();
+                                   }
+                                   self->response(ok, move(outPair));
+                               },
+                               [self](exception_ptr e)
+                               {
+                                   try
+                                   {
+                                       rethrow_exception(e);
+                                   }
+                                   catch(const Ice::Exception& ex)
+                                   {
+                                       self->exception(ex);
+                                   }
+                               },
+                               nullptr,
+                               _context);
+        }
+        catch(const Ice::LocalException& ex)
+        {
+            exception(ex);
+        }
+    }
+    else
+    {
+        assert(_exception); // Don't retry if the proxy didn't change
+        _exceptionCB(_exception);
+    }
+
+#else
     if(l != _locatorPrx)
     {
         _locatorPrx = l;
@@ -302,17 +434,78 @@ Request::invoke(const Ice::LocatorPrx& l)
         assert(_exception.get()); // Don't retry if the proxy didn't change
         _amdCB->ice_exception(*_exception.get());
     }
+#endif
 }
 
+#ifdef ICE_CPP11_MAPPING
+void
+Request::response(bool ok, pair<const Ice::Byte*, const Ice::Byte*> outParams)
+{
+    _responseCB(ok, move(outParams));
+}
+#else
 void
 Request::response(bool ok, const pair<const Ice::Byte*, const Ice::Byte*>& outParams)
 {
     _amdCB->ice_response(ok, outParams);
 }
+#endif
 
 void
 Request::exception(const Ice::Exception& ex)
 {
+#ifdef ICE_CPP11_MAPPING
+    try
+    {
+        ex.ice_throw();
+    }
+    catch(const Ice::RequestFailedException&)
+    {
+        _exceptionCB(current_exception());
+    }
+    catch(const Ice::UnknownException&)
+    {
+        _exceptionCB(current_exception());
+    }
+    catch(const Ice::NoEndpointException&)
+    {
+        try
+        {
+            throw Ice::ObjectNotExistException(__FILE__, __LINE__);
+        }
+        catch(...)
+        {
+            _exceptionCB(current_exception());
+        }
+    }
+    catch(const Ice::CommunicatorDestroyedException&)
+    {
+        try
+        {
+            throw Ice::ObjectNotExistException(__FILE__, __LINE__);
+        }
+        catch(...)
+        {
+            _exceptionCB(current_exception());
+        }
+    }
+    catch(const Ice::ObjectAdapterDeactivatedException&)
+    {
+        try
+        {
+            throw Ice::ObjectNotExistException(__FILE__, __LINE__);
+        }
+        catch(...)
+        {
+            _exceptionCB(current_exception());
+        }
+    }
+    catch(const Ice::Exception&)
+    {
+        _exception = current_exception();
+        _locator->invoke(_locatorPrx, shared_from_this()); // Retry with new locator proxy
+    }
+#else
     try
     {
         ex.ice_throw();
@@ -340,14 +533,15 @@ Request::exception(const Ice::Exception& ex)
     catch(const Ice::Exception&)
     {
         _exception.reset(ex.ice_clone());
-        _locator->invoke(_locatorPrx, this); // Retry with new locator proxy
+        _locator->invoke(_locatorPrx, shared_from_this()); // Retry with new locator proxy
     }
+#endif
 }
 
-LocatorI::LocatorI(const LookupPrx& lookup,
+LocatorI::LocatorI(const LookupPrxPtr& lookup,
                    const Ice::PropertiesPtr& p,
                    const string& instanceName,
-                   const Ice::LocatorPrx& voidLocator) :
+                   const Ice::LocatorPrxPtr& voidLocator) :
     _lookup(lookup),
     _timeout(IceUtil::Time::milliSeconds(p->getPropertyAsIntWithDefault("IceLocatorDiscovery.Timeout", 300))),
     _retryCount(p->getPropertyAsIntWithDefault("IceLocatorDiscovery.RetryCount", 3)),
@@ -362,11 +556,22 @@ LocatorI::LocatorI(const LookupPrx& lookup,
 }
 
 void
-LocatorI::setLookupReply(const LookupReplyPrx& lookupReply)
+LocatorI::setLookupReply(const LookupReplyPrxPtr& lookupReply)
 {
     _lookupReply = lookupReply;
 }
 
+#ifdef ICE_CPP11_MAPPING
+void
+LocatorI::ice_invokeAsync(pair<const Ice::Byte*, const Ice::Byte*> inParams,
+                          function<void(bool, pair<const Ice::Byte*, const Ice::Byte*>)> responseCB,
+                          function<void(exception_ptr)> exceptionCB,
+                          const Ice::Current& current)
+{
+    invoke(nullptr, make_shared<Request>(this, current.operation, current.mode, inParams, current.ctx,
+                                         move(responseCB), move(exceptionCB)));
+}
+#else
 void
 LocatorI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& amdCB,
                            const pair<const Ice::Byte*, const Ice::Byte*>& inParams,
@@ -374,9 +579,10 @@ LocatorI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& amdCB,
 {
     invoke(0, new Request(this, current.operation, current.mode, inParams, current.ctx, amdCB));
 }
+#endif
 
 void
-LocatorI::foundLocator(const Ice::LocatorPrx& locator)
+LocatorI::foundLocator(const Ice::LocatorPrxPtr& locator)
 {
     Lock sync(*this);
     if(!locator || (!_instanceName.empty() && locator->ice_getIdentity().category != _instanceName))
@@ -407,7 +613,7 @@ LocatorI::foundLocator(const Ice::LocatorPrx& locator)
 
     if(_pendingRetryCount > 0) // No need to retry, we found a locator.
     {
-        _timer->cancel(this);
+        _timer->cancel(shared_from_this());
         _pendingRetryCount = 0;
     }
 
@@ -460,7 +666,7 @@ LocatorI::foundLocator(const Ice::LocatorPrx& locator)
 }
 
 void
-LocatorI::invoke(const Ice::LocatorPrx& locator, const RequestPtr& request)
+LocatorI::invoke(const Ice::LocatorPrxPtr& locator, const RequestPtr& request)
 {
     Lock sync(*this);
     if(_locator && _locator != locator)
@@ -482,8 +688,12 @@ LocatorI::invoke(const Ice::LocatorPrx& locator, const RequestPtr& request)
             _pendingRetryCount = _retryCount;
             try
             {
+#ifdef ICE_CPP11_MAPPING
+                _lookup->findLocatorAsync(_instanceName, _lookupReply); // Send multicast request.
+#else
                 _lookup->begin_findLocator(_instanceName, _lookupReply); // Send multicast request.
-                _timer->schedule(this, _timeout);
+#endif
+                _timer->schedule(shared_from_this(), _timeout);
             }
             catch(const Ice::LocalException&)
             {
@@ -506,8 +716,12 @@ LocatorI::runTimerTask()
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            _lookup->findLocatorAsync(_instanceName, _lookupReply); // Send multicast request.
+#else
             _lookup->begin_findLocator(_instanceName, _lookupReply); // Send multicast request.
-            _timer->schedule(this, _timeout);
+#endif
+            _timer->schedule(shared_from_this(), _timeout);
             return;
         }
         catch(const Ice::LocalException&)
@@ -525,7 +739,7 @@ LocatorI::runTimerTask()
 }
 
 void
-LookupReplyI::foundLocator(const Ice::LocatorPrx& locator, const Ice::Current&)
+LookupReplyI::foundLocator(ICE_IN(Ice::LocatorPrxPtr) locator, const Ice::Current&)
 {
     _locator->foundLocator(locator);
 }
diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj
new file mode 100644
index 00000000000..120fcd681db
--- /dev/null
+++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C694B856-3393-41B4-B3DC-3A5AD9A92A3D}</ProjectGuid>
+    <RootNamespace>IceLocatorDiscovery</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceLocatorDiscovery\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceLocatorDiscovery</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_LOCATOR_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_LOCATOR_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_LOCATOR_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_LOCATOR_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceLocatorDiscovery.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\PluginI.cpp" />
+    <ClCompile Include="Win32\Debug\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\PluginI.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj.filters b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj.filters
new file mode 100644
index 00000000000..19884112c8f
--- /dev/null
+++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj.filters
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{b7939c5d-640c-4672-964f-9bf9fd4db1ab}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{3873771f-fb5d-4f34-b741-01e7af458d37}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{793c3c81-1843-44c0-8c8c-73d79a3a75d8}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{d3a776a3-54f0-4596-ba10-0b80b3abcd24}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{7caca43d-7d63-42cf-b754-9a5bee6d9abb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{27b318c7-424c-4037-95a0-3c04c5815dea}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{499eac02-8d6e-482f-a0f8-94de66bb4667}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{2799dc39-5338-47af-bbae-524e0c15f0f4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{cd7912ad-fc3f-4acf-b760-1f5287ba1744}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{694d12f9-906e-4226-ab4f-3dc77701c7c0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{e27db5de-5281-49e1-a5de-8fedede5f3eb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{1d0283ca-06d3-492e-b0e8-ded78b76f8d5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{4d610724-dab2-49b1-8a90-6f5fb6ef3745}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{27b7eece-f57d-4466-a715-a6eeac22e261}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{1cc3274d-1518-4e6e-9889-9f44b7d4b4f4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{ddf277fe-f07b-4f79-94ee-39752d817e5e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceLocatorDiscovery.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\PluginI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\PluginI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj
new file mode 100644
index 00000000000..78c72ced54d
--- /dev/null
+++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5A8CEAB6-9F57-495C-B554-F93F842A0A28}</ProjectGuid>
+    <RootNamespace>IceLocatorDiscovery</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceLocatorDiscovery\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceLocatorDiscovery</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_LOCATOR_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_LOCATOR_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_LOCATOR_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_LOCATOR_DISCOVERY_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceLocatorDiscovery.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\PluginI.cpp" />
+    <ClCompile Include="Win32\Debug\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\PluginI.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj.filters b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj.filters
new file mode 100644
index 00000000000..ff6ce73a383
--- /dev/null
+++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj.filters
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{be8c295d-c044-4588-aa7a-7a736c943c18}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{7a8d59f7-5027-44e2-91f0-e541a2d8fcca}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{4d707cfd-623d-46cf-8ac4-7ac2db3e7391}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{cec55549-450a-4788-b3dd-f13dfd49b66c}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{96259bf5-c0d6-410f-80f1-b403fc34cc70}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{b4194be2-e394-45cd-b5f8-56b8cc3d8495}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{ea698cc2-3195-4348-9b68-e503548159a7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{5f935f77-bc71-4d9f-be77-9cc1858fe8c0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{71fc2ce0-2940-4620-9d6a-1f116a5527ea}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{d481ed31-8900-45ef-99c5-bad8becbf0e6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{efd1b0d5-43e1-4e8a-9716-f52fa6cb142c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{cc509251-f9ab-4618-b996-a20614e4a14e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{a80008ce-cd6f-40b0-b234-d3a000f6a588}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{f70fb6af-7aa1-4a69-b11e-bdd9851308b3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{ff4b930b-1b14-4043-9f09-b2252a6a57f8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{0ddbd7cc-30eb-41f5-a858-cfea0661f71b}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\PluginI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\PluginI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceLocatorDiscovery.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj
new file mode 100644
index 00000000000..4c5c788da1f
--- /dev/null
+++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}</ProjectGuid>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WindowsAppContainer>true</WindowsAppContainer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceLocatorDiscovery\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceLocatorDiscovery</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ARM\Debug\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceLocatorDiscovery.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj.filters b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj.filters
new file mode 100644
index 00000000000..9ff1e5bed15
--- /dev/null
+++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj.filters
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{1669d9fb-abb8-4e67-a262-dd2919ce1fd8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{57c1a1d7-838e-426e-b8b9-370a6d4dbbfd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{ca1e0df9-03ce-490c-b88a-a9b81df46cb4}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{0018bf89-df40-4407-9927-9245d0886fa4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{923342f0-7bfe-4212-801c-3f66a5bba379}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{1c40579c-404e-4799-b378-ecf7bb2927c3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{ed85b6ec-45ca-4230-bc28-c65172ad8268}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM">
+      <UniqueIdentifier>{213eea5f-57f8-4cb7-a9e8-a9604244bdee}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Debug">
+      <UniqueIdentifier>{2c18c22a-e238-4884-a16f-569c7a02f2a2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM">
+      <UniqueIdentifier>{31178703-3a60-4831-8f2d-de75a224fd8c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Debug">
+      <UniqueIdentifier>{1911a92c-351c-4139-b122-f98a94df868c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{d68f68a7-a158-49e4-856a-446a0aa33f12}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{f2fce807-05bd-4bd0-8237-771757a59ab5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{8aac2010-88b8-4942-b0e7-4518ba522e3e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{e42f92ca-a917-44fc-93b8-b51117a634ad}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{b8c3de63-2396-4380-aeea-66f16bc4279f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{e00e7f6a-a233-44e5-8fb7-41e8a26fc97d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Release">
+      <UniqueIdentifier>{7227ba14-b04f-4f2a-966e-0a76560e5441}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Release">
+      <UniqueIdentifier>{eea7ec09-4212-49c5-b43d-2c008f0bce56}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{e659cbd8-e964-4774-8e61-704fb2b2ad81}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{74a3d1df-8332-458b-8c0f-bc326eeea01b}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Win32\Debug\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceLocatorDiscovery.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceLocatorDiscovery\IceLocatorDiscovery.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IcePatch2/.depend.mak b/cpp/src/IcePatch2/.depend.mak
deleted file mode 100755
index ee0e03890d6..00000000000
--- a/cpp/src/IcePatch2/.depend.mak
+++ /dev/null
@@ -1,521 +0,0 @@
-
-FileServerI.obj: \
-	FileServerI.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "FileServerI.h" \
-    "..\..\src\IcePatch2Lib\Util.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "$(includedir)\IcePatch2\FileServer.h" \
-
-Server.obj: \
-	Server.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "FileServerI.h" \
-    "..\..\src\IcePatch2Lib\Util.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "$(includedir)\IcePatch2\FileServer.h" \
-
-Client.obj: \
-	Client.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "..\..\src\IcePatch2Lib\Util.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "$(includedir)\IcePatch2\ClientUtil.h" \
-    "$(includedir)\IcePatch2\FileServer.h" \
-
-Calc.obj: \
-	Calc.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "..\..\src\IcePatch2Lib\Util.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
diff --git a/cpp/src/IcePatch2/.gitignore b/cpp/src/IcePatch2/.gitignore
deleted file mode 100644
index 720f44c7047..00000000000
--- a/cpp/src/IcePatch2/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp
index efab2277a31..c279b5d2067 100644
--- a/cpp/src/IcePatch2/FileServerI.cpp
+++ b/cpp/src/IcePatch2/FileServerI.cpp
@@ -10,7 +10,6 @@
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/FileUtil.h>
 #include <IceUtil/StringUtil.h>
-#include <IceUtil/ScopedArray.h>
 #include <IcePatch2/FileServerI.h>
 
 #ifdef _WIN32
diff --git a/cpp/src/IcePatch2/IcePatch2Calc.rc b/cpp/src/IcePatch2/IcePatch2Calc.rc
index 43b3b6c7367..c721b23603a 100644
--- a/cpp/src/IcePatch2/IcePatch2Calc.rc
+++ b/cpp/src/IcePatch2/IcePatch2Calc.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 Calc\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "icepatch2calc\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icepatch2calc.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Client.rc b/cpp/src/IcePatch2/IcePatch2Client.rc
index 915b27b449b..31150175756 100644
--- a/cpp/src/IcePatch2/IcePatch2Client.rc
+++ b/cpp/src/IcePatch2/IcePatch2Client.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 Client\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "icepatch2client\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icepatch2client.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Server.rc b/cpp/src/IcePatch2/IcePatch2Server.rc
index 3ea2d1898c1..590407fb07d 100644
--- a/cpp/src/IcePatch2/IcePatch2Server.rc
+++ b/cpp/src/IcePatch2/IcePatch2Server.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 Server\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "icepatch2server\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icepatch2server.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/Makefile b/cpp/src/IcePatch2/Makefile
deleted file mode 100644
index bdceb01ea7a..00000000000
--- a/cpp/src/IcePatch2/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-SERVER		= $(bindir)/icepatch2server
-CLIENT		= $(bindir)/icepatch2client
-CALC		= $(bindir)/icepatch2calc
-
-TARGETS         = $(SERVER) $(CLIENT) $(CALC)
-
-SOBJS		= FileServerI.o \
-		  Server.o
-
-COBJS		= Client.o
-
-CALCOBJS	= Calc.o
-
-OBJS		= $(SOBJS) \
-		  $(COBJS) \
-		  $(CALCOBJS)
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I.. $(CPPFLAGS) $(BZIP2_FLAGS)
-
-$(SERVER): $(SOBJS) $(LIBTARGETS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(OPENSSL_RPATH_LINK) -lIcePatch2 $(LIBS)
-
-$(CLIENT): $(COBJS) $(LIBTARGETS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(OPENSSL_RPATH_LINK) -lIcePatch2 $(LIBS)
-
-$(CALC): $(CALCOBJS) $(LIBTARGETS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(CALCOBJS) $(OPENSSL_RPATH_LINK) -lIcePatch2 $(LIBS)
-
-install:: all
-	$(call installprogram,$(SERVER),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/icepatch2server.1,$(DESTDIR)$(install_mandir))
-	$(call installprogram,$(CLIENT),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/icepatch2client.1,$(DESTDIR)$(install_mandir))
-	$(call installprogram,$(CALC),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/icepatch2calc.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak
deleted file mode 100755
index 8ce4d056ff1..00000000000
--- a/cpp/src/IcePatch2/Makefile.mak
+++ /dev/null
@@ -1,88 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-SERVER		= $(top_srcdir)\bin\icepatch2server.exe
-CLIENT		= $(top_srcdir)\bin\icepatch2client.exe
-CALC		= $(top_srcdir)\bin\icepatch2calc.exe
-
-TARGETS         = $(SERVER) $(CLIENT) $(CALC)
-
-SOBJS		= .\FileServerI.obj \
-		  .\Server.obj
-
-COBJS		= .\Client.obj
-
-CALCOBJS	= .\Calc.obj
-
-OBJS		= $(SOBJS) \
-		  $(COBJS) \
-		  $(CALCOBJS)
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-LD_EXEFLAGS     = /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" $(LD_EXEFLAGS)
-
-!if "$(GENERATE_PDB)" == "yes"
-SPDBFLAGS       = /pdb:$(SERVER:.exe=.pdb)
-CPDBFLAGS       = /pdb:$(CLIENT:.exe=.pdb)
-CAPDBFLAGS      = /pdb:$(CALC:.exe=.pdb)
-!endif
-
-SRES_FILE       = IcePatch2Server.res
-CRES_FILE       = IcePatch2Client.res
-CARES_FILE      = IcePatch2Calc.res
-
-$(SERVER): $(SOBJS) IcePatch2Server.res
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
-		icepatch2$(LIBSUFFIX).lib $(SRES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-$(CLIENT): $(COBJS) IcePatch2Client.res
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
-		icepatch2$(LIBSUFFIX).lib $(CRES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-$(CALC): $(CALCOBJS) IcePatch2Calc.res
-	$(LINK) $(LD_EXEFLAGS) $(CAPDBFLAGS) $(SETARGV) $(CALCOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
-		icepatch2$(LIBSUFFIX).lib $(CARES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	-del /q $(SERVER:.exe=.*)
-	-del /q $(CLIENT:.exe=.*)
-	-del /q $(CALC:.exe=.*)
-	-del /q IcePatch2Server.res IcePatch2Client.res IcePatch2Calc.res
-
-install:: all
-	copy $(SERVER) "$(install_bindir)"
-	copy $(CLIENT) "$(install_bindir)"
-	copy $(CALC) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(SERVER:.exe=.pdb) "$(install_bindir)"
-	copy $(CLIENT:.exe=.pdb) "$(install_bindir)"
-	copy $(CALC:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/IcePatch2/Makefile.mk b/cpp/src/IcePatch2/Makefile.mk
new file mode 100644
index 00000000000..62511881399
--- /dev/null
+++ b/cpp/src/IcePatch2/Makefile.mk
@@ -0,0 +1,18 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_programs		:= icepatch2server icepatch2client icepatch2calc
+$(project)_dependencies		:= IcePatch2 Ice
+$(project)_targetdir		:= $(bindir)
+
+icepatch2server_sources	    	:= $(addprefix $(currentdir)/,FileServerI.cpp Server.cpp)
+icepatch2client_sources	 	:= $(addprefix $(currentdir)/,Client.cpp)
+icepatch2calc_sources	 	:= $(addprefix $(currentdir)/,Calc.cpp)
+
+projects += $(project)
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index f0d0dc21b32..b559a091796 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -53,7 +53,7 @@ IcePatch2::PatcherService::start(int argc, char* argv[], int& status)
     IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
     opts.addOpt("v", "version");
-    
+
     vector<string> args;
     try
     {
@@ -109,7 +109,7 @@ IcePatch2::PatcherService::start(int argc, char* argv[], int& status)
             {
                 throw "cannot get the current directory:\n" + IceUtilInternal::lastErrorToString();
             }
-            
+
             dataDir = cwd + '/' + dataDir;
         }
 
@@ -125,7 +125,7 @@ IcePatch2::PatcherService::start(int argc, char* argv[], int& status)
         error(ex);
         return false;
     }
-    
+
     const string endpointsProperty = "IcePatch2.Endpoints";
     string endpoints = properties->getProperty(endpointsProperty);
     if(endpoints.empty())
diff --git a/cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj b/cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj
new file mode 100644
index 00000000000..8c2af56b7ab
--- /dev/null
+++ b/cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8BCB4793-C004-459D-9605-272470D53A40}</ProjectGuid>
+    <RootNamespace>IcePatch2</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IcePatch2Calc.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Calc.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj.filters b/cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj.filters
new file mode 100644
index 00000000000..9995b384935
--- /dev/null
+++ b/cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj.filters
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{6eed4189-6d50-466e-9d1d-d6ba2a3fd2ed}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{6e753bfa-cd5e-49a9-9143-2dd791c88516}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{e749ed03-defe-4090-a3fb-b3f4de854404}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IcePatch2Calc.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Calc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj b/cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj
new file mode 100644
index 00000000000..8d5c27ae1ab
--- /dev/null
+++ b/cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{43D54B43-526E-40CE-9945-81420C54A415}</ProjectGuid>
+    <RootNamespace>IcePatch2</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Client.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IcePatch2Client.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj.filters b/cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj.filters
new file mode 100644
index 00000000000..50a3936b676
--- /dev/null
+++ b/cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj.filters
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{35e45c3f-0eec-4503-983e-2e847cd0c42e}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{ca886c48-a75b-42a4-a79a-b2d4bf6d92fe}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{eda84da9-e268-4a3e-9119-b80594167786}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Client.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IcePatch2Client.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj b/cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj
new file mode 100644
index 00000000000..e97a782a884
--- /dev/null
+++ b/cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{7E1D6372-D417-4143-A7AF-BE3E77550238}</ProjectGuid>
+    <RootNamespace>IcePatch2</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IcePatch2Server.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\FileServerI.cpp" />
+    <ClCompile Include="..\..\Server.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\FileServerI.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj.filters b/cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj.filters
new file mode 100644
index 00000000000..3d2a1ac3b26
--- /dev/null
+++ b/cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj.filters
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{4d4a9ba4-db41-42cc-b76e-a4f382f1276b}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{69865254-0ecb-45a0-ad7e-aca377451e22}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{131c5406-544b-4219-91b7-323ab3dd7866}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IcePatch2Server.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\FileServerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Server.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\FileServerI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IcePatch2Lib/.depend.mak b/cpp/src/IcePatch2Lib/.depend.mak
deleted file mode 100755
index 32ebf0f27a2..00000000000
--- a/cpp/src/IcePatch2Lib/.depend.mak
+++ /dev/null
@@ -1,407 +0,0 @@
-
-FileInfo.h: \
-    "$(slicedir)\IcePatch2\FileInfo.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-FileServer.h: \
-    "$(slicedir)\IcePatch2\FileServer.ice" \
-    "$(slicedir)/IcePatch2/FileInfo.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-ClientUtil.obj: \
-	ClientUtil.cpp \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IcePatch2\ClientUtil.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IcePatch2\FileServer.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "Util.h" \
-
-Util.obj: \
-	Util.cpp \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\SHA1.h" \
-    "Util.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "$(includedir)\IcePatch2\FileServer.h" \
-
-FileInfo.obj: \
-	FileInfo.cpp \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-FileServer.obj: \
-	FileServer.cpp \
-    "$(includedir)\IcePatch2\FileServer.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
diff --git a/cpp/src/IcePatch2Lib/.gitignore b/cpp/src/IcePatch2Lib/.gitignore
deleted file mode 100644
index a6ba57e6121..00000000000
--- a/cpp/src/IcePatch2Lib/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
-FileInfo.cpp
-FileServer.cpp
-FileInfo.h
-FileServer.h
diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp
index 530c73878b2..07c30450029 100644
--- a/cpp/src/IcePatch2Lib/ClientUtil.cpp
+++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp
@@ -9,7 +9,6 @@
 
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/FileUtil.h>
-#define ICE_PATCH2_API_EXPORTS
 #include <IcePatch2/ClientUtil.h>
 #include <IcePatch2Lib/Util.h>
 #include <list>
@@ -21,6 +20,17 @@ using namespace IceUtil;
 using namespace IcePatch2;
 using namespace IcePatch2Internal;
 
+
+IcePatch2::Patcher::~Patcher()
+{
+    // Out of line to avoid weak vtable
+}
+
+IcePatch2::PatcherFeedback::~PatcherFeedback()
+{
+    // Out of line to avoid weak vtable
+}
+
 namespace
 {
 
@@ -80,7 +90,7 @@ private:
     LargeFileInfoSeq _updateFiles;
     LargeFileInfoSeq _updateFlags;
     LargeFileInfoSeq _removeFiles;
-    
+
     FILE* _log;
     bool _useSmallFileAPI;
 };
@@ -146,22 +156,22 @@ void
 Decompressor::run()
 {
     LargeFileInfo info;
-    
+
     while(true)
     {
         {
             IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-        
+
             if(!info.path.empty())
             {
                 _filesDone.push_back(info);
             }
-        
+
             while(!_destroy && _files.empty())
             {
                 wait();
             }
-        
+
             if(!_files.empty())
             {
                 info = _files.front();
@@ -172,7 +182,7 @@ Decompressor::run()
                 return;
             }
         }
-    
+
         try
         {
             decompressFile(_dataDir + '/' + info.path);
@@ -205,7 +215,7 @@ PatcherI::PatcherI(const CommunicatorPtr& communicator, const PatcherFeedbackPtr
     {
         throw "property `IcePatch2Client.Proxy' is not set";
     }
-    
+
     FileServerPrx server = FileServerPrx::checkedCast(communicator->stringToProxy(clientProxy));
     if(!server)
     {
@@ -268,7 +278,7 @@ public:
     }
 
 private:
-    
+
     const PatcherFeedbackPtr _feedback;
 };
 
@@ -294,7 +304,7 @@ PatcherI::prepare()
             }
         }
     }
-    
+
     if(thorough)
     {
         if(!_feedback->checksumStart())
@@ -310,7 +320,7 @@ PatcherI::prepare()
 
         if(!_feedback->checksumEnd())
         {
-            return false;          
+            return false;
         }
 
         saveFileInfoSeq(_dataDir, _localFiles);
@@ -325,7 +335,7 @@ PatcherI::prepare()
         {
             return false;
         }
-        
+
         ByteSeqSeq checksumSeq = _serverCompress->getChecksumSeq();
         if(checksumSeq.size() != 256)
         {
@@ -353,9 +363,9 @@ PatcherI::prepare()
                             assert(nxtCB);
                             swap(nxtCB, curCB);
                         }
-                        
+
                         int node0Nxt = node0;
-                        
+
                         do
                         {
                             ++node0Nxt;
@@ -379,7 +389,7 @@ PatcherI::prepare()
                         {
                             files = _serverCompress->end_getLargeFileInfoSeq(curCB);
                         }
-                        
+
                         sort(files.begin(), files.end(), FileInfoLess());
                         files.erase(unique(files.begin(), files.end(), FileInfoEqual()), files.end());
 
@@ -398,7 +408,7 @@ PatcherI::prepare()
                         //
                         LargeFileInfoSeq updatedFiles;
                         updatedFiles.reserve(files.size());
-                                            
+
                         set_difference(files.begin(),
                                        files.end(),
                                        tree0.nodes[node0].files.begin(),
@@ -453,12 +463,12 @@ PatcherI::prepare()
         {
             return false;
         }
-    }    
+    }
 
     sort(_removeFiles.begin(), _removeFiles.end(), FileInfoLess());
     sort(_updateFiles.begin(), _updateFiles.end(), FileInfoLess());
     sort(_updateFlags.begin(), _updateFlags.end(), FileInfoLess());
-                
+
     string pathLog = simplify(_dataDir + '/' + logFile);
     _log = IceUtilInternal::fopen(pathLog, "w");
     if(!_log)
@@ -483,7 +493,7 @@ PatcherI::patch(const string& d)
                 return false;
             }
         }
-        
+
         if(!_updateFiles.empty())
         {
             if(!updateFiles(_updateFiles))
@@ -499,7 +509,7 @@ PatcherI::patch(const string& d)
                 return false;
             }
         }
-        
+
         return true;
     }
     else
@@ -552,7 +562,7 @@ PatcherI::patch(const string& d)
                 return false;
             }
         }
-        
+
         if(!update.empty())
         {
             if(!updateFiles(update))
@@ -560,7 +570,7 @@ PatcherI::patch(const string& d)
                 return false;
             }
         }
-        
+
         if(!updateFlag.empty())
         {
             if(!updateFlags(updateFlag))
@@ -628,7 +638,7 @@ PatcherI::init(const FileServerPrx& server)
         }
         const_cast<string&>(_dataDir) = simplify(cwd + '/' + _dataDir);
     }
-        
+
     const_cast<FileServerPrx&>(_serverCompress) = FileServerPrx::uncheckedCast(server->ice_compress(true));
     const_cast<FileServerPrx&>(_serverNoCompress) = FileServerPrx::uncheckedCast(server->ice_compress(false));
 }
@@ -659,28 +669,28 @@ PatcherI::removeFiles(const LargeFileInfoSeq& files)
             }
         }
     }
-    
+
     LargeFileInfoSeq newLocalFiles;
     newLocalFiles.reserve(_localFiles.size());
-    
+
     set_difference(_localFiles.begin(),
                    _localFiles.end(),
                    files.begin(),
                    files.end(),
                    back_inserter(newLocalFiles),
                    FileInfoLess());
-    
+
     _localFiles.swap(newLocalFiles);
-    
+
     LargeFileInfoSeq newRemoveFiles;
-    
+
     set_difference(_removeFiles.begin(),
                    _removeFiles.end(),
                    files.begin(),
                    files.end(),
                    back_inserter(newRemoveFiles),
                    FileInfoLess());
-    
+
     _removeFiles.swap(newRemoveFiles);
 
     return true;
@@ -696,7 +706,7 @@ PatcherI::updateFiles(const LargeFileInfoSeq& files)
     // enough for this thread.
     //
     decompressor->start(256 * 1024); // 256KB
-#else 
+#else
     decompressor->start();
 #endif
     bool result;
@@ -712,7 +722,7 @@ PatcherI::updateFiles(const LargeFileInfoSeq& files)
         decompressor->log(_log);
         throw;
     }
-    
+
     decompressor->destroy();
     decompressor->getThreadControl().join();
     decompressor->log(_log);
@@ -726,7 +736,7 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP
 {
     Long total = 0;
     Long updated = 0;
-    
+
     for(LargeFileInfoSeq::const_iterator p = files.begin(); p != files.end(); ++p)
     {
         if(p->size > 0) // Regular, non-empty file?
@@ -734,7 +744,7 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP
             total += p->size;
         }
     }
-    
+
     AsyncResultPtr curCB;
     AsyncResultPtr nxtCB;
 
@@ -768,13 +778,13 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP
             else
             {
                 string pathBZ2 = simplify(_dataDir + '/' + p->path + ".bz2");
-            
+
                 string dir = getDirname(pathBZ2);
                 if(!dir.empty())
                 {
                     createDirectoryRecursive(dir);
                 }
-                
+
                 try
                 {
                     removeRecursive(pathBZ2);
@@ -782,7 +792,7 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP
                 catch(...)
                 {
                 }
-                
+
                 FILE* fileBZ2 = IceUtilInternal::fopen(pathBZ2, "wb");
                 if(fileBZ2 == 0)
                 {
@@ -798,7 +808,7 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP
                         if(!curCB)
                         {
                             assert(!nxtCB);
-                            curCB = _useSmallFileAPI ? 
+                            curCB = _useSmallFileAPI ?
                                 _serverNoCompress->begin_getFileCompressed(p->path, static_cast<Ice::Int>(pos), _chunkSize) :
                                 _serverNoCompress->begin_getLargeFileCompressed(p->path, pos, _chunkSize);
                         }
@@ -868,13 +878,13 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP
                     fclose(fileBZ2);
                     throw;
                 }
-                
+
                 fclose(fileBZ2);
-                
+
                 decompressor->log(_log);
                 decompressor->add(*p);
             }
-            
+
             if(!_feedback->patchEnd())
             {
                 return false;
@@ -884,14 +894,14 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP
 
     LargeFileInfoSeq newLocalFiles;
     newLocalFiles.reserve(_localFiles.size());
-        
+
     set_union(_localFiles.begin(),
               _localFiles.end(),
               files.begin(),
               files.end(),
               back_inserter(newLocalFiles),
               FileInfoLess());
-        
+
     _localFiles.swap(newLocalFiles);
 
     LargeFileInfoSeq newUpdateFiles;
@@ -902,7 +912,7 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP
                    files.end(),
                    back_inserter(newUpdateFiles),
                    FileInfoLess());
-        
+
     _updateFiles.swap(newUpdateFiles);
 
     return true;
@@ -922,7 +932,7 @@ PatcherI::updateFlags(const LargeFileInfoSeq& files)
     //
     // Remove the old files whose flags were updated from the set of
     // local files.
-    // 
+    //
     LargeFileInfoSeq localFiles;
     localFiles.reserve(_localFiles.size());
     set_difference(_localFiles.begin(),
@@ -933,7 +943,7 @@ PatcherI::updateFlags(const LargeFileInfoSeq& files)
                    FileInfoWithoutFlagsLess()); // NOTE: We ignore the flags.
 
     //
-    // Add the new files to the set of local file. 
+    // Add the new files to the set of local file.
     //
     _localFiles.clear();
     set_union(localFiles.begin(),
@@ -951,7 +961,7 @@ PatcherI::updateFlags(const LargeFileInfoSeq& files)
                    files.end(),
                    back_inserter(newUpdateFlags),
                    FileInfoLess());
-        
+
     _updateFlags.swap(newUpdateFlags);
 
     return true;
diff --git a/cpp/src/IcePatch2Lib/IcePatch2.rc b/cpp/src/IcePatch2Lib/IcePatch2.rc
index 4e4bc0b69d1..3c034f4069e 100644
--- a/cpp/src/IcePatch2Lib/IcePatch2.rc
+++ b/cpp/src/IcePatch2Lib/IcePatch2.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icepatch236d\0"
- #define ORIGINALFILENAME "icepatch236d.dll\0"
+ #define INTERNALNAME "icepatch237a2d\0"
+ #define ORIGINALFILENAME "icepatch237a2d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icepatch236\0"
- #define ORIGINALFILENAME "icepatch236.dll\0"
+ #define INTERNALNAME "icepatch237a2\0"
+ #define ORIGINALFILENAME "icepatch237a2.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 Client Library\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2Lib/Makefile b/cpp/src/IcePatch2Lib/Makefile
deleted file mode 100644
index 4c1f938f0ee..00000000000
--- a/cpp/src/IcePatch2Lib/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME	= $(call mklibfilename,IcePatch2,$(VERSION))
-SONAME     	= $(call mksoname,IcePatch2,$(SOVERSION))
-LIBNAME		= $(call mklibname,IcePatch2)
-
-TARGETS   	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-
-SLICE_OBJS	= FileInfo.o \
-		  FileServer.o
-
-OBJS		= ClientUtil.o \
-		  Util.o \
-		  $(SLICE_OBJS)
-
-HDIR		= $(headerdir)/IcePatch2
-SDIR		= $(slicedir)/IcePatch2
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I.. $(CPPFLAGS) $(BZIP2_FLAGS)
-
-ifeq ($(GCC_COMPILER),yes)
-        CPPFLAGS := $(CPPFLAGS) -Wno-deprecated-declarations
-endif
-
-
-SLICE2CPPFLAGS	:= --ice --include-dir IcePatch2 --dll-export ICE_PATCH2_API $(SLICE2CPPFLAGS)
-LINKWITH	:= $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(BZIP2_LIBS)
-
-$(libdir)/$(LIBFILENAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/IcePatch2Lib/Makefile.mak b/cpp/src/IcePatch2Lib/Makefile.mak
deleted file mode 100755
index dd0e1414a52..00000000000
--- a/cpp/src/IcePatch2Lib/Makefile.mak
+++ /dev/null
@@ -1,67 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME		= $(top_srcdir)\lib\icepatch2$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icepatch2$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-SLICE_OBJS	= .\FileInfo.obj \
-		  .\FileServer.obj
-
-OBJS		= .\ClientUtil.obj \
-		  .\Util.obj \
-		  $(SLICE_OBJS)
-
-HDIR		= $(headerdir)\IcePatch2
-SDIR		= $(slicedir)\IcePatch2
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-$(OBJS)		: $(BZIP2_NUPKG)
-
-CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -wd4996 $(BZIP2_CPPFLAGS)
-
-SLICE2CPPFLAGS	= --ice --include-dir IcePatch2 --dll-export ICE_PATCH2_API $(SLICE2CPPFLAGS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = IcePatch2.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IcePatch2.res
-	$(LINK) $(BASE):0x29000000 $(LD_DLLFLAGS) $(BZIP2_LDFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(BZIP2_LIBS) \
-	    $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	-del /q FileInfo.cpp $(HDIR)\FileInfo.h
-	-del /q FileServer.cpp $(HDIR)\FileServer.h
-	-del /q IcePatch2.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/IcePatch2Lib/Makefile.mk b/cpp/src/IcePatch2Lib/Makefile.mk
new file mode 100644
index 00000000000..ca8f7ab85ff
--- /dev/null
+++ b/cpp/src/IcePatch2Lib/Makefile.mk
@@ -0,0 +1,18 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries	:= IcePatch2
+
+IcePatch2_targetdir	:= $(libdir)
+IcePatch2_dependencies	:= Ice
+IcePatch2_libs		:= bz2
+IcePatch2_sliceflags	:= --include-dir IcePatch2 --dll-export ICE_PATCH2_API
+IcePatch2_cppflags	:= $(nodeprecatedwarnings-cppflags)
+
+projects += $(project)
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp
index 681281b169f..4e89aebc6a2 100644
--- a/cpp/src/IcePatch2Lib/Util.cpp
+++ b/cpp/src/IcePatch2Lib/Util.cpp
@@ -20,8 +20,6 @@
 #include <IceUtil/FileUtil.h>
 #include <IceUtil/SHA1.h>
 #include <IceUtil/Exception.h>
-
-#define ICE_PATCH2_API_EXPORTS
 #include <IcePatch2Lib/Util.h>
 #include <IcePatch2/FileServer.h>
 #include <bzlib.h>
@@ -1018,6 +1016,11 @@ getFileInfoSeqInternal(const string& basePath, const string& relPath, int compre
 
 }
 
+IcePatch2Internal::GetFileInfoSeqCB::~GetFileInfoSeqCB()
+{
+    // Out of line to avoid weak vtable
+}
+
 bool
 IcePatch2Internal::getFileInfoSeq(const string& basePath, int compress, GetFileInfoSeqCB* cb,
                                   LargeFileInfoSeq& infoSeq)
@@ -1239,4 +1242,3 @@ IcePatch2Internal::getFileTree0(const LargeFileInfoSeq& infoSeq, FileTree0& tree
         fill(tree0.checksum.begin(), tree0.checksum.end(), 0);
     }
 }
-
diff --git a/cpp/src/IcePatch2Lib/Util.h b/cpp/src/IcePatch2Lib/Util.h
index 1eb580a354e..12bc86a93b2 100644
--- a/cpp/src/IcePatch2Lib/Util.h
+++ b/cpp/src/IcePatch2Lib/Util.h
@@ -156,7 +156,7 @@ class ICE_PATCH2_API GetFileInfoSeqCB
 {
 public:
 
-    virtual ~GetFileInfoSeqCB() { }
+    virtual ~GetFileInfoSeqCB();
 
     virtual bool remove(const std::string&) = 0;
     virtual bool checksum(const std::string&) = 0;
diff --git a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
new file mode 100644
index 00000000000..1fc3000d0b3
--- /dev/null
+++ b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{994ADD25-20A0-4715-A3EC-9F86AFD481D0}</ProjectGuid>
+    <RootNamespace>IcePatch2</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IcePatch2\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IcePatch2</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderDLLExport>ICE_PATCH2_API</IceBuilderDLLExport>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_PATCH2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_PATCH2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_PATCH2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_PATCH2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\slice\IcePatch2\FileInfo.ice" />
+    <IceBuilder Include="..\..\..\..\slice\IcePatch2\FileServer.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\ClientUtil.cpp" />
+    <ClCompile Include="..\Util.cpp" />
+    <ClCompile Include="Win32\Debug\FileInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FileServer.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FileInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FileServer.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FileInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FileServer.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FileInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FileServer.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\include\generated\cpp98\Win32\Debug\IcePatch2\FileInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\Win32\Debug\IcePatch2\FileServer.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\Win32\Release\IcePatch2\FileInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\Win32\Release\IcePatch2\FileServer.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\x64\Debug\IcePatch2\FileInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\x64\Debug\IcePatch2\FileServer.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\x64\Release\IcePatch2\FileInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\x64\Release\IcePatch2\FileServer.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\IcePatch2\ClientUtil.h" />
+    <ClInclude Include="..\..\..\include\IcePatch2\Config.h" />
+    <ClInclude Include="..\..\..\include\IcePatch2\IcePatch2.h" />
+    <ClInclude Include="..\Util.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\IcePatch2.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" />
+    <Import Project="..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj.filters b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj.filters
new file mode 100644
index 00000000000..5ec1d26b4e6
--- /dev/null
+++ b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj.filters
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{d2712066-1923-447a-ad64-c80f747fb1ea}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{af5258c0-2b8d-40ab-be90-0b7b080169c2}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{f59eb29a-8e4d-4f96-956f-912bb71723f5}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{efca70d0-5c94-455a-b115-a1627cd37f1f}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{b2de4f44-f7bf-4d2b-8b1f-7a7eb14023b8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{53019a64-4101-485f-9cbc-06003a1dbf05}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{9e5ee2e4-9fa9-4c5c-a39f-e25b5abadf9b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{c6d023b5-a4f9-4400-acf3-492ab13e1559}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{c290a809-84db-4a63-b1ab-d797afc58dbe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{28be0f87-bd50-4e44-b1ba-0e1ae0fca153}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{69f748d0-0821-4b05-8824-22b83945880a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{859e3a89-2f71-4335-806c-3c306d75b0c8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{46937cff-2db3-4117-8063-dbe9fd345624}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{d98eb1b4-139b-4c19-b728-3eb412a4b718}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{f630f65f-1553-46f9-b40b-c7a0731de52a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{6a79f0b3-e47f-4f69-9431-d0d1fe23696e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\slice\IcePatch2\FileInfo.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\slice\IcePatch2\FileServer.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\ClientUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FileInfo.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\FileServer.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FileInfo.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\FileServer.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FileInfo.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\FileServer.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FileInfo.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\FileServer.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\Win32\Debug\IcePatch2\FileInfo.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\Win32\Debug\IcePatch2\FileServer.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\x64\Debug\IcePatch2\FileInfo.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\x64\Debug\IcePatch2\FileServer.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\Win32\Release\IcePatch2\FileInfo.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\Win32\Release\IcePatch2\FileServer.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\x64\Release\IcePatch2\FileInfo.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\generated\cpp98\x64\Release\IcePatch2\FileServer.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\IcePatch2\IcePatch2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\IcePatch2\Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\IcePatch2\ClientUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\IcePatch2.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IcePatch2Lib/msbuild/packages.config b/cpp/src/IcePatch2Lib/msbuild/packages.config
new file mode 100644
index 00000000000..0a7d8fee24d
--- /dev/null
+++ b/cpp/src/IcePatch2Lib/msbuild/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="bzip2.v120" version="1.0.6.4" targetFramework="native" />
+  <package id="bzip2.v140" version="1.0.6.4" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/cpp/src/IceSSL/.depend.mak b/cpp/src/IceSSL/.depend.mak
deleted file mode 100755
index 39ec4f0e9b2..00000000000
--- a/cpp/src/IceSSL/.depend.mak
+++ /dev/null
@@ -1,1478 +0,0 @@
-
-ConnectionInfo.h: \
-    "$(slicedir)\IceSSL\ConnectionInfo.ice" \
-    "$(slicedir)/Ice/Connection.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Endpoint.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/EndpointF.ice"
-
-EndpointInfo.h: \
-    "$(slicedir)\IceSSL\EndpointInfo.ice" \
-    "$(slicedir)/Ice/Endpoint.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/EndpointF.ice"
-
-ConnectionInfo.obj: \
-	ConnectionInfo.cpp \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-EndpointInfo.obj: \
-	EndpointInfo.cpp \
-    "$(includedir)\IceSSL\EndpointInfo.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-AcceptorI.obj: \
-	AcceptorI.cpp \
-    "AcceptorI.h" \
-    "..\..\src\Ice\TransceiverF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\src\Ice\Acceptor.h" \
-    "..\..\src\Ice\AcceptorF.h" \
-    "..\..\src\Ice\EndpointIF.h" \
-    "..\..\src\Ice\Network.h" \
-    "..\..\src\Ice\NetworkF.h" \
-    "..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\src\Ice\ProtocolInstanceF.h" \
-    "InstanceF.h" \
-    "EndpointI.h" \
-    "..\..\src\Ice\IPEndpointI.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\src\Ice\EndpointI.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "..\..\src\Ice\ConnectorF.h" \
-    "..\..\src\Ice\EndpointFactory.h" \
-    "..\..\src\Ice\EndpointFactoryF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\src\Ice\WSEndpoint.h" \
-    "..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\src\Ice\RouterInfoF.h" \
-    "..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\IceSSL\EndpointInfo.h" \
-    "Instance.h" \
-    "SSLEngineF.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "OpenSSLTransceiverI.h" \
-    "Util.h" \
-    "..\..\src\Ice\Transceiver.h" \
-    "..\..\src\Ice\StreamSocket.h" \
-    "..\..\src\Ice\WSTransceiver.h" \
-    "..\..\src\Ice\HttpParser.h" \
-    "SecureTransportTransceiverI.h" \
-    "SChannelTransceiverI.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-Certificate.obj: \
-	Certificate.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "Util.h" \
-    "RFC2253.h" \
-
-ConnectorI.obj: \
-	ConnectorI.cpp \
-    "ConnectorI.h" \
-    "..\..\src\Ice\TransceiverF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\src\Ice\Connector.h" \
-    "..\..\src\Ice\ConnectorF.h" \
-    "..\..\src\Ice\Network.h" \
-    "..\..\src\Ice\NetworkF.h" \
-    "..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\src\Ice\ProtocolInstanceF.h" \
-    "InstanceF.h" \
-    "Instance.h" \
-    "..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\src\Ice\EndpointIF.h" \
-    "..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\src\Ice\RouterInfoF.h" \
-    "..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "SSLEngineF.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "OpenSSLTransceiverI.h" \
-    "Util.h" \
-    "..\..\src\Ice\Transceiver.h" \
-    "..\..\src\Ice\StreamSocket.h" \
-    "..\..\src\Ice\WSTransceiver.h" \
-    "..\..\src\Ice\HttpParser.h" \
-    "SecureTransportTransceiverI.h" \
-    "SChannelTransceiverI.h" \
-    "EndpointI.h" \
-    "..\..\src\Ice\IPEndpointI.h" \
-    "..\..\src\Ice\EndpointI.h" \
-    "..\..\src\Ice\AcceptorF.h" \
-    "..\..\src\Ice\EndpointFactory.h" \
-    "..\..\src\Ice\EndpointFactoryF.h" \
-    "..\..\src\Ice\WSEndpoint.h" \
-    "$(includedir)\IceSSL\EndpointInfo.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "..\..\src\Ice\NetworkProxy.h" \
-
-EndpointI.obj: \
-	EndpointI.cpp \
-    "EndpointI.h" \
-    "..\..\src\Ice\IPEndpointI.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\src\Ice\IPEndpointIF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\src\Ice\EndpointI.h" \
-    "..\..\src\Ice\EndpointIF.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "..\..\src\Ice\TransceiverF.h" \
-    "..\..\src\Ice\ConnectorF.h" \
-    "..\..\src\Ice\AcceptorF.h" \
-    "..\..\src\Ice\Network.h" \
-    "..\..\src\Ice\NetworkF.h" \
-    "..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\src\Ice\EndpointFactory.h" \
-    "..\..\src\Ice\EndpointFactoryF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "..\..\src\Ice\WSEndpoint.h" \
-    "..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\src\Ice\RouterInfoF.h" \
-    "..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "InstanceF.h" \
-    "$(includedir)\IceSSL\EndpointInfo.h" \
-    "AcceptorI.h" \
-    "..\..\src\Ice\Acceptor.h" \
-    "ConnectorI.h" \
-    "..\..\src\Ice\Connector.h" \
-    "Instance.h" \
-    "SSLEngineF.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "..\..\src\Ice\DefaultsAndOverrides.h" \
-    "..\..\src\Ice\HashUtil.h" \
-
-Instance.obj: \
-	Instance.cpp \
-    "$(includedir)\IceUtil\Config.h" \
-    "Instance.h" \
-    "InstanceF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\Config.h" \
-    "..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\src\Ice\ProtocolInstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "..\..\src\Ice\EndpointIF.h" \
-    "..\..\src\Ice\ConnectorF.h" \
-    "..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\src\Ice\NetworkF.h" \
-    "..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\src\Ice\RouterInfoF.h" \
-    "..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "SSLEngineF.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "SSLEngine.h" \
-    "Util.h" \
-    "TrustManagerF.h" \
-    "..\..\src\Ice\Network.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-
-PluginI.obj: \
-	PluginI.cpp \
-    "PluginI.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "SSLEngineF.h" \
-    "Instance.h" \
-    "InstanceF.h" \
-    "..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\src\Ice\ProtocolInstanceF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\src\Ice\EndpointIF.h" \
-    "..\..\src\Ice\ConnectorF.h" \
-    "..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\src\Ice\NetworkF.h" \
-    "..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\src\Ice\RouterInfoF.h" \
-    "..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "SSLEngine.h" \
-    "Util.h" \
-    "TrustManagerF.h" \
-    "..\..\src\Ice\Network.h" \
-    "EndpointI.h" \
-    "..\..\src\Ice\IPEndpointI.h" \
-    "..\..\src\Ice\EndpointI.h" \
-    "..\..\src\Ice\TransceiverF.h" \
-    "..\..\src\Ice\AcceptorF.h" \
-    "..\..\src\Ice\EndpointFactory.h" \
-    "..\..\src\Ice\EndpointFactoryF.h" \
-    "..\..\src\Ice\WSEndpoint.h" \
-    "$(includedir)\IceSSL\EndpointInfo.h" \
-    "..\..\src\Ice\ProtocolPluginFacade.h" \
-    "..\..\src\Ice\ProtocolPluginFacadeF.h" \
-
-RFC2253.obj: \
-	RFC2253.cpp \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "RFC2253.h" \
-
-SChannelEngine.obj: \
-	SChannelEngine.cpp \
-    "SSLEngine.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "Util.h" \
-    "SSLEngineF.h" \
-    "TrustManagerF.h" \
-    "..\..\src\Ice\Network.h" \
-    "..\..\src\Ice\NetworkF.h" \
-    "..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\src\Ice\ProtocolInstanceF.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-SChannelTransceiverI.obj: \
-	SChannelTransceiverI.cpp \
-    "SChannelTransceiverI.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "InstanceF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "SSLEngineF.h" \
-    "..\..\src\Ice\Transceiver.h" \
-    "..\..\src\Ice\TransceiverF.h" \
-    "..\..\src\Ice\EndpointIF.h" \
-    "..\..\src\Ice\Network.h" \
-    "..\..\src\Ice\NetworkF.h" \
-    "..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\src\Ice\ProtocolInstanceF.h" \
-    "..\..\src\Ice\StreamSocket.h" \
-    "..\..\src\Ice\WSTransceiver.h" \
-    "..\..\src\Ice\ProtocolInstance.h" \
-    "..\..\src\Ice\ConnectorF.h" \
-    "..\..\src\Ice\IPEndpointIF.h" \
-    "..\..\src\Ice\Instance.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "..\..\src\Ice\TraceLevelsF.h" \
-    "..\..\src\Ice\DefaultsAndOverridesF.h" \
-    "..\..\src\Ice\RouterInfoF.h" \
-    "..\..\src\Ice\LocatorInfoF.h" \
-    "..\..\src\Ice\ReferenceFactoryF.h" \
-    "$(includedir)\Ice\ThreadPoolF.h" \
-    "$(includedir)\Ice\ConnectionFactoryF.h" \
-    "..\..\src\Ice\ACM.h" \
-    "$(includedir)\Ice\ACMF.h" \
-    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
-    "..\..\src\Ice\EndpointFactoryManagerF.h" \
-    "..\..\src\Ice\RetryQueueF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "..\..\src\Ice\ImplicitContextI.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "..\..\src\Ice\HttpParser.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "Instance.h" \
-    "SSLEngine.h" \
-    "Util.h" \
-    "TrustManagerF.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-SSLEngine.obj: \
-	SSLEngine.cpp \
-    "SSLEngine.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "Util.h" \
-    "SSLEngineF.h" \
-    "TrustManagerF.h" \
-    "..\..\src\Ice\Network.h" \
-    "..\..\src\Ice\NetworkF.h" \
-    "..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\src\Ice\ProtocolInstanceF.h" \
-    "TrustManager.h" \
-    "RFC2253.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\LocalException.h" \
-
-TrustManager.obj: \
-	TrustManager.cpp \
-    "TrustManager.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "TrustManagerF.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "RFC2253.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "..\..\src\Ice\Network.h" \
-    "..\..\src\Ice\NetworkF.h" \
-    "..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\src\Ice\ProtocolInstanceF.h" \
-
-Util.obj: \
-	Util.cpp \
-    "$(includedir)\IceUtil\Config.h" \
-    "Util.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceSSL\Plugin.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceSSL\Config.h" \
-    "$(includedir)\IceSSL\ConnectionInfo.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "..\..\src\Ice\Network.h" \
-    "..\..\src\Ice\NetworkF.h" \
-    "..\..\src\Ice\NetworkProxyF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "..\..\src\Ice\ProtocolInstanceF.h" \
diff --git a/cpp/src/IceSSL/.gitignore b/cpp/src/IceSSL/.gitignore
deleted file mode 100644
index 981999c07ba..00000000000
--- a/cpp/src/IceSSL/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
-ConnectionInfo.cpp
-EndpointInfo.cpp
-ConnectionInfo.h
-EndpointInfo.h
diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp
index 7f8c70341ed..8042fb8d195 100644
--- a/cpp/src/IceSSL/AcceptorI.cpp
+++ b/cpp/src/IceSSL/AcceptorI.cpp
@@ -11,23 +11,15 @@
 #include <IceSSL/EndpointI.h>
 #include <IceSSL/Instance.h>
 
+
 #include <IceSSL/OpenSSLTransceiverI.h>
 #include <IceSSL/SecureTransportTransceiverI.h>
 #include <IceSSL/SChannelTransceiverI.h>
+#include <IceSSL/WinRTTransceiverI.h>
 
 #include <IceSSL/Util.h>
 
-#include <Ice/Communicator.h>
-#include <Ice/Exception.h>
 #include <Ice/LocalException.h>
-#include <Ice/LoggerUtil.h>
-#include <Ice/Properties.h>
-#include <Ice/StreamSocket.h>
-#include <IceUtil/StringUtil.h>
-
-#ifdef ICE_USE_IOCP
-#  include <Mswsock.h>
-#endif
 
 using namespace std;
 using namespace Ice;
@@ -38,90 +30,43 @@ IceUtil::Shared* IceSSL::upCast(AcceptorI* p) { return p; }
 IceInternal::NativeInfoPtr
 IceSSL::AcceptorI::getNativeInfo()
 {
-    return this;
+    return _delegate->getNativeInfo();
 }
 
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
 IceInternal::AsyncInfo*
-IceSSL::AcceptorI::getAsyncInfo(IceInternal::SocketOperation)
+IceSSL::AcceptorI::getAsyncInfo(IceInternal::SocketOperation status)
 {
-    return &_info;
+    return _delegate->getNativeInfo()->getAsyncInfo(status);
 }
 #endif
 
 void
 IceSSL::AcceptorI::close()
 {
-    if(_fd != INVALID_SOCKET)
-    {
-        IceInternal::closeSocketNoThrow(_fd);
-        _fd = INVALID_SOCKET;
-    }
+    _delegate->close();
 }
 
 IceInternal::EndpointIPtr
 IceSSL::AcceptorI::listen()
 {
-    try
-    {
-        const_cast<IceInternal::Address&>(_addr) = IceInternal::doBind(_fd, _addr);
-        IceInternal::doListen(_fd, _backlog);
-    }
-    catch(...)
-    {
-        _fd = INVALID_SOCKET;
-        throw;
-    }
-    _endpoint = _endpoint->endpoint(this);
+    _endpoint = _endpoint->endpoint(_delegate->listen());
     return _endpoint;
 }
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
 void
 IceSSL::AcceptorI::startAccept()
 {
-    LPFN_ACCEPTEX AcceptEx = NULL; // a pointer to the 'AcceptEx()' function
-    GUID GuidAcceptEx = WSAID_ACCEPTEX; // The Guid
-    DWORD dwBytes;
-    if(WSAIoctl(_fd,
-                SIO_GET_EXTENSION_FUNCTION_POINTER,
-                &GuidAcceptEx,
-                sizeof(GuidAcceptEx),
-                &AcceptEx,
-                sizeof(AcceptEx),
-                &dwBytes,
-                NULL,
-                NULL) == SOCKET_ERROR)
-    {
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = IceInternal::getSocketErrno();
-        throw ex;
-    }
+    _delegate->startAccept();
 
-    assert(_acceptFd == INVALID_SOCKET);
-    _acceptFd = IceInternal::createSocket(false, _addr);
-    const int sz = static_cast<int>(_acceptBuf.size() / 2);
-    if(!AcceptEx(_fd, _acceptFd, &_acceptBuf[0], 0, sz, sz, &_info.count, &_info))
-    {
-        if(!IceInternal::wouldBlock())
-        {
-            SocketException ex(__FILE__, __LINE__);
-            ex.error = IceInternal::getSocketErrno();
-            throw ex;
-        }
-    }
 }
 
 void
 IceSSL::AcceptorI::finishAccept()
 {
-    if(static_cast<int>(_info.count) == SOCKET_ERROR || _fd == INVALID_SOCKET)
-    {
-        IceInternal::closeSocketNoThrow(_acceptFd);
-        _acceptFd = INVALID_SOCKET;
-        _acceptError = _info.error;
-    }
+    _delegate->finishAccept();
 }
 #endif
 
@@ -138,121 +83,36 @@ IceSSL::AcceptorI::accept()
         throw ex;
     }
 
-#ifndef ICE_USE_IOCP
-    SOCKET fd = IceInternal::doAccept(_fd);
-#else
-    if(_acceptFd == INVALID_SOCKET)
-    {
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = _acceptError;
-        throw ex;
-    }
-
-    if(setsockopt(_acceptFd, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char*)&_acceptFd, sizeof(_acceptFd)) ==
-       SOCKET_ERROR)
-    {
-        IceInternal::closeSocketNoThrow(_acceptFd);
-        _acceptFd = INVALID_SOCKET;
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = IceInternal::getSocketErrno();
-        throw ex;
-    }
-
-    SOCKET fd = _acceptFd;
-    _acceptFd = INVALID_SOCKET;
-#endif
-
-    //
-    // SSL handshaking is performed in TransceiverI::initialize, since
-    // accept must not block.
-    //
-    return new TransceiverI(_instance, new IceInternal::StreamSocket(_instance, fd), _adapterName, true);
+    return new TransceiverI(_instance, _delegate->accept(), _adapterName, true);
 }
 
 string
 IceSSL::AcceptorI::protocol() const
 {
-    return _instance->protocol();
+    return _delegate->protocol();
 }
 
 string
 IceSSL::AcceptorI::toString() const
 {
-    return IceInternal::addrToString(_addr);
+    return _delegate->toString();
 }
 
 string
 IceSSL::AcceptorI::toDetailedString() const
 {
-    ostringstream os;
-    os << "local address = " << toString();
-    vector<string> intfs = getHostsForEndpointExpand(inetAddrToString(_addr), _instance->protocolSupport(), true);
-    if(!intfs.empty())
-    {
-        os << "\nlocal interfaces = ";
-        os << IceUtilInternal::joinString(intfs, ", ");
-    }
-    return os.str();
+    return _delegate->toDetailedString();
 }
 
-int
-IceSSL::AcceptorI::effectivePort() const
-{
-    if(_addr.saStorage.ss_family == AF_INET)
-    {
-        return ntohs(_addr.saIn.sin_port);
-    }
-    else
-    {
-        return ntohs(_addr.saIn6.sin6_port);
-    }
-}
-
-IceSSL::AcceptorI::AcceptorI(const EndpointIPtr& endpoint, const InstancePtr& instance, const string& adapterName,
-                             const string& host, int port) :
+IceSSL::AcceptorI::AcceptorI(const EndpointIPtr& endpoint, const InstancePtr& instance,
+                             const IceInternal::AcceptorPtr& del, const string& adapterName) :
     _endpoint(endpoint),
     _instance(instance),
-    _adapterName(adapterName),
-    _addr(IceInternal::getAddressForServer(host, port, instance->protocolSupport(), instance->preferIPv6()))
-#ifdef ICE_USE_IOCP
-    , _acceptFd(INVALID_SOCKET),
-    _info(IceInternal::SocketOperationRead)
-#endif
+    _delegate(del),
+    _adapterName(adapterName)
 {
-#ifdef SOMAXCONN
-    _backlog = instance->properties()->getPropertyAsIntWithDefault("Ice.TCP.Backlog", SOMAXCONN);
-#else
-    _backlog = instance->properties()->getPropertyAsIntWithDefault("Ice.TCP.Backlog", 511);
-#endif
-
-    IceInternal::ProtocolSupport protocol = instance->protocolSupport();
-    _fd = IceInternal::createServerSocket(false, _addr, protocol);
-#ifdef ICE_USE_IOCP
-    _acceptBuf.resize((sizeof(sockaddr_storage) + 16) * 2);
-#endif
-    IceInternal::setBlock(_fd, false);
-    IceInternal::setTcpBufSize(_fd, _instance);
-#ifndef _WIN32
-    //
-    // Enable SO_REUSEADDR on Unix platforms to allow re-using the
-    // socket even if it's in the TIME_WAIT state. On Windows,
-    // this doesn't appear to be necessary and enabling
-    // SO_REUSEADDR would actually not be a good thing since it
-    // allows a second process to bind to an address even it's
-    // already bound by another process.
-    //
-    // TODO: using SO_EXCLUSIVEADDRUSE on Windows would probably
-    // be better but it's only supported by recent Windows
-    // versions (XP SP2, Windows Server 2003).
-    //
-    IceInternal::setReuseAddress(_fd, true);
-#endif
 }
 
 IceSSL::AcceptorI::~AcceptorI()
 {
-    assert(_fd == INVALID_SOCKET);
-#ifdef ICE_USE_IOCP
-    assert(_acceptFd == INVALID_SOCKET);
-#endif
 }
diff --git a/cpp/src/IceSSL/AcceptorI.h b/cpp/src/IceSSL/AcceptorI.h
index 465878a24c2..3ee5d5d2d4c 100644
--- a/cpp/src/IceSSL/AcceptorI.h
+++ b/cpp/src/IceSSL/AcceptorI.h
@@ -25,13 +25,13 @@ class AcceptorI : public IceInternal::Acceptor, public IceInternal::NativeInfo
 public:
 
     virtual IceInternal::NativeInfoPtr getNativeInfo();
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual IceInternal::AsyncInfo* getAsyncInfo(IceInternal::SocketOperation);
 #endif
 
     virtual void close();
     virtual IceInternal::EndpointIPtr listen();
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual void startAccept();
     virtual void finishAccept();
 #endif
@@ -40,25 +40,16 @@ public:
     virtual std::string toString() const;
     virtual std::string toDetailedString() const;
 
-    int effectivePort() const;
-
 private:
 
-    AcceptorI(const EndpointIPtr&, const InstancePtr&, const std::string&, const std::string&, int);
+    AcceptorI(const EndpointIPtr&, const InstancePtr&, const IceInternal::AcceptorPtr&, const std::string&);
     virtual ~AcceptorI();
     friend class EndpointI;
 
     EndpointIPtr _endpoint;
     const InstancePtr _instance;
+    const IceInternal::AcceptorPtr _delegate;
     const std::string _adapterName;
-    const IceInternal::Address _addr;
-    int _backlog;
-#ifdef ICE_USE_IOCP
-    SOCKET _acceptFd;
-    int _acceptError;
-    std::vector<char> _acceptBuf;
-    IceInternal::AsyncInfo _info;
-#endif
 };
 
 }
diff --git a/cpp/src/IceSSL/Certificate.cpp b/cpp/src/IceSSL/Certificate.cpp
index 3ad223fb151..7fb39540760 100644..100755
--- a/cpp/src/IceSSL/Certificate.cpp
+++ b/cpp/src/IceSSL/Certificate.cpp
@@ -15,6 +15,7 @@
 #include <IceSSL/Util.h>
 #include <IceSSL/RFC2253.h>
 #include <Ice/Object.h>
+#include <Ice/Base64.h>
 
 #if defined(ICE_USE_OPENSSL)
 #  include <openssl/x509v3.h>
@@ -42,14 +43,12 @@ extern "C" typedef void (*FreeFunc)(void*);
 
 #endif
 
-
 using namespace std;
 using namespace Ice;
 using namespace IceSSL;
 
-const char* IceSSL::CertificateReadException::_name = "IceSSL::CertificateReadException";
-
 #if defined(ICE_USE_SECURE_TRANSPORT) || defined(ICE_USE_SCHANNEL)
+
 //
 // Map a certificate OID to its alias
 //
@@ -82,7 +81,6 @@ const int certificateOIDSSize = sizeof(certificateOIDS) / sizeof(CertificateOID)
 
 #endif
 
-
 #if defined(ICE_USE_SECURE_TRANSPORT)
 
 string
@@ -100,29 +98,6 @@ certificateOIDAlias(const string& name)
     return name;
 }
 
-//
-// Map alternative name alias to its types.
-//
-const char* certificateAlternativeNameTypes[] = {"", "Email Address", "DNS Name", "", "Directory Name", "", "URI",
-                                                 "IP Address"};
-const int certificateAlternativeNameTypesSize = sizeof(certificateAlternativeNameTypes) / sizeof(char*);
-
-int
-certificateAlternativeNameType(const string& alias)
-{
-    if(!alias.empty())
-    {
-        for(int i = 0; i < certificateAlternativeNameTypesSize; ++i)
-        {
-            if(alias == certificateAlternativeNameTypes[i])
-            {
-                return i;
-            }
-        }
-    }
-    return -1; // Not supported
-}
-
 string
 escapeX509Name(const string& name)
 {
@@ -151,6 +126,31 @@ escapeX509Name(const string& name)
     return os.str();
 }
 
+#if !defined(ICE_USE_SECURE_TRANSPORT_IOS)
+
+//
+// Map alternative name alias to its types.
+//
+const char* certificateAlternativeNameTypes[] = {"", "Email Address", "DNS Name", "", "Directory Name", "", "URI",
+                                                 "IP Address"};
+const int certificateAlternativeNameTypesSize = sizeof(certificateAlternativeNameTypes) / sizeof(char*);
+
+int
+certificateAlternativeNameType(const string& alias)
+{
+    if(!alias.empty())
+    {
+        for(int i = 0; i < certificateAlternativeNameTypesSize; ++i)
+        {
+            if(alias == certificateAlternativeNameTypes[i])
+            {
+                return i;
+            }
+        }
+    }
+    return -1; // Not supported
+}
+
 DistinguishedName
 getX509Name(SecCertificateRef cert, CFTypeRef key)
 {
@@ -258,8 +258,158 @@ getX509String(SecCertificateRef cert, CFTypeRef key)
     return value;
 }
 
-#elif defined(ICE_USE_SCHANNEL)
+#else // IOS
+
+//
+// ASN1Parser to pase the subject/issuer ASN.1 DER encoded attributes on iOS.
+//
+class ASN1Parser
+{
+public:
+
+    ASN1Parser(CFDataRef data) : _data(CFDataGetBytePtr(data)), _length(CFDataGetLength(data)), _p(_data), _next(0)
+    {
+    }
 
+    list<pair<string, string> >
+    parse()
+    {
+        list<pair<string, string> > rdns;
+        while(_p < _data + _length)
+        {
+            switch(parseByte())
+            {
+                case 0x06: // OID
+                {
+                    _rdn.first = parseOID();
+                    break;
+                }
+                case 0x12: // NumericString
+                case 0x13: // PrintableString
+                case 0x0C: // UTF8String
+                case 0x16: // IA5String
+                {
+                    _rdn.second = escapeX509Name(parseUTF8String());
+                    break;
+                }
+                case 0x30: // SEQUENCE
+                case 0x31: // SET
+                {
+                    int length = parseLength(0);
+                    _next = _p + length;
+                    if(_next > _data + _length)
+                    {
+                        throw CertificateEncodingException(__FILE__, __LINE__, "invalid length");
+                    }
+                    break;
+                }
+                default:
+                {
+                    // Unsupported tag, skip the SET.
+                    if(!_next)
+                    {
+                        return rdns;
+                    }
+                    _p = _next;
+                    _next = 0;
+                    break;
+                }
+            }
+            if(_p == _next)
+            {
+                rdns.push_back(_rdn);
+            }
+        }
+        return rdns;
+    }
+
+    string
+    parseOID()
+    {
+        int length = parseLength(1);
+        ostringstream oid;
+        unsigned char c = parseByte();
+        oid << c / 40 << "." << c % 40;
+        while(--length > 0)
+        {
+            if((*_p & 0x80) == 0)
+            {
+                oid << "." << static_cast<int>(parseByte());
+            }
+            else
+            {
+                uint64_t result = (uint64_t)(*_p & 127);
+                while(parseByte() & 128)
+                {
+                    result = (result << 7) | (uint64_t)(*_p & 127);
+                    --length;
+                }
+                oid << "." << result;
+            }
+        }
+        return certificateOIDAlias(oid.str());
+    }
+
+    string
+    parseUTF8String()
+    {
+        int length = parseLength(0);
+        string v(reinterpret_cast<const char*>(_p), length);
+        _p += length;
+        return v;
+    }
+
+    int
+    parseLength(int required)
+    {
+        int length = 0;
+        if((*_p & 0x80) == 0)
+        {
+            length = static_cast<int>(parseByte());
+        }
+        else
+        {
+            int nbytes = static_cast<int>(parseByte());
+            for(int i = 0; i < nbytes; ++i)
+            {
+                length = length * 256 + parseByte();
+            }
+        }
+        if((required > 0 && length < required) || (_p + length > _data + _length))
+        {
+            throw CertificateEncodingException(__FILE__, __LINE__, "invalid length");
+        }
+        return length;
+    }
+
+    unsigned char
+    parseByte()
+    {
+        if(_p >= _data + _length)
+        {
+            throw CertificateEncodingException(__FILE__, __LINE__, "invalid length");
+        }
+        unsigned char b = *_p++;
+        return b;
+    }
+
+private:
+
+    const unsigned char* _data;
+    const size_t _length;
+    const unsigned char* _p;
+    const unsigned char* _next;
+    pair<string, string> _rdn;
+    list<pair<string, string> > _rdns;
+};
+#endif
+
+#elif defined(ICE_USE_SCHANNEL) || defined(ICE_OS_WINRT)
+
+const Ice::Long TICKS_PER_MSECOND = 10000LL;
+const Ice::Long MSECS_TO_EPOCH = 11644473600000LL;
+
+#if defined(ICE_USE_SCHANNEL)
 void
 loadCertificate(PCERT_SIGNED_CONTENT_INFO* cert, const char* buffer, DWORD length)
 {
@@ -296,9 +446,6 @@ loadCertificate(PCERT_SIGNED_CONTENT_INFO* cert, const string& file)
     loadCertificate(cert, &buffer[0], static_cast<DWORD>(buffer.size()));
 }
 
-const Ice::Long TICKS_PER_MSECOND = 10000LL;
-const Ice::Long MSECS_TO_EPOCH = 11644473600000LL;
-
 IceUtil::Time
 filetimeToTime(FILETIME ftime)
 {
@@ -421,6 +568,32 @@ certificateAltNames(CERT_INFO* certInfo, LPCSTR altNameOID)
     }
     return altNames;
 }
+#else
+
+vector<pair<int, string> >
+certificateAltNames(Windows::Security::Cryptography::Certificates::SubjectAlternativeNameInfo^ subAltNames)
+{
+    vector<pair<int, string> > altNames;
+    for (auto iter = subAltNames->EmailName->First(); iter->HasCurrent; iter->MoveNext())
+    {
+        altNames.push_back(make_pair(AltNameEmail, IceUtil::wstringToString(iter->Current->Data())));
+    }
+    for (auto iter = subAltNames->DnsName->First(); iter->HasCurrent; iter->MoveNext())
+    {
+        altNames.push_back(make_pair(AltNameDNS, IceUtil::wstringToString(iter->Current->Data())));
+    }
+    for (auto iter = subAltNames->Url->First(); iter->HasCurrent; iter->MoveNext())
+    {
+        altNames.push_back(make_pair(AltNameURL, IceUtil::wstringToString(iter->Current->Data())));
+    }
+    for (auto iter = subAltNames->IPAddress->First(); iter->HasCurrent; iter->MoveNext())
+    {
+        altNames.push_back(make_pair(AltNAmeIP, IceUtil::wstringToString(iter->Current->Data())));
+    }
+    return altNames;
+}
+#endif
+
 #endif
 
 CertificateReadException::CertificateReadException(const char* file, int line, const string& r) :
@@ -429,21 +602,25 @@ CertificateReadException::CertificateReadException(const char* file, int line, c
 {
 }
 
+#ifndef ICE_CPP11_COMPILER
 CertificateReadException::~CertificateReadException() throw()
 {
 }
+#endif
 
 string
-CertificateReadException::ice_name() const
+CertificateReadException::ice_id() const
 {
-    return _name;
+    return "::IceSSL::CertificateReadException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 CertificateReadException*
 CertificateReadException::ice_clone() const
 {
     return new CertificateReadException(*this);
 }
+#endif
 
 void
 CertificateReadException::ice_throw() const
@@ -451,8 +628,6 @@ CertificateReadException::ice_throw() const
     throw *this;
 }
 
-const char* IceSSL::CertificateEncodingException::_name = "IceSSL::CertificateEncodingException";
-
 #ifdef ICE_USE_SECURE_TRANSPORT
 CertificateEncodingException::CertificateEncodingException(const char* file, int line, CFErrorRef err) :
     Exception(file, line)
@@ -469,21 +644,25 @@ CertificateEncodingException::CertificateEncodingException(const char* file, int
 {
 }
 
+#ifndef ICE_CPP11_COMPILER
 CertificateEncodingException::~CertificateEncodingException() throw()
 {
 }
+#endif
 
 string
-CertificateEncodingException::ice_name() const
+CertificateEncodingException::ice_id() const
 {
-    return _name;
+    return "::IceSSL::CertificateEncodingException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 CertificateEncodingException*
 CertificateEncodingException::ice_clone() const
 {
     return new CertificateEncodingException(*this);
 }
+#endif
 
 void
 CertificateEncodingException::ice_throw() const
@@ -663,29 +842,31 @@ convertGeneralNames(GENERAL_NAMES* gens)
 }
 #endif
 
-const char* ParseException::_name = "IceSSL::ParseException";
-
 ParseException::ParseException(const char* file, int line, const string& r) :
     Exception(file, line),
     reason(r)
 {
 }
 
+#ifndef ICE_CPP11_COMPILER
 ParseException::~ParseException() throw()
 {
 }
+#endif
 
 string
-ParseException::ice_name() const
+ParseException::ice_id() const
 {
-    return _name;
+    return "::IceSSL::ParseException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 ParseException*
 ParseException::ice_clone() const
 {
     return new ParseException(*this);
 }
+#endif
 
 void
 ParseException::ice_throw() const
@@ -694,21 +875,25 @@ ParseException::ice_throw() const
 }
 
 #ifdef ICE_USE_OPENSSL
-DistinguishedName::DistinguishedName(X509NAME* name) :
-    _rdns(RFC2253::parseStrict(convertX509NameToString(name)))
+DistinguishedName::DistinguishedName(X509NAME* name) : _rdns(RFC2253::parseStrict(convertX509NameToString(name)))
 {
     unescape();
 }
 #endif
 
-DistinguishedName::DistinguishedName(const string& dn) :
-    _rdns(RFC2253::parseStrict(dn))
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+DistinguishedName::DistinguishedName(CFDataRef data) : _rdns(ASN1Parser(data).parse())
 {
     unescape();
 }
+#endif
 
-DistinguishedName::DistinguishedName(const list<pair<string, string> >& rdns) :
-    _rdns(rdns)
+DistinguishedName::DistinguishedName(const string& dn) : _rdns(RFC2253::parseStrict(dn))
+{
+    unescape();
+}
+
+DistinguishedName::DistinguishedName(const list<pair<string, string> >& rdns) : _rdns(rdns)
 {
     unescape();
 }
@@ -804,7 +989,7 @@ PublicKey::~PublicKey()
     {
 #   if defined(ICE_USE_SECURE_TRANSPORT)
         CFRelease(_key);
-#   else
+#   elif defined(ICE_USE_OPENSSL)
         EVP_PKEY_free(_key);
 #   endif
     }
@@ -821,9 +1006,6 @@ PublicKey::key() const
 // The caller is responsible for incrementing the reference count.
 //
 Certificate::Certificate(X509CertificateRef cert) : _cert(cert)
-#ifdef ICE_USE_SCHANNEL
-    , _certInfo(0)
-#endif
 {
     if(!_cert)
     {
@@ -831,6 +1013,7 @@ Certificate::Certificate(X509CertificateRef cert) : _cert(cert)
     }
 
 #ifdef ICE_USE_SCHANNEL
+    _certInfo = 0;
     try
     {
         //
@@ -850,13 +1033,28 @@ Certificate::Certificate(X509CertificateRef cert) : _cert(cert)
         throw;
     }
 #endif
+
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+    _subject = NULL;
+    _issuer = NULL;
+#endif
 }
 
 Certificate::~Certificate()
 {
     if(_cert)
     {
-#if defined(ICE_USE_SECURE_TRANSPORT)
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+        if(_subject)
+        {
+            CFRelease(_subject);
+        }
+        if(_issuer)
+        {
+            CFRelease(_issuer);
+        }
+        CFRelease(_cert);
+#elif defined(ICE_USE_SECURE_TRANSPORT_MACOS)
         CFRelease(_cert);
 #elif defined(ICE_USE_SCHANNEL)
         LocalFree(_cert);
@@ -864,7 +1062,7 @@ Certificate::~Certificate()
         {
             LocalFree(_certInfo);
         }
-#else
+#elif defined(ICE_USE_OPENSSL)
         X509_free(_cert);
 #endif
     }
@@ -874,12 +1072,20 @@ CertificatePtr
 Certificate::load(const string& file)
 {
 #if defined(ICE_USE_SECURE_TRANSPORT)
-    return new Certificate(loadCertificate(file));
+    string resolved;
+    if(checkPath(file, "", false, resolved))
+    {
+        return ICE_MAKE_SHARED(Certificate, loadCertificate(resolved));
+    }
+    else
+    {
+        throw CertificateReadException(__FILE__, __LINE__, "error opening file " + file);
+    }
 #elif defined(ICE_USE_SCHANNEL)
     CERT_SIGNED_CONTENT_INFO* cert;
     loadCertificate(&cert, file);
-    return new Certificate(cert);
-#else
+    return ICE_MAKE_SHARED(Certificate, cert);
+#elif defined(ICE_USE_OPENSSL)
     BIO *cert = BIO_new(BIO_s_file());
     if(BIO_read_filename(cert, file.c_str()) <= 0)
     {
@@ -894,17 +1100,46 @@ Certificate::load(const string& file)
         throw CertificateReadException(__FILE__, __LINE__, "error reading file:\n" + getSslErrors(false));
     }
     BIO_free(cert);
-    return new Certificate(x);
+    return ICE_MAKE_SHARED(Certificate, x);
+#elif defined(ICE_OS_WINRT)
+    // TODO
+    return ICE_NULLPTR;
+#else
+#   error "Unknown platform"
 #endif
 }
 
 CertificatePtr
 Certificate::decode(const string& encoding)
 {
-#if defined(ICE_USE_SECURE_TRANSPORT)
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+    string::size_type size, startpos, endpos = 0;
+    startpos = encoding.find("-----BEGIN CERTIFICATE-----", endpos);
+    if(startpos != string::npos)
+    {
+        startpos += sizeof("-----BEGIN CERTIFICATE-----");
+        endpos = encoding.find("-----END CERTIFICATE-----", startpos);
+        size = endpos - startpos;
+    }
+    else
+    {
+        startpos = 0;
+        endpos = string::npos;
+        size = encoding.size();
+    }
+
+    vector<unsigned char> data(IceInternal::Base64::decode(string(&encoding[startpos], size)));
+    UniqueRef<CFDataRef> certdata(CFDataCreate(kCFAllocatorDefault, &data[0], data.size()));
+    SecCertificateRef cert = SecCertificateCreateWithData(0, certdata.get());
+    if(!cert)
+    {
+        assert(false);
+        throw CertificateEncodingException(__FILE__, __LINE__, "certificate is not a valid PEM-encoded certificate");
+    }
+    return ICE_MAKE_SHARED(Certificate, cert);
+#elif defined(ICE_USE_SECURE_TRANSPORT_MACOS)
     CFDataRef data = CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(encoding.c_str()),
                                                  encoding.size(), kCFAllocatorNull);
-
     SecExternalFormat format = kSecFormatUnknown;
     SecExternalItemType type = kSecItemTypeCertificate;
 
@@ -923,14 +1158,13 @@ Certificate::decode(const string& encoding)
     SecKeychainItemRef item = (SecKeychainItemRef)CFArrayGetValueAtIndex(items, 0);
     CFRetain(item);
     CFRelease(items);
-
     assert(SecCertificateGetTypeID() == CFGetTypeID(item));
-    return new Certificate((SecCertificateRef)item);
+    return ICE_MAKE_SHARED(Certificate, (SecCertificateRef)item);
 #elif defined(ICE_USE_SCHANNEL)
     CERT_SIGNED_CONTENT_INFO* cert;
     loadCertificate(&cert, encoding.c_str(), static_cast<DWORD>(encoding.size()));
-    return new Certificate(cert);
-#else
+    return ICE_MAKE_SHARED(Certificate, cert);
+#elif defined(ICE_USE_OPENSSL)
     BIO *cert = BIO_new_mem_buf(static_cast<void*>(const_cast<char*>(&encoding[0])), static_cast<int>(encoding.size()));
     X509CertificateRef x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL);
     if(x == NULL)
@@ -939,7 +1173,12 @@ Certificate::decode(const string& encoding)
         throw CertificateEncodingException(__FILE__, __LINE__, getSslErrors(false));
     }
     BIO_free(cert);
-    return new Certificate(x);
+    return ICE_MAKE_SHARED(Certificate, x);
+#elif defined(ICE_OS_WINRT)
+    // TODO
+    return ICE_NULLPTR;
+#else
+#   error "Unknown platform"
 #endif
 }
 
@@ -950,38 +1189,42 @@ Certificate::operator==(const Certificate& other) const
     return CFEqual(_cert, other._cert);
 #elif defined(ICE_USE_SCHANNEL)
     return CertCompareCertificate(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, _certInfo, other._certInfo);
-#else
+#elif defined(ICE_USE_OPENSSL)
     return X509_cmp(_cert, other._cert) == 0;
+#elif defined(ICE_OS_WINRT)
+    return _cert->Equals(other._cert);
+#else
+#   error "Unknown platform"
 #endif
 }
 
 bool
 Certificate::operator!=(const Certificate& other) const
 {
-#if defined(ICE_USE_SECURE_TRANSPORT)
-    return !CFEqual(_cert, other._cert);
-#elif defined(ICE_USE_SCHANNEL)
-    return !CertCompareCertificate(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, _certInfo, other._certInfo);
-#else
-    return X509_cmp(_cert, other._cert) != 0;
-#endif
+    return !operator==(other);
 }
 
 PublicKeyPtr
 Certificate::getPublicKey() const
 {
-#if defined(ICE_USE_SECURE_TRANSPORT)
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+    return ICE_NULLPTR; // Not supported
+#elif defined(ICE_USE_SECURE_TRANSPORT_MACOS)
     SecKeyRef key;
     OSStatus err = SecCertificateCopyPublicKey(_cert, &key);
     if(err)
     {
         throw CertificateEncodingException(__FILE__, __LINE__, errorToString(err));
     }
-    return new PublicKey(const_cast<Certificate*>(this), key);
+    return ICE_MAKE_SHARED(PublicKey, shared_from_this(), key);
 #elif defined(ICE_USE_SCHANNEL)
-    return new PublicKey(const_cast<Certificate*>(this), &_certInfo->SubjectPublicKeyInfo);
+    return ICE_MAKE_SHARED(PublicKey, shared_from_this(), &_certInfo->SubjectPublicKeyInfo);
+#elif defined(ICE_USE_OPENSSL)
+    return ICE_MAKE_SHARED(PublicKey, shared_from_this(), X509_get_pubkey(_cert));
+#elif defined(ICE_OS_WINRT)
+    return ICE_NULLPTR; // Not supported
 #else
-    return new PublicKey(const_cast<Certificate*>(this), X509_get_pubkey(_cert));
+#   error "Unknown platform"
 #endif
 }
 
@@ -990,17 +1233,20 @@ Certificate::verify(const CertificatePtr& cert) const
 {
 #if defined(ICE_USE_SECURE_TRANSPORT)
     //
-    // We first check if the given certificate subject match
-    // our certificate issuer. Otherwhise when use SecTrustEvaluate
-    // and check a certificate against itself will always return
-    // that is valid.
+    // We first check if the given certificate subject match our certificate
+    // issuer. Otherwhise when checking a certificate against itself
+    // SecTrustEvaluate always returns it is valid.
     //
     bool valid = false;
 
-    CFErrorRef error = 0;
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+    initializeAttributes();
+    cert->initializeAttributes();
+    valid = CFEqual(_issuer, cert->_subject);
+#else
     CFDataRef issuer = 0;
     CFDataRef subject = 0;
-
+    CFErrorRef error = 0;
     try
     {
         issuer = SecCertificateCopyNormalizedIssuerContent(_cert, &error);
@@ -1036,7 +1282,7 @@ Certificate::verify(const CertificatePtr& cert) const
 
     CFRelease(issuer);
     CFRelease(subject);
-
+#endif
     if(valid)
     {
         SecPolicyRef policy = 0;
@@ -1101,8 +1347,12 @@ Certificate::verify(const CertificatePtr& cert) const
     bool result = CryptVerifyCertificateSignature(0, X509_ASN_ENCODING, buffer, length, cert->getPublicKey()->key());
     LocalFree(buffer);
     return result;
-#else
+#elif defined(ICE_USE_OPENSSL)
     return X509_verify(_cert, cert->getPublicKey()->key()) > 0;
+#elif defined(ICE_OS_WINRT)
+    return false;
+#else
+#   error "Unknown platform"
 #endif
 }
 
@@ -1117,7 +1367,15 @@ Certificate::verify(const PublicKeyPtr& key) const
 string
 Certificate::encode() const
 {
-#if defined(ICE_USE_SECURE_TRANSPORT)
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+    UniqueRef<CFDataRef> c(SecCertificateCopyData(_cert));
+    vector<unsigned char> data(CFDataGetBytePtr(c.get()), CFDataGetBytePtr(c.get()) + CFDataGetLength(c.get()));
+    ostringstream os;
+    os << "-----BEGIN CERTIFICATE-----\n";
+    os << IceInternal::Base64::encode(data);
+    os << "-----END CERTIFICATE-----\n";
+    return os.str();
+#elif defined(ICE_USE_SECURE_TRANSPORT_MACOS)
     CFDataRef exported;
     OSStatus err = SecItemExport(_cert, kSecFormatPEMSequence, kSecItemPemArmour, 0, &exported);
     if(err != noErr)
@@ -1164,7 +1422,7 @@ Certificate::encode() const
         throw;
     }
     return s;
-#else
+#elif defined(ICE_USE_OPENSSL)
     BIO* out = BIO_new(BIO_s_mem());
     int i = PEM_write_bio_X509_AUX(out, _cert);
     if(i <= 0)
@@ -1177,9 +1435,25 @@ Certificate::encode() const
     string result = string(p->data, p->length);
     BIO_free(out);
     return result;
+#elif defined(ICE_OS_WINRT)
+    auto reader = Windows::Storage::Streams::DataReader::FromBuffer(_cert->GetCertificateBlob());
+    std::vector<unsigned char> data(reader->UnconsumedBufferLength);
+    if (!data.empty())
+    {
+        reader->ReadBytes(Platform::ArrayReference<unsigned char>(&data[0], static_cast<unsigned int>(data.size())));
+    }
+    ostringstream os;
+    os << "-----BEGIN CERTIFICATE-----\n";
+    os << IceInternal::Base64::encode(data);
+    os << "-----END CERTIFICATE-----\n";
+    return os.str();
+#else
+#   error "Unknown platform"
 #endif
 }
 
+#if !defined(ICE_USE_SECURE_TRANSPORT_IOS)
+
 bool
 Certificate::checkValidity() const
 {
@@ -1200,8 +1474,13 @@ Certificate::getNotAfter() const
     return getX509Date(_cert, kSecOIDX509V1ValidityNotAfter);
 #elif defined(ICE_USE_SCHANNEL)
     return filetimeToTime(_certInfo->NotAfter);
-#else
+#elif defined(ICE_USE_OPENSSL)
     return ASMUtcTimeToIceUtilTime(X509_get_notAfter(_cert));
+#elif defined(ICE_OS_WINRT)
+    // Convert 100ns time from January 1, 1601 to ms from January 1, 1970
+    return IceUtil::Time::milliSeconds(_cert->ValidTo.UniversalTime / TICKS_PER_MSECOND - MSECS_TO_EPOCH);
+#else
+#   error "Unknown platform"
 #endif
 }
 
@@ -1212,15 +1491,25 @@ Certificate::getNotBefore() const
     return getX509Date(_cert, kSecOIDX509V1ValidityNotBefore);
 #elif defined(ICE_USE_SCHANNEL)
     return filetimeToTime(_certInfo->NotBefore);
-#else
+#elif defined(ICE_USE_OPENSSL)
     return ASMUtcTimeToIceUtilTime(X509_get_notBefore(_cert));
+#elif defined(ICE_OS_WINRT)
+    // Convert 100ns time from January 1, 1601 to ms from January 1, 1970
+    return IceUtil::Time::milliSeconds(_cert->ValidFrom.UniversalTime / TICKS_PER_MSECOND - MSECS_TO_EPOCH);
+#else
+#   error "Unknown platform"
 #endif
 }
 
+#endif
+
 string
 Certificate::getSerialNumber() const
 {
-#if defined(ICE_USE_SECURE_TRANSPORT)
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+    initializeAttributes();
+    return _serial;
+#elif defined(ICE_USE_SECURE_TRANSPORT_MACOS)
     return getX509String(_cert, kSecOIDX509V1SerialNumber);
 #elif defined(ICE_USE_SCHANNEL)
     ostringstream os;
@@ -1229,14 +1518,14 @@ Certificate::getSerialNumber() const
         unsigned char c = _certInfo->SerialNumber.pbData[i];
         os.fill('0');
         os.width(2);
-        os << hex << (int)c;
+        os << hex << static_cast<int>(c);
         if(i)
         {
             os << ' ';
         }
     }
     return IceUtilInternal::toUpper(os.str());
-#else
+#elif defined(ICE_USE_OPENSSL)
     BIGNUM* bn = ASN1_INTEGER_to_BN(X509_get_serialNumber(_cert), 0);
     char* dec = BN_bn2dec(bn);
     string result = dec;
@@ -1244,31 +1533,40 @@ Certificate::getSerialNumber() const
     BN_free(bn);
 
     return result;
+#elif defined(ICE_OS_WINRT)
+    ostringstream os;
+    os.fill(0);
+    os.width(2);
+    for (unsigned int i = 0; i < _cert->SerialNumber->Length; i++)
+    {
+        os << hex << static_cast<int>(_cert->SerialNumber[i]);
+    }
+    return IceUtilInternal::toUpper(os.str());
+#else
+#   error "Unknown platform"
 #endif
 }
 
-//string
-//Certificate::getSigAlgName() const
-//{
-//}
-
-//string
-//Certificate::getSigAlgOID() const
-//{
-//}
-
 DistinguishedName
 Certificate::getIssuerDN() const
 {
-#if defined(ICE_USE_SECURE_TRANSPORT)
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+    initializeAttributes();
+    return _issuer ? DistinguishedName(_issuer) : DistinguishedName("");
+#elif defined(ICE_USE_SECURE_TRANSPORT_MACOS)
     return getX509Name(_cert, kSecOIDX509V1IssuerName);
 #elif defined(ICE_USE_SCHANNEL)
     return DistinguishedName(certNameToString(&_certInfo->Issuer));
-#else
+#elif defined(ICE_USE_OPENSSL)
     return DistinguishedName(RFC2253::parseStrict(convertX509NameToString(X509_get_issuer_name(_cert))));
+#elif defined(ICE_OS_WINRT)
+    return DistinguishedName(IceUtil::wstringToString(_cert->Issuer->Data()));
+#else
+#   error "Unknown platform"
 #endif
 }
 
+#if !defined(ICE_USE_SECURE_TRANSPORT_IOS)
 vector<pair<int, string> >
 Certificate::getIssuerAlternativeNames()
 {
@@ -1276,23 +1574,45 @@ Certificate::getIssuerAlternativeNames()
     return getX509AltName(_cert, kSecOIDIssuerAltName);
 #elif defined(ICE_USE_SCHANNEL)
     return certificateAltNames(_certInfo, szOID_ISSUER_ALT_NAME2);
-#else
+#elif defined(ICE_USE_OPENSSL)
     return convertGeneralNames(reinterpret_cast<GENERAL_NAMES*>(X509_get_ext_d2i(_cert, NID_issuer_alt_name, 0, 0)));
+#elif defined(ICE_OS_WINRT)
+    return vector<pair<int, string> >(); // Not supported
+#else
+#   error "Unknown platform"
 #endif
 }
+#endif
 
 DistinguishedName
 Certificate::getSubjectDN() const
 {
-#if defined(ICE_USE_SECURE_TRANSPORT)
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+    initializeAttributes();
+    if(_subject)
+    {
+        return DistinguishedName(_subject);
+    }
+    else
+    {
+        string s = "CN=";
+        s += fromCFString(UniqueRef<CFStringRef>(SecCertificateCopySubjectSummary(_cert)).get());
+        return DistinguishedName(s);
+    }
+#elif defined(ICE_USE_SECURE_TRANSPORT_MACOS)
     return getX509Name(_cert, kSecOIDX509V1SubjectName);
 #elif defined(ICE_USE_SCHANNEL)
     return DistinguishedName(certNameToString(&_certInfo->Subject));
-#else
+#elif defined(ICE_USE_OPENSSL)
     return DistinguishedName(RFC2253::parseStrict(convertX509NameToString(X509_get_subject_name(_cert))));
+#elif defined(ICE_OS_WINRT)
+    return DistinguishedName(IceUtil::wstringToString(_cert->Subject->Data()));
+#else
+#   error "Unknown platform"
 #endif
 }
 
+#if !defined(ICE_USE_SECURE_TRANSPORT_IOS)
 vector<pair<int, string> >
 Certificate::getSubjectAlternativeNames()
 {
@@ -1300,20 +1620,32 @@ Certificate::getSubjectAlternativeNames()
     return getX509AltName(_cert, kSecOIDSubjectAltName);
 #elif defined(ICE_USE_SCHANNEL)
     return certificateAltNames(_certInfo, szOID_SUBJECT_ALT_NAME2);
-#else
+#elif defined(ICE_USE_OPENSSL)
     return convertGeneralNames(reinterpret_cast<GENERAL_NAMES*>(X509_get_ext_d2i(_cert, NID_subject_alt_name, 0, 0)));
+#elif defined(ICE_OS_WINRT)
+    return certificateAltNames(_cert->SubjectAlternativeName);
+#else
+#   error "Unknown platform"
 #endif
 }
+#endif
 
 int
 Certificate::getVersion() const
 {
-#if defined(ICE_USE_SECURE_TRANSPORT)
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+    initializeAttributes();
+    return _version;
+#elif defined(ICE_USE_SECURE_TRANSPORT_MACOS)
     return atoi(getX509String(_cert, kSecOIDX509V1Version).c_str()) - 1;
 #elif defined(ICE_USE_SCHANNEL)
     return _certInfo->dwVersion;
-#else
+#elif defined(ICE_USE_OPENSSL)
     return static_cast<int>(X509_get_version(_cert));
+#elif defined(ICE_OS_WINRT)
+    return -1; // Not supported
+#else
+#   error "Unknown platform"
 #endif
 }
 
@@ -1324,8 +1656,10 @@ Certificate::toString() const
     os << "serial: " << getSerialNumber() << "\n";
     os << "issuer: " << string(getIssuerDN()) << "\n";
     os << "subject: " << string(getSubjectDN()) << "\n";
+#if !defined(ICE_USE_SECURE_TRANSPORT_IOS)
     os << "notBefore: " << getNotBefore().toDateTime() << "\n";
     os << "notAfter: " << getNotAfter().toDateTime();
+#endif
     return os.str();
 }
 
@@ -1334,3 +1668,101 @@ Certificate::getCert() const
 {
     return _cert;
 }
+
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+
+namespace
+{
+
+IceUtil::Mutex* globalMutex = 0;
+
+class Init
+{
+public:
+
+    Init()
+    {
+        globalMutex = new IceUtil::Mutex;
+    }
+
+    ~Init()
+    {
+        delete globalMutex;
+        globalMutex = 0;
+    }
+};
+
+Init init;
+
+}
+
+void
+Certificate::initializeAttributes() const
+{
+    if(_subject)
+    {
+        return;
+    }
+
+    //
+    // We need to temporarily add the certificate to the keychain in order to
+    // retrieve its attributes. Unfortunately kSecMatchItemList doesn't work
+    // on iOS. We make sure only one thread adds/removes a cert at a time here.
+    //
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
+
+    CFMutableDictionaryRef query;
+
+    query = CFDictionaryCreateMutable(0, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+    CFDictionarySetValue(query, kSecValueRef, _cert);
+    CFDictionarySetValue(query, kSecReturnAttributes, kCFBooleanTrue);
+    CFDictionaryRef attributes;
+    OSStatus err;
+    if((err = SecItemAdd(query, (CFTypeRef*)&attributes)) == errSecDuplicateItem)
+    {
+        CFDictionarySetValue(query, kSecClass, kSecClassCertificate);
+        err = SecItemCopyMatching(query, (CFTypeRef*)&attributes);
+    }
+    else
+    {
+        CFRelease(query);
+        query = CFDictionaryCreateMutable(0, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+        CFDictionarySetValue(query, kSecClass, kSecClassCertificate);
+        CFDictionarySetValue(query, kSecValueRef, _cert);
+        err = SecItemDelete(query);
+    }
+    CFRelease(query);
+    if(err != noErr)
+    {
+        _subject = 0;
+        _issuer = 0;
+        return;
+    }
+
+    _subject = (CFDataRef)CFDictionaryGetValue(attributes, kSecAttrSubject);
+    _issuer = (CFDataRef)CFDictionaryGetValue(attributes, kSecAttrIssuer);
+    CFDataRef serial = (CFDataRef)CFDictionaryGetValue(attributes, kSecAttrSerialNumber);
+    ostringstream os;
+    for(int i = 0; i < CFDataGetLength(serial); ++i)
+    {
+        int c = static_cast<int>(CFDataGetBytePtr(serial)[i]);
+        if(i)
+        {
+            os << ' ';
+        }
+        os.fill('0');
+        os.width(2);
+        os << hex << c;
+    }
+    _serial = os.str();
+    CFNumberRef version = (CFNumberRef)CFDictionaryGetValue(attributes, kSecAttrCertificateType);
+    if(!CFNumberGetValue(version, kCFNumberIntType, &_version))
+    {
+        _version = -1;
+    }
+    CFRetain(_subject);
+    CFRetain(_issuer);
+
+    CFRelease(attributes);
+}
+#endif
diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp
index 51a79e1929f..532847ec0ed 100644
--- a/cpp/src/IceSSL/ConnectorI.cpp
+++ b/cpp/src/IceSSL/ConnectorI.cpp
@@ -13,6 +13,7 @@
 #include <IceSSL/OpenSSLTransceiverI.h>
 #include <IceSSL/SecureTransportTransceiverI.h>
 #include <IceSSL/SChannelTransceiverI.h>
+#include <IceSSL/WinRTTransceiverI.h>
 
 #include <IceSSL/EndpointI.h>
 #include <IceSSL/Util.h>
@@ -39,20 +40,19 @@ IceSSL::ConnectorI::connect()
         throw ex;
     }
 
-    IceInternal::StreamSocketPtr stream = new IceInternal::StreamSocket(_instance, _proxy, _addr, _sourceAddr);
-    return new TransceiverI(_instance, stream, _host, false);
+    return new TransceiverI(_instance, _delegate->connect(), _host, false);
 }
 
 Short
 IceSSL::ConnectorI::type() const
 {
-    return _instance->type();
+    return _delegate->type();
 }
 
 string
 IceSSL::ConnectorI::toString() const
 {
-    return IceInternal::addrToString(!_proxy ? _addr : _proxy->getAddress());
+    return _delegate->toString();
 }
 
 bool
@@ -64,22 +64,12 @@ IceSSL::ConnectorI::operator==(const IceInternal::Connector& r) const
         return false;
     }
 
-    if(IceInternal::compareAddress(_addr, p->_addr) != 0)
+    if(this == p)
     {
-        return false;
-    }
-
-    if(_timeout != p->_timeout)
-    {
-        return false;
-    }
-
-    if(IceInternal::compareAddress(_sourceAddr, p->_sourceAddr) != 0)
-    {
-        return false;
+        return true;
     }
 
-    if(_connectionId != p->_connectionId)
+    if(_delegate != p->_delegate)
     {
         return false;
     }
@@ -102,47 +92,25 @@ IceSSL::ConnectorI::operator<(const IceInternal::Connector& r) const
         return type() < r.type();
     }
 
-    if(_timeout < p->_timeout)
-    {
-        return true;
-    }
-    else if(p->_timeout < _timeout)
-    {
-        return false;
-    }
-
-    int rc = compareAddress(_sourceAddr, p->_sourceAddr);
-    if(rc < 0)
-    {
-        return true;
-    }
-    else if(rc > 0)
+    if(this == p)
     {
         return false;
     }
 
-    if(_connectionId < p->_connectionId)
+    if(_delegate < p->_delegate)
     {
         return true;
     }
-    else if(p->_connectionId < _connectionId)
+    else if(p->_delegate < _delegate)
     {
         return false;
     }
 
-    return IceInternal::compareAddress(_addr, p->_addr) == -1;
+    return false;
 }
 
-IceSSL::ConnectorI::ConnectorI(const InstancePtr& instance, const string& host, const IceInternal::Address& addr,
-                               const IceInternal::NetworkProxyPtr& proxy, const IceInternal::Address& sourceAddr,
-                               Ice::Int timeout, const string& connectionId) :
-    _instance(instance),
-    _host(host),
-    _addr(addr),
-    _proxy(proxy),
-    _sourceAddr(sourceAddr),
-    _timeout(timeout),
-    _connectionId(connectionId)
+IceSSL::ConnectorI::ConnectorI(const InstancePtr& instance, const IceInternal::ConnectorPtr& del, const string& h) :
+    _instance(instance), _delegate(del), _host(h)
 {
 }
 
diff --git a/cpp/src/IceSSL/ConnectorI.h b/cpp/src/IceSSL/ConnectorI.h
index 48a80fdebcc..e1434d97d1b 100644
--- a/cpp/src/IceSSL/ConnectorI.h
+++ b/cpp/src/IceSSL/ConnectorI.h
@@ -36,19 +36,13 @@ public:
 
 private:
 
-    ConnectorI(const InstancePtr&, const std::string&, const IceInternal::Address&,
-               const IceInternal::NetworkProxyPtr&, const IceInternal::Address&,
-               Ice::Int, const std::string&);
+    ConnectorI(const InstancePtr&, const IceInternal::ConnectorPtr&, const std::string&);
     virtual ~ConnectorI();
     friend class EndpointI;
 
     const InstancePtr _instance;
+    const IceInternal::ConnectorPtr _delegate;
     const std::string _host;
-    const IceInternal::Address _addr;
-    const IceInternal::NetworkProxyPtr _proxy;
-    const IceInternal::Address _sourceAddr;
-    const Ice::Int _timeout;
-    const std::string _connectionId;
 };
 
 }
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp
index 797ed95ac16..1615b12d05d 100644
--- a/cpp/src/IceSSL/EndpointI.cpp
+++ b/cpp/src/IceSSL/EndpointI.cpp
@@ -11,104 +11,141 @@
 #include <IceSSL/AcceptorI.h>
 #include <IceSSL/ConnectorI.h>
 #include <IceSSL/Instance.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/LocalException.h>
 #include <Ice/DefaultsAndOverrides.h>
 #include <Ice/Object.h>
 #include <Ice/HashUtil.h>
+#include <Ice/Comparable.h>
 
 using namespace std;
 using namespace Ice;
 using namespace IceSSL;
 
-IceUtil::Shared* IceSSL::upCast(EndpointI* p) { return p; }
+namespace
+{
 
-IceSSL::EndpointI::EndpointI(const InstancePtr& instance, const string& ho, Int po,
-                             const IceInternal::Address& sourceAddr, Int ti, const string& conId, bool co) :
-    IceInternal::IPEndpointI(instance, ho, po, sourceAddr, conId),
-    _instance(instance),
-    _timeout(ti),
-    _compress(co)
+Ice::IPEndpointInfoPtr
+getIPEndpointInfo(const Ice::EndpointInfoPtr& info)
 {
+    for(Ice::EndpointInfoPtr p = info; p; p = p->underlying)
+    {
+        Ice::IPEndpointInfoPtr ipInfo = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, p);
+        if(ipInfo)
+        {
+            return ipInfo;
+        }
+    }
+    return ICE_NULLPTR;
+}
+
 }
 
-IceSSL::EndpointI::EndpointI(const InstancePtr& instance) :
-    IceInternal::IPEndpointI(instance),
-    _instance(instance),
-    _timeout(instance->defaultTimeout()),
-    _compress(false)
+#ifndef ICE_CPP11_MAPPING
+IceUtil::Shared* IceSSL::upCast(EndpointI* p) { return p; }
+#endif
+
+IceSSL::EndpointI::EndpointI(const InstancePtr& instance, const IceInternal::EndpointIPtr& del) :
+    _instance(instance), _delegate(del)
 {
 }
 
-IceSSL::EndpointI::EndpointI(const InstancePtr& instance, IceInternal::BasicStream* s) :
-    IPEndpointI(instance, s),
-    _instance(instance),
-    _timeout(-1),
-    _compress(false)
+void
+IceSSL::EndpointI::streamWriteImpl(Ice::OutputStream* stream) const
 {
-    s->read(const_cast<Int&>(_timeout));
-    s->read(const_cast<bool&>(_compress));
+    _delegate->streamWriteImpl(stream);
 }
 
 Ice::EndpointInfoPtr
 IceSSL::EndpointI::getInfo() const
 {
-    EndpointInfoPtr info = new IceInternal::InfoI<EndpointInfo>(const_cast<EndpointI*>(this));
-    fillEndpointInfo(info.get());
+    EndpointInfoPtr info = ICE_MAKE_SHARED(IceInternal::InfoI<EndpointInfo>, shared_from_this());
+    info->underlying = _delegate->getInfo();
+    info->compress = info->underlying->compress;
+    info->timeout = info->underlying->timeout;
     return info;
 }
 
-Ice::EndpointInfoPtr
-IceSSL::EndpointI::getWSInfo(const string& resource) const
+Ice::Short
+IceSSL::EndpointI::type() const
 {
-    WSSEndpointInfoPtr info = new IceInternal::InfoI<WSSEndpointInfo>(const_cast<EndpointI*>(this));
-    fillEndpointInfo(info.get());
-    info->resource = resource;
-    return info;
+    return _delegate->type();
+}
+
+const std::string&
+IceSSL::EndpointI::protocol() const
+{
+    return _delegate->protocol();
 }
 
 Int
 IceSSL::EndpointI::timeout() const
 {
-    return _timeout;
+    return _delegate->timeout();
 }
 
 IceInternal::EndpointIPtr
 IceSSL::EndpointI::timeout(Int timeout) const
 {
-    if(timeout == _timeout)
+    if(timeout == _delegate->timeout())
     {
-        return const_cast<EndpointI*>(this);
+        return shared_from_this();
     }
     else
     {
-        return new EndpointI(_instance, _host, _port, _sourceAddr, timeout, _connectionId, _compress);
+        return ICE_MAKE_SHARED(EndpointI, _instance, _delegate->timeout(timeout));
+    }
+}
+
+const string&
+IceSSL::EndpointI::connectionId() const
+{
+    return _delegate->connectionId();
+}
+
+IceInternal::EndpointIPtr
+IceSSL::EndpointI::connectionId(const string& connectionId) const
+{
+    if(connectionId == _delegate->connectionId())
+    {
+        return shared_from_this();
+    }
+    else
+    {
+        return ICE_MAKE_SHARED(EndpointI, _instance, _delegate->connectionId(connectionId));
     }
 }
 
 bool
 IceSSL::EndpointI::compress() const
 {
-    return _compress;
+    return _delegate->compress();
 }
 
 IceInternal::EndpointIPtr
 IceSSL::EndpointI::compress(bool compress) const
 {
-    if(compress == _compress)
+    if(compress == _delegate->compress())
     {
-        return const_cast<EndpointI*>(this);
+        return shared_from_this();
     }
     else
     {
-        return new EndpointI(_instance, _host, _port, _sourceAddr, _timeout, _connectionId, compress);
+        return ICE_MAKE_SHARED(EndpointI, _instance, _delegate->compress(compress));
     }
 }
 
 bool
 IceSSL::EndpointI::datagram() const
 {
-    return false;
+    return _delegate->datagram();
+}
+
+bool
+IceSSL::EndpointI::secure() const
+{
+    return _delegate->secure();
 }
 
 IceInternal::TransceiverPtr
@@ -117,56 +154,99 @@ IceSSL::EndpointI::transceiver() const
     return 0;
 }
 
+void
+IceSSL::EndpointI::connectors_async(Ice::EndpointSelectionType selType,
+                                    const IceInternal::EndpointI_connectorsPtr& callback) const
+{
+    class CallbackI : public IceInternal::EndpointI_connectors
+    {
+    public:
+
+        CallbackI(const IceInternal::EndpointI_connectorsPtr& callback, const InstancePtr& instance,
+                  const string& host) :
+            _callback(callback), _instance(instance), _host(host)
+        {
+        }
+
+        virtual void connectors(const vector<IceInternal::ConnectorPtr>& c)
+        {
+            vector<IceInternal::ConnectorPtr> connectors = c;
+            for(vector<IceInternal::ConnectorPtr>::iterator p = connectors.begin(); p != connectors.end(); ++p)
+            {
+                *p = new ConnectorI(_instance, *p, _host);
+            }
+            _callback->connectors(connectors);
+        }
+
+        virtual void exception(const Ice::LocalException& ex)
+        {
+            _callback->exception(ex);
+        }
+
+    private:
+
+        const IceInternal::EndpointI_connectorsPtr _callback;
+        const InstancePtr _instance;
+        const string _host;
+    };
+
+    IPEndpointInfoPtr info = getIPEndpointInfo(_delegate->getInfo());
+    _delegate->connectors_async(selType, ICE_MAKE_SHARED(CallbackI, callback, _instance, info ? info->host : string()));
+}
+
 IceInternal::AcceptorPtr
 IceSSL::EndpointI::acceptor(const string& adapterName) const
 {
-    return new AcceptorI(const_cast<EndpointI*>(this), _instance, adapterName, _host, _port);
+    return new AcceptorI(shared_from_this(), _instance, _delegate->acceptor(adapterName), adapterName);
 }
 
 EndpointIPtr
-IceSSL::EndpointI::endpoint(const AcceptorIPtr& acceptor) const
+IceSSL::EndpointI::endpoint(const IceInternal::EndpointIPtr& delEndp) const
 {
-    return new EndpointI(_instance, _host, acceptor->effectivePort(), _sourceAddr, _timeout, _connectionId, _compress);
+    return ICE_MAKE_SHARED(EndpointI, _instance, delEndp);
 }
 
-string
-IceSSL::EndpointI::options() const
+vector<IceInternal::EndpointIPtr>
+IceSSL::EndpointI::expand() const
 {
-    //
-    // WARNING: Certain features, such as proxy validation in Glacier2,
-    // depend on the format of proxy strings. Changes to toString() and
-    // methods called to generate parts of the reference string could break
-    // these features. Please review for all features that depend on the
-    // format of proxyToString() before changing this and related code.
-    //
-    ostringstream s;
-    s << IPEndpointI::options();
-
-    if(_timeout == -1)
+    vector<IceInternal::EndpointIPtr> endps = _delegate->expand();
+    for(vector<IceInternal::EndpointIPtr>::iterator p = endps.begin(); p != endps.end(); ++p)
     {
-        s << " -t infinite";
-    }
-    else
-    {
-        s << " -t " << _timeout;
+        *p = p->get() == _delegate.get() ? shared_from_this() : ICE_MAKE_SHARED(EndpointI, _instance, *p);
     }
+    return endps;
+}
 
-    if(_compress)
+bool
+IceSSL::EndpointI::equivalent(const IceInternal::EndpointIPtr& endpoint) const
+{
+    const EndpointI* endpointI = dynamic_cast<const EndpointI*>(endpoint.get());
+    if(!endpointI)
     {
-        s << " -z";
+        return false;
     }
+    return _delegate->equivalent(endpointI->_delegate);
+}
 
-    return s.str();
+Ice::Int
+IceSSL::EndpointI::hash() const
+{
+    return _delegate->hash();
+}
+
+string
+IceSSL::EndpointI::options() const
+{
+    return _delegate->options();
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceSSL::EndpointI::operator==(const Ice::Endpoint& r) const
+#else
 IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const
+#endif
 {
-    if(!IPEndpointI::operator==(r))
-    {
-        return false;
-    }
-
     const EndpointI* p = dynamic_cast<const EndpointI*>(&r);
     if(!p)
     {
@@ -178,12 +258,7 @@ IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const
         return true;
     }
 
-    if(_timeout != p->_timeout)
-    {
-        return false;
-    }
-
-    if(_compress != p->_compress)
+    if(!Ice::targetEquals(_delegate, p->_delegate))
     {
         return false;
     }
@@ -192,7 +267,11 @@ IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceSSL::EndpointI::operator<(const Ice::Endpoint& r) const
+#else
 IceSSL::EndpointI::operator<(const Ice::LocalObject& r) const
+#endif
 {
     const EndpointI* p = dynamic_cast<const EndpointI*>(&r);
     if(!p)
@@ -210,119 +289,27 @@ IceSSL::EndpointI::operator<(const Ice::LocalObject& r) const
         return false;
     }
 
-    if(_timeout < p->_timeout)
-    {
-        return true;
-    }
-    else if(p->_timeout < _timeout)
-    {
-        return false;
-    }
-
-    if(!_compress && p->_compress)
+    if(Ice::targetLess(_delegate, p->_delegate))
     {
         return true;
     }
-    else if(p->_compress < _compress)
+    else if (Ice::targetLess(p->_delegate, _delegate))
     {
         return false;
     }
 
-    return IPEndpointI::operator<(r);
-}
-
-void
-IceSSL::EndpointI::streamWriteImpl(IceInternal::BasicStream* s) const
-{
-    IPEndpointI::streamWriteImpl(s);
-    s->write(_timeout);
-    s->write(_compress);
-}
-
-void
-IceSSL::EndpointI::hashInit(Ice::Int& h) const
-{
-    IPEndpointI::hashInit(h);
-    IceInternal::hashAdd(h, _timeout);
-    IceInternal::hashAdd(h, _compress);
-}
-
-void
-IceSSL::EndpointI::fillEndpointInfo(IPEndpointInfo* info) const
-{
-    IPEndpointI::fillEndpointInfo(info);
-    info->timeout = _timeout;
-    info->compress = _compress;
+    return false;
 }
 
 bool
 IceSSL::EndpointI::checkOption(const string& option, const string& argument, const string& endpoint)
 {
-    if(IPEndpointI::checkOption(option, argument, endpoint))
-    {
-        return true;
-    }
-
-    switch(option[1])
-    {
-    case 't':
-    {
-        if(argument.empty())
-        {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "no argument provided for -t option in endpoint " + endpoint;
-            throw ex;
-        }
-
-        if(argument == "infinite")
-        {
-            const_cast<Int&>(_timeout) = -1;
-        }
-        else
-        {
-            istringstream t(argument);
-            if(!(t >> const_cast<Int&>(_timeout)) || !t.eof() || _timeout < 1)
-            {
-                EndpointParseException ex(__FILE__, __LINE__);
-                ex.str = "invalid timeout value `" + argument + "' in endpoint " + endpoint;
-                throw ex;
-            }
-        }
-        return true;
-    }
-
-    case 'z':
-    {
-        if(!argument.empty())
-        {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "unexpected argument `" + argument + "' provided for -z option in " + endpoint;
-            throw ex;
-        }
-        const_cast<bool&>(_compress) = true;
-        return true;
-    }
-
-    default:
-    {
-        return false;
-    }
-    }
-}
-
-IceInternal::ConnectorPtr
-IceSSL::EndpointI::createConnector(const IceInternal::Address& address, const IceInternal::NetworkProxyPtr& proxy) const
-{
-    return new ConnectorI(_instance, _host, address, proxy, _sourceAddr, _timeout, _connectionId);
-}
-
-IceInternal::IPEndpointIPtr
-IceSSL::EndpointI::createEndpoint(const string& host, int port, const string& connectionId) const
-{
-    return new EndpointI(_instance, host, port, _sourceAddr, _timeout, connectionId, _compress);
+    return false;
 }
 
-IceSSL::EndpointFactoryI::EndpointFactoryI(const InstancePtr& instance) : _instance(instance)
+IceSSL::EndpointFactoryI::EndpointFactoryI(const InstancePtr& instance,
+                                           const IceInternal::EndpointFactoryPtr& delegate) :
+    _instance(instance), _delegate(delegate)
 {
 }
 
@@ -345,25 +332,26 @@ IceSSL::EndpointFactoryI::protocol() const
 IceInternal::EndpointIPtr
 IceSSL::EndpointFactoryI::create(vector<string>& args, bool oaEndpoint) const
 {
-    IceInternal::IPEndpointIPtr endpt = new EndpointI(_instance);
-    endpt->initWithOptions(args, oaEndpoint);
-    return endpt;
+    return ICE_MAKE_SHARED(EndpointI, _instance, _delegate->create(args, oaEndpoint));
 }
 
 IceInternal::EndpointIPtr
-IceSSL::EndpointFactoryI::read(IceInternal::BasicStream* s) const
+IceSSL::EndpointFactoryI::read(Ice::InputStream* s) const
 {
-    return new EndpointI(_instance, s);
+    return ICE_MAKE_SHARED(EndpointI, _instance, _delegate->read(s));
 }
 
 void
 IceSSL::EndpointFactoryI::destroy()
 {
+    _delegate->destroy();
     _instance = 0;
 }
 
 IceInternal::EndpointFactoryPtr
-IceSSL::EndpointFactoryI::clone(const IceInternal::ProtocolInstancePtr& instance) const
+IceSSL::EndpointFactoryI::clone(const IceInternal::ProtocolInstancePtr& inst,
+                                const IceInternal::EndpointFactoryPtr& delegate) const
 {
-    return new EndpointFactoryI(new Instance(_instance->engine(), instance->type(), instance->protocol()));
+    InstancePtr instance = new Instance(_instance->engine(), inst->type(), inst->protocol());
+    return new EndpointFactoryI(instance, delegate ? delegate : _delegate->clone(instance, 0));
 }
diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h
index 85bc75b193e..fd122d7b146 100644
--- a/cpp/src/IceSSL/EndpointI.h
+++ b/cpp/src/IceSSL/EndpointI.h
@@ -10,9 +10,9 @@
 #ifndef ICE_SSL_ENDPOINT_I_H
 #define ICE_SSL_ENDPOINT_I_H
 
+#include <Ice/EndpointI.h>
 #include <Ice/IPEndpointI.h>
 #include <Ice/EndpointFactory.h>
-#include <Ice/WSEndpoint.h>
 #include <IceSSL/InstanceF.h>
 #include <IceSSL/EndpointInfo.h>
 #include <Ice/Network.h>
@@ -20,54 +20,57 @@
 namespace IceSSL
 {
 
-class EndpointI : public IceInternal::IPEndpointI, public IceInternal::WSEndpointDelegate
+class EndpointI : public IceInternal::EndpointI, public Ice::EnableSharedFromThis<EndpointI>
 {
 public:
 
-    EndpointI(const InstancePtr&, const std::string&, Ice::Int, const IceInternal::Address&, Ice::Int,
-              const std::string&, bool);
-    EndpointI(const InstancePtr&);
-    EndpointI(const InstancePtr&, IceInternal::BasicStream*);
+    EndpointI(const InstancePtr&, const IceInternal::EndpointIPtr&);
+
+    virtual void streamWriteImpl(Ice::OutputStream*) const;
 
     virtual Ice::EndpointInfoPtr getInfo() const;
-    virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const;
+    virtual Ice::Short type() const;
+    virtual const std::string& protocol() const;
 
     virtual Ice::Int timeout() const;
     virtual IceInternal::EndpointIPtr timeout(Ice::Int) const;
+    virtual const std::string& connectionId() const;
+    virtual IceInternal::EndpointIPtr connectionId(const ::std::string&) const;
     virtual bool compress() const;
     virtual IceInternal::EndpointIPtr compress(bool) const;
     virtual bool datagram() const;
+    virtual bool secure() const;
 
     virtual IceInternal::TransceiverPtr transceiver() const;
+    virtual void connectors_async(Ice::EndpointSelectionType, const IceInternal::EndpointI_connectorsPtr&) const;
     virtual IceInternal::AcceptorPtr acceptor(const std::string&) const;
+
+    virtual std::vector<IceInternal::EndpointIPtr> expand() const;
+    virtual bool equivalent(const IceInternal::EndpointIPtr&) const;
+    virtual ::Ice::Int hash() const;
     virtual std::string options() const;
 
+    EndpointIPtr endpoint(const IceInternal::EndpointIPtr&) const;
+
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const Ice::Endpoint&) const;
+    virtual bool operator<(const Ice::Endpoint&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
-
-    virtual EndpointIPtr endpoint(const AcceptorIPtr&) const;
-
-    using IceInternal::IPEndpointI::connectionId;
+#endif
 
 protected:
 
-    virtual void streamWriteImpl(IceInternal::BasicStream*) const;
-    virtual void hashInit(Ice::Int&) const;
-    virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const;
     virtual bool checkOption(const std::string&, const std::string&, const std::string&);
 
-    virtual IceInternal::ConnectorPtr createConnector(const IceInternal::Address&,
-                                                      const IceInternal::NetworkProxyPtr&) const;
-    virtual IceInternal::IPEndpointIPtr createEndpoint(const std::string&, int, const std::string&) const;
-
 private:
 
     //
     // All members are const, because endpoints are immutable.
     //
     const InstancePtr _instance;
-    const Ice::Int _timeout;
-    const bool _compress;
+    const IceInternal::EndpointIPtr _delegate;
 };
 
 class EndpointFactoryI : public IceInternal::EndpointFactory
@@ -79,17 +82,19 @@ public:
     virtual Ice::Short type() const;
     virtual std::string protocol() const;
     virtual IceInternal::EndpointIPtr create(std::vector<std::string>&, bool) const;
-    virtual IceInternal::EndpointIPtr read(IceInternal::BasicStream*) const;
+    virtual IceInternal::EndpointIPtr read(Ice::InputStream*) const;
     virtual void destroy();
 
-    virtual IceInternal::EndpointFactoryPtr clone(const IceInternal::ProtocolInstancePtr&) const;
+    virtual IceInternal::EndpointFactoryPtr clone(const IceInternal::ProtocolInstancePtr&,
+                                                  const IceInternal::EndpointFactoryPtr&) const;
 
 private:
 
-    EndpointFactoryI(const InstancePtr&);
+    EndpointFactoryI(const InstancePtr&, const IceInternal::EndpointFactoryPtr&);
     friend class PluginI;
 
     InstancePtr _instance;
+    const IceInternal::EndpointFactoryPtr _delegate;
 };
 
 }
diff --git a/cpp/src/IceSSL/IceSSL.rc b/cpp/src/IceSSL/IceSSL.rc
index 887344f64c2..401a0b72bad 100644
--- a/cpp/src/IceSSL/IceSSL.rc
+++ b/cpp/src/IceSSL/IceSSL.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icessl36d\0"
- #define ORIGINALFILENAME "icessl36d.dll\0"
+ #define INTERNALNAME "icessl37a2d\0"
+ #define ORIGINALFILENAME "icessl37a2d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icessl36\0"
- #define ORIGINALFILENAME "icessl36.dll\0"
+ #define INTERNALNAME "icessl37a2\0"
+ #define ORIGINALFILENAME "icessl37a2.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceSSL C++ Plug-in\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp
index b7f9ce3fdf4..e37ab14a967 100644
--- a/cpp/src/IceSSL/Instance.cpp
+++ b/cpp/src/IceSSL/Instance.cpp
@@ -7,13 +7,8 @@
 //
 // **********************************************************************
 
-#include <IceUtil/Config.h>
-#ifdef _WIN32
-#   include <winsock2.h>
-#endif
 #include <IceSSL/Instance.h>
 #include <IceSSL/SSLEngine.h>
-#include <Ice/Properties.h>
 
 using namespace std;
 using namespace Ice;
diff --git a/cpp/src/IceSSL/Instance.h b/cpp/src/IceSSL/Instance.h
index 6a4514de52b..d9a25482eb0 100644
--- a/cpp/src/IceSSL/Instance.h
+++ b/cpp/src/IceSSL/Instance.h
@@ -10,8 +10,8 @@
 #ifndef ICE_SSL_INSTANCE_H
 #define ICE_SSL_INSTANCE_H
 
-#include <IceSSL/InstanceF.h>
 #include <Ice/ProtocolInstance.h>
+#include <IceSSL/InstanceF.h>
 #include <IceSSL/SSLEngineF.h>
 
 namespace IceSSL
@@ -24,12 +24,12 @@ public:
     Instance(const SSLEnginePtr&, Ice::Short, const std::string&);
     virtual ~Instance();
 
-    SSLEnginePtr 
+    SSLEnginePtr
     engine() const
     {
         return _engine;
     }
-    
+
     bool initialized() const;
 
 private:
diff --git a/cpp/src/IceSSL/InstanceF.h b/cpp/src/IceSSL/InstanceF.h
index d5987534179..22ae1cf68e9 100644
--- a/cpp/src/IceSSL/InstanceF.h
+++ b/cpp/src/IceSSL/InstanceF.h
@@ -22,8 +22,12 @@ IceUtil::Shared* upCast(Instance*);
 typedef IceInternal::Handle<Instance> InstancePtr;
 
 class EndpointI;
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<EndpointI> EndpointIPtr;
+#else
 IceUtil::Shared* upCast(EndpointI*);
 typedef IceInternal::Handle<EndpointI> EndpointIPtr;
+#endif
 
 class AcceptorI;
 IceUtil::Shared* upCast(AcceptorI*);
diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile
deleted file mode 100644
index ab3b8222167..00000000000
--- a/cpp/src/IceSSL/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME	= $(call mklibfilename,IceSSL,$(VERSION))
-SONAME		= $(call mksoname,IceSSL,$(SOVERSION))
-LIBNAME		= $(call mklibname,IceSSL)
-
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-
-SLICE_OBJS	= ConnectionInfo.o \
-		  EndpointInfo.o
-
-OBJS		= AcceptorI.o \
-		  Certificate.o \
-		  ConnectorI.o \
-		  EndpointI.o \
-		  Instance.o \
-		  PluginI.o \
-		  RFC2253.o \
-		  SSLEngine.o \
-		  TrustManager.o \
-		  Util.o \
-		  $(SLICE_OBJS)
-
-ifneq ($(findstring MINGW,$(shell uname)),)
-OBJS		:= $(OBJS) \
-		   SChannelEngine.o \
-		   SChannelTransceiverI.o
-else
-ifeq ($(shell uname),Darwin)
-OBJS		:= $(OBJS) \
-		   SecureTransportEngine.o \
-		   SecureTransportTransceiverI.o
-else
-OBJS		:= $(OBJS) \
-		   OpenSSLEngine.o \
-		   OpenSSLTransceiverI.o
-endif
-endif
-
-HDIR		= $(headerdir)/IceSSL
-SDIR  		= $(slicedir)/IceSSL
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS		:= -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS $(OPENSSL_FLAGS)
-SLICE2CPPFLAGS	:= --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS)
-
-LINKWITH        := $(BZIP2_RPATH_LINK) $(OPENSSL_LIBS) -lIce -lIceUtil $(SSL_OS_LIBS) $(CXXLIBS)
-
-ifeq ($(STATICLIBS),yes)
-$(libdir)/$(LIBNAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mklib,$@,$(OBJS))
-else
-$(libdir)/$(LIBFILENAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	@mkdir -p $(libdir)$(cpp11libdirsuffix)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-endif
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak
deleted file mode 100644
index 8f386be9106..00000000000
--- a/cpp/src/IceSSL/Makefile.mak
+++ /dev/null
@@ -1,80 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME		= $(top_srcdir)\lib\icessl$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icessl$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-SLICE_OBJS	= .\ConnectionInfo.obj \
-                  .\EndpointInfo.obj
-
-OBJS		= $(SLICE_OBJS) \
-		  .\AcceptorI.obj \
-		  .\Certificate.obj \
-		  .\ConnectorI.obj \
-		  .\EndpointI.obj \
-		  .\Instance.obj \
-		  .\PluginI.obj \
-		  .\RFC2253.obj \
-		  .\SChannelEngine.obj \
-		  .\SChannelTransceiverI.obj \
-		  .\SSLEngine.obj \
-		  .\TrustManager.obj \
-		  .\Util.obj
-
-HDIR		= $(headerdir)\IceSSL
-SDIR		= $(slicedir)\IceSSL
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS -DWIN32_LEAN_AND_MEAN
-SLICE2CPPFLAGS	= --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS)
-
-LINKWITH	= $(LIBS) $(SSL_OS_LIBS) 
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS	= /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE	= IceSSL.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceSSL.res
-	$(LINK) $(BASE):0x24000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	-del /q ConnectionInfo.cpp $(HDIR)\ConnectionInfo.h
-	-del /q EndpointInfo.cpp $(HDIR)\EndpointInfo.h
-	-del /q IceSSL.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-
-info:
-	"$(SLICE2CPP)" $(SLICE2CPPFLAGS) $(SDIR)/ConnectionInfo.ice
-	move ConnectionInfo.h $(HDIR)
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/IceSSL/Makefile.mk b/cpp/src/IceSSL/Makefile.mk
new file mode 100644
index 00000000000..0e2e3d00e94
--- /dev/null
+++ b/cpp/src/IceSSL/Makefile.mk
@@ -0,0 +1,17 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries	:= IceSSL
+
+IceSSL_targetdir	:= $(libdir)
+IceSSL_dependencies	:= Ice
+IceSSL_cppflags  	:= -DICE_SSL_API_EXPORTS
+IceSSL_sliceflags	:= --include-dir IceSSL --dll-export ICE_SSL_API
+
+projects += $(project)
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
index d66c5eb2781..de7fbb3ade6 100644
--- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
@@ -79,16 +79,20 @@ IceSSL_opensslVerifyCallback(int ok, X509_STORE_CTX* ctx)
 IceInternal::NativeInfoPtr
 IceSSL::TransceiverI::getNativeInfo()
 {
-    return _stream;
+    return _delegate->getNativeInfo();
 }
 
 IceInternal::SocketOperation
-IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& writeBuffer, bool&)
+IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& writeBuffer)
 {
-    IceInternal::SocketOperation status = _stream->connect(readBuffer, writeBuffer);
-    if(status != IceInternal::SocketOperationNone)
+    if(!_connected)
     {
-        return status;
+        IceInternal::SocketOperation status = _delegate->initialize(readBuffer, writeBuffer);
+        if(status != IceInternal::SocketOperationNone)
+        {
+            return status;
+        }
+        _connected = true;
     }
 
     if(!_ssl)
@@ -96,7 +100,9 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B
         //
         // This static_cast is necessary due to 64bit windows. There SOCKET is a non-int type.
         //
-        BIO* bio = BIO_new_socket(static_cast<int>(_stream->fd()), 0);
+        SOCKET fd = _delegate->getNativeInfo()->fd();
+        assert(fd != INVALID_SOCKET); // Underlying transport must be SOCKET based.
+        BIO* bio = BIO_new_socket(static_cast<int>(fd), 0);
         if(!bio)
         {
             SecurityException ex(__FILE__, __LINE__);
@@ -231,15 +237,9 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B
             }
             case SSL_ERROR_SSL:
             {
-                IceInternal::Address remoteAddr;
-                string desc = "<not available>";
-                if(IceInternal::fdToRemoteAddress(_stream->fd(), remoteAddr))
-                {
-                    desc = IceInternal::addrToString(remoteAddr);
-                }
                 ostringstream ostr;
                 ostr << "SSL error occurred for new " << (_incoming ? "incoming" : "outgoing")
-                     << " connection:\nremote address = " << desc << "\n" << _engine->sslErrors();
+                     << " connection:\nremote address = " << _delegate->toString() << "\n" << _engine->sslErrors();
                 ProtocolException ex(__FILE__, __LINE__);
                 ex.reason = ostr.str();
                 throw ex;
@@ -278,8 +278,7 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B
     {
         _verified = true;
     }
-
-    _engine->verifyPeer(_stream->fd(), _host, NativeConnectionInfoPtr::dynamicCast(getInfo()));
+    _engine->verifyPeer(_host, ICE_DYNAMIC_CAST(NativeConnectionInfo, getInfo()), toString());
 
     if(_engine->securityTraceLevel() >= 1)
     {
@@ -308,7 +307,11 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B
 }
 
 IceInternal::SocketOperation
+#ifdef ICE_CPP11_MAPPING
+IceSSL::TransceiverI::closing(bool initiator, exception_ptr)
+#else
 IceSSL::TransceiverI::closing(bool initiator, const Ice::LocalException&)
+#endif
 {
     // If we are initiating the connection closure, wait for the peer
     // to close the TCP/IP connection. Otherwise, close immediately.
@@ -334,15 +337,15 @@ IceSSL::TransceiverI::close()
         _ssl = 0;
     }
 
-    _stream->close();
+    _delegate->close();
 }
 
 IceInternal::SocketOperation
 IceSSL::TransceiverI::write(IceInternal::Buffer& buf)
 {
-    if(!_stream->isConnected())
+    if(!_connected)
     {
-        return _stream->write(buf);
+        return _delegate->write(buf);
     }
 
     if(buf.i == buf.b.end())
@@ -440,16 +443,15 @@ IceSSL::TransceiverI::write(IceInternal::Buffer& buf)
 }
 
 IceInternal::SocketOperation
-IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool& hasMoreData)
+IceSSL::TransceiverI::read(IceInternal::Buffer& buf)
 {
-    if(!_stream->isConnected())
+    if(!_connected)
     {
-        return _stream->read(buf);
+        return _delegate->read(buf);
     }
 
     //
-    // Note: we don't set the hasMoreData flag in this implementation.
-    // We assume that OpenSSL doesn't read more SSL records than
+    // Note: We assume that OpenSSL doesn't read more SSL records than
     // necessary to fill the requested data and that the sender sends
     // Ice messages in individual SSL records.
     //
@@ -459,6 +461,8 @@ IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool& hasMoreData)
         return IceInternal::SocketOperationNone;
     }
 
+    _delegate->getNativeInfo()->ready(IceInternal::SocketOperationRead, false);
+
     //
     // It's impossible for packetSize to be more than an Int.
     //
@@ -549,9 +553,9 @@ IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool& hasMoreData)
     }
 
     //
-    // Check if there's still buffered data to read. In this case, set hasMoreData to true.
+    // Check if there's still buffered data to read, set the read ready status.
     //
-    hasMoreData = SSL_pending(_ssl) > 0;
+    _delegate->getNativeInfo()->ready(IceInternal::SocketOperationRead, SSL_pending(_ssl) > 0);
 
     return IceInternal::SocketOperationNone;
 }
@@ -565,7 +569,7 @@ IceSSL::TransceiverI::protocol() const
 string
 IceSSL::TransceiverI::toString() const
 {
-    return _stream->toString();
+    return _delegate->toString();
 }
 
 string
@@ -577,17 +581,20 @@ IceSSL::TransceiverI::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceSSL::TransceiverI::getInfo() const
 {
-    NativeConnectionInfoPtr info = new NativeConnectionInfo();
-    fillConnectionInfo(info, info->nativeCerts);
-    return info;
-}
-
-Ice::ConnectionInfoPtr
-IceSSL::TransceiverI::getWSInfo(const Ice::HeaderDict& headers) const
-{
-    WSSNativeConnectionInfoPtr info = new WSSNativeConnectionInfo();
-    fillConnectionInfo(info, info->nativeCerts);
-    info->headers = headers;
+    NativeConnectionInfoPtr info = ICE_MAKE_SHARED(NativeConnectionInfo);
+    info->underlying = _delegate->getInfo();
+    info->incoming = _incoming;
+    info->adapterName = _adapterName;
+    info->verified = _verified;
+    info->nativeCerts = _nativeCerts;
+    for(vector<CertificatePtr>::const_iterator p = _nativeCerts.begin(); p != _nativeCerts.end(); ++p)
+    {
+        info->certs.push_back((*p)->encode());
+    }
+    if(_ssl != 0)
+    {
+        info->cipher = SSL_get_cipher_name(_ssl); // Nothing needs to be free'd.
+    }
     return info;
 }
 
@@ -599,7 +606,7 @@ IceSSL::TransceiverI::checkSendSize(const IceInternal::Buffer&)
 void
 IceSSL::TransceiverI::setBufferSize(int rcvSize, int sndSize)
 {
-    _stream->setBufferSize(rcvSize, sndSize);
+    _delegate->setBufferSize(rcvSize, sndSize);
 }
 
 int
@@ -633,7 +640,7 @@ IceSSL::TransceiverI::verifyCallback(int ok, X509_STORE_CTX* c)
         _nativeCerts.clear();
         for(int i = 0; i < sk_X509_num(chain); ++i)
         {
-            _nativeCerts.push_back(new Certificate(X509_dup(sk_X509_value(chain, i))));
+            _nativeCerts.push_back(ICE_MAKE_SHARED(Certificate, X509_dup(sk_X509_value(chain, i))));
         }
         sk_X509_pop_free(chain, X509_free);
     }
@@ -647,14 +654,15 @@ IceSSL::TransceiverI::verifyCallback(int ok, X509_STORE_CTX* c)
     return 1;
 }
 
-IceSSL::TransceiverI::TransceiverI(const InstancePtr& instance, const IceInternal::StreamSocketPtr& stream,
+IceSSL::TransceiverI::TransceiverI(const InstancePtr& instance, const IceInternal::TransceiverPtr& delegate,
                                    const string& hostOrAdapterName, bool incoming) :
     _instance(instance),
     _engine(OpenSSLEnginePtr::dynamicCast(instance->engine())),
     _host(incoming ? "" : hostOrAdapterName),
     _adapterName(incoming ? hostOrAdapterName : ""),
     _incoming(incoming),
-    _stream(stream),
+    _delegate(delegate),
+    _connected(false),
     _verified(false),
     _ssl(0)
 {
@@ -664,30 +672,4 @@ IceSSL::TransceiverI::~TransceiverI()
 {
 }
 
-void
-IceSSL::TransceiverI::fillConnectionInfo(const ConnectionInfoPtr& info, std::vector<CertificatePtr>& nativeCerts) const
-{
-    IceInternal::fdToAddressAndPort(_stream->fd(), info->localAddress, info->localPort, info->remoteAddress,
-                                    info->remotePort);
-    if(_stream->fd() != INVALID_SOCKET)
-    {
-        info->rcvSize = IceInternal::getRecvBufferSize(_stream->fd());
-        info->sndSize = IceInternal::getSendBufferSize(_stream->fd());
-    }
-    info->adapterName = _adapterName;
-    info->incoming = _incoming;
-    info->verified = _verified;
-    nativeCerts = _nativeCerts;
-    for(vector<CertificatePtr>::const_iterator p = _nativeCerts.begin(); p != _nativeCerts.end(); ++p)
-    {
-        info->certs.push_back((*p)->encode());
-    }
-    if(_ssl != 0)
-    {
-        info->cipher = SSL_get_cipher_name(_ssl); // Nothing needs to be free'd.
-    }
-    info->adapterName = _adapterName;
-    info->incoming = _incoming;
-}
-
 #endif
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.h b/cpp/src/IceSSL/OpenSSLTransceiverI.h
index 7b82faccf9c..58459e804b9 100644
--- a/cpp/src/IceSSL/OpenSSLTransceiverI.h
+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.h
@@ -32,22 +32,25 @@ namespace IceSSL
 class ConnectorI;
 class AcceptorI;
 
-class TransceiverI : public IceInternal::Transceiver, public IceInternal::WSTransceiverDelegate
+class TransceiverI : public IceInternal::Transceiver
 {
 public:
 
     virtual IceInternal::NativeInfoPtr getNativeInfo();
 
-    virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&, bool&);
+    virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&);
+#ifdef ICE_CPP11_MAPPING
+    virtual IceInternal::SocketOperation closing(bool, std::exception_ptr);
+#else
     virtual IceInternal::SocketOperation closing(bool, const Ice::LocalException&);
+#endif
     virtual void close();
     virtual IceInternal::SocketOperation write(IceInternal::Buffer&);
-    virtual IceInternal::SocketOperation read(IceInternal::Buffer&, bool&);
+    virtual IceInternal::SocketOperation read(IceInternal::Buffer&);
     virtual std::string protocol() const;
     virtual std::string toString() const;
     virtual std::string toDetailedString() const;
     virtual Ice::ConnectionInfoPtr getInfo() const;
-    virtual Ice::ConnectionInfoPtr getWSInfo(const Ice::HeaderDict&) const;
     virtual void checkSendSize(const IceInternal::Buffer&);
     virtual void setBufferSize(int rcvSize, int sndSize);
 
@@ -55,11 +58,9 @@ public:
 
 private:
 
-    TransceiverI(const InstancePtr&, const IceInternal::StreamSocketPtr&, const std::string&, bool);
+    TransceiverI(const InstancePtr&, const IceInternal::TransceiverPtr&, const std::string&, bool);
     virtual ~TransceiverI();
 
-    void fillConnectionInfo(const ConnectionInfoPtr&, std::vector<CertificatePtr>&) const;
-
     friend class ConnectorI;
     friend class AcceptorI;
 
@@ -68,7 +69,8 @@ private:
     const std::string _host;
     const std::string _adapterName;
     const bool _incoming;
-    const IceInternal::StreamSocketPtr _stream;
+    const IceInternal::TransceiverPtr _delegate;
+    bool _connected;
     bool _verified;
     std::vector<CertificatePtr> _nativeCerts;
 
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index 7e9fb283783..2e3cbe10414 100644..100755
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -15,6 +15,7 @@
 #include <Ice/ProtocolPluginFacade.h>
 #include <Ice/ProtocolInstance.h>
 #include <Ice/LocalException.h>
+#include <Ice/RegisterPlugins.h>
 
 using namespace std;
 using namespace Ice;
@@ -23,17 +24,12 @@ using namespace IceSSL;
 //
 // Plug-in factory function.
 //
-extern "C"
-{
-
-ICE_SSL_API Ice::Plugin*
+extern "C" ICE_SSL_API Ice::Plugin*
 createIceSSL(const CommunicatorPtr& communicator, const string& /*name*/, const StringSeq& /*args*/)
 {
     return new PluginI(communicator);
 }
 
-}
-
 namespace Ice
 {
 
@@ -45,6 +41,35 @@ registerIceSSL(bool loadOnInitialize)
 
 }
 
+IceSSL::CertificateVerifier::~CertificateVerifier()
+{
+    // Out of line to avoid weak vtable
+}
+
+IceSSL::NativeConnectionInfo::~NativeConnectionInfo()
+{
+    // Out of line to avoid weak vtable
+}
+
+IceSSL::PasswordPrompt::~PasswordPrompt()
+{
+    // Out of line to avoid weak vtable
+}
+
+IceSSL::Plugin::~Plugin()
+{
+    // Out of line to avoid weak vtable
+}
+
+//
+// Objective-C function to allow Objective-C programs to register plugin.
+//
+extern "C" ICE_SSL_API void
+ICEregisterIceSSL(bool loadOnInitialize)
+{
+    Ice::registerIceSSL(loadOnInitialize);
+}
+
 //
 // Plugin implementation.
 //
@@ -54,6 +79,8 @@ IceSSL::PluginI::PluginI(const Ice::CommunicatorPtr& com)
     _engine = new SecureTransportEngine(com);
 #elif defined(ICE_USE_SCHANNEL)
     _engine = new SChannelEngine(com);
+#elif defined(ICE_OS_WINRT)
+    _engine = new WinRTEngine(com);
 #else
     _engine = new OpenSSLEngine(com);
 #endif
@@ -63,8 +90,31 @@ IceSSL::PluginI::PluginI(const Ice::CommunicatorPtr& com)
     // than in initialize, because the communicator may need to
     // interpret proxies before the plug-in is fully initialized.
     //
-    IceInternal::EndpointFactoryPtr sslFactory = new EndpointFactoryI(new Instance(_engine, EndpointType, "ssl"));
-    IceInternal::getProtocolPluginFacade(com)->addEndpointFactory(sslFactory);
+    IceInternal::ProtocolPluginFacadePtr pluginFacade = IceInternal::getProtocolPluginFacade(com);
+
+    // SSL based on TCP
+    IceInternal::EndpointFactoryPtr tcp = pluginFacade->getEndpointFactory(TCPEndpointType);
+    if(tcp)
+    {
+        InstancePtr instance = new Instance(_engine, SSLEndpointType, "ssl");
+        pluginFacade->addEndpointFactory(new EndpointFactoryI(instance, tcp->clone(instance, 0)));
+    }
+
+    // SSL based on Bluetooth
+    IceInternal::EndpointFactoryPtr bluetooth = pluginFacade->getEndpointFactory(BTEndpointType);
+    if(bluetooth)
+    {
+        InstancePtr instance = new Instance(_engine, BTSEndpointType, "bts");
+        pluginFacade->addEndpointFactory(new EndpointFactoryI(instance, bluetooth->clone(instance, 0)));
+    }
+
+    // SSL based on iAP
+    IceInternal::EndpointFactoryPtr iap = pluginFacade->getEndpointFactory(iAPEndpointType);
+    if(iap)
+    {
+        InstancePtr instance = new Instance(_engine, iAPSEndpointType, "iaps");
+        pluginFacade->addEndpointFactory(new EndpointFactoryI(instance, iap->clone(instance, 0)));
+    }
 }
 
 void
diff --git a/cpp/src/IceSSL/PluginI.h b/cpp/src/IceSSL/PluginI.h
index e0c5a48120b..ea0cf344ab4 100644
--- a/cpp/src/IceSSL/PluginI.h
+++ b/cpp/src/IceSSL/PluginI.h
@@ -46,6 +46,8 @@ private:
     SecureTransportEnginePtr _engine;
 #elif defined(ICE_USE_SCHANNEL)
     SChannelEnginePtr _engine;
+#elif defined(ICE_OS_WINRT)
+    WinRTEnginePtr _engine;
 #else
     OpenSSLEnginePtr _engine;
 #endif
diff --git a/cpp/src/IceSSL/RFC2253.cpp b/cpp/src/IceSSL/RFC2253.cpp
index 7b46682f3c2..e4c57add13a 100644
--- a/cpp/src/IceSSL/RFC2253.cpp
+++ b/cpp/src/IceSSL/RFC2253.cpp
@@ -271,7 +271,7 @@ parseAttributeType(const string& data, size_t& pos)
     //
     // Here we must also check for "oid." and "OID." before parsing
     // according to the ALPHA KEYCHAR* rule.
-    // 
+    //
     // First the OID case.
     //
     if(IceUtilInternal::isDigit(data[pos]) ||
@@ -318,7 +318,7 @@ parseAttributeType(const string& data, size_t& pos)
         result += data[pos];
         ++pos;
         // 1* KEYCHAR
-        while(pos < data.size() && 
+        while(pos < data.size() &&
               (IceUtilInternal::isAlpha(data[pos]) || IceUtilInternal::isDigit(data[pos]) || data[pos] == '-'))
         {
             result += data[pos];
@@ -448,7 +448,7 @@ parsePair(const string& data, size_t& pos)
     }
     return parseHexPair(data, pos, false);
 }
-    
+
 //
 // RFC 2253
 // hexpair    = hexchar hexchar
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.cpp b/cpp/src/IceSSL/SChannelTransceiverI.cpp
index 3946befe932..87505808cd3 100644
--- a/cpp/src/IceSSL/SChannelTransceiverI.cpp
+++ b/cpp/src/IceSSL/SChannelTransceiverI.cpp
@@ -208,7 +208,7 @@ getSecBufferWithType(const SecBufferDesc& desc, ULONG bufferType)
 IceInternal::NativeInfoPtr
 IceSSL::TransceiverI::getNativeInfo()
 {
-    return _stream;
+    return _delegate->getNativeInfo();
 }
 
 IceInternal::SocketOperation
@@ -359,7 +359,7 @@ IceSSL::TransceiverI::sslHandshake()
                 break; // We're done.
             }
 
-	    // Otherwise continue either reading credentials
+            // Otherwise continue either reading credentials
         }
 
         if(_state == StateHandshakeWriteContinue)
@@ -622,15 +622,19 @@ IceSSL::TransceiverI::encryptMessage(IceInternal::Buffer& buffer)
 }
 
 IceInternal::SocketOperation
-IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& writeBuffer, bool& hasMoreData)
+IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& writeBuffer)
 {
-    IceInternal::SocketOperation op = _stream->connect(readBuffer, writeBuffer);
-    if(op != IceInternal::SocketOperationNone)
+    if(_state == StateNotInitialized)
     {
-        return op;
+        IceInternal::SocketOperation op = _delegate->initialize(readBuffer, writeBuffer);
+        if(op != IceInternal::SocketOperationNone)
+        {
+            return op;
+        }
+        _state = StateHandshakeNotStarted;
     }
 
-    op = sslHandshake();
+    IceInternal::SocketOperation op = sslHandshake();
     if(op != IceInternal::SocketOperationNone)
     {
         return op;
@@ -715,7 +719,7 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B
         }
     }
 
-    _engine->verifyPeer(_stream->fd(), _host, NativeConnectionInfoPtr::dynamicCast(getInfo()));
+    _engine->verifyPeer(_host, ICE_DYNAMIC_CAST(NativeConnectionInfo, getInfo()), toString());
     _state = StateHandshakeComplete;
 
     if(_instance->engine()->securityTraceLevel() >= 1)
@@ -746,12 +750,17 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B
         }
         out << toString();
     }
-    hasMoreData = !_readUnprocessed.b.empty() || _readBuffer.i != _readBuffer.b.begin();
+    _delegate->getNativeInfo()->ready(IceInternal::SocketOperationRead,
+                                      !_readUnprocessed.b.empty() || _readBuffer.i != _readBuffer.b.begin());
     return IceInternal::SocketOperationNone;
 }
 
 IceInternal::SocketOperation
+#ifdef ICE_CPP11_MAPPING
+IceSSL::TransceiverI::closing(bool initiator, exception_ptr)
+#else
 IceSSL::TransceiverI::closing(bool initiator, const Ice::LocalException&)
+#endif
 {
     // If we are initiating the connection closure, wait for the peer
     // to close the TCP/IP connection. Otherwise, close immediately.
@@ -773,7 +782,7 @@ IceSSL::TransceiverI::close()
         _credentialsInitialized = false;
     }
 
-    _stream->close();
+    _delegate->close();
 
     //
     // Clear the buffers now instead of waiting for destruction.
@@ -786,9 +795,9 @@ IceSSL::TransceiverI::close()
 IceInternal::SocketOperation
 IceSSL::TransceiverI::write(IceInternal::Buffer& buf)
 {
-    if(!_stream->isConnected())
+    if(_state == StateNotInitialized)
     {
-        return _stream->write(buf);
+        return _delegate->write(buf);
     }
 
     if(buf.i == buf.b.end())
@@ -819,11 +828,11 @@ IceSSL::TransceiverI::write(IceInternal::Buffer& buf)
 }
 
 IceInternal::SocketOperation
-IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool& hasMoreData)
+IceSSL::TransceiverI::read(IceInternal::Buffer& buf)
 {
-    if(!_stream->isConnected())
+    if(_state == StateNotInitialized)
     {
-        return _stream->read(buf);
+        return _delegate->read(buf);
     }
 
     if(buf.i == buf.b.end())
@@ -832,7 +841,7 @@ IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool& hasMoreData)
     }
     assert(_state == StateHandshakeComplete);
 
-    hasMoreData = false;
+    _delegate->getNativeInfo()->ready(IceInternal::SocketOperationRead, false);
     while(buf.i != buf.b.end())
     {
         if(_readUnprocessed.b.empty() && _readBuffer.i == _readBuffer.b.begin() && !readRaw(_readBuffer))
@@ -852,7 +861,8 @@ IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool& hasMoreData)
 
         buf.i += decrypted;
     }
-    hasMoreData = !_readUnprocessed.b.empty() || _readBuffer.i != _readBuffer.b.begin();
+    _delegate->getNativeInfo()->ready(IceInternal::SocketOperationRead,
+                                      !_readUnprocessed.b.empty() || _readBuffer.i != _readBuffer.b.begin());
     return IceInternal::SocketOperationNone;
 }
 
@@ -861,9 +871,9 @@ IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool& hasMoreData)
 bool
 IceSSL::TransceiverI::startWrite(IceInternal::Buffer& buffer)
 {
-    if(!_stream->isConnected())
+    if(_state == StateNotInitialized)
     {
-        return _stream->startWrite(buffer);
+        return _delegate->startWrite(buffer);
     }
 
     if(_state == StateHandshakeComplete && _bufferedW == 0)
@@ -872,19 +882,19 @@ IceSSL::TransceiverI::startWrite(IceInternal::Buffer& buffer)
         _bufferedW = encryptMessage(buffer);
     }
 
-    return _stream->startWrite(_writeBuffer);
+    return _delegate->startWrite(_writeBuffer) && _bufferedW == (buffer.b.end() - buffer.i);
 }
 
 void
 IceSSL::TransceiverI::finishWrite(IceInternal::Buffer& buf)
 {
-    if(!_stream->isConnected())
+    if(_state == StateNotInitialized)
     {
-        _stream->finishWrite(buf);
+        _delegate->finishWrite(buf);
         return;
     }
 
-    _stream->finishWrite(_writeBuffer);
+    _delegate->finishWrite(_writeBuffer);
     if(_writeBuffer.i != _writeBuffer.b.end())
     {
         return; // We're not finished yet with writing the write buffer.
@@ -900,35 +910,36 @@ IceSSL::TransceiverI::finishWrite(IceInternal::Buffer& buf)
 void
 IceSSL::TransceiverI::startRead(IceInternal::Buffer& buffer)
 {
-    if(!_stream->isConnected())
+    if(_state == StateNotInitialized)
     {
-        _stream->startRead(buffer);
+        _delegate->startRead(buffer);
         return;
     }
-    _stream->startRead(_readBuffer);
+    _delegate->startRead(_readBuffer);
 }
 
 void
-IceSSL::TransceiverI::finishRead(IceInternal::Buffer& buf, bool& hasMoreData)
+IceSSL::TransceiverI::finishRead(IceInternal::Buffer& buf)
 {
-    if(!_stream->isConnected())
+    if(_state == StateNotInitialized)
     {
-        _stream->finishRead(buf);
+        _delegate->finishRead(buf);
         return;
     }
 
-    _stream->finishRead(_readBuffer);
+    _delegate->finishRead(_readBuffer);
     if(_state == StateHandshakeComplete)
     {
         size_t decrypted = decryptMessage(buf);
         if(decrypted > 0)
         {
             buf.i += decrypted;
-            hasMoreData = !_readUnprocessed.b.empty() || _readBuffer.i != _readBuffer.b.begin();
+            _delegate->getNativeInfo()->ready(IceInternal::SocketOperationRead,
+                                              !_readUnprocessed.b.empty() || _readBuffer.i != _readBuffer.b.begin());
         }
         else
         {
-            hasMoreData = false;
+            _delegate->getNativeInfo()->ready(IceInternal::SocketOperationRead, false);
         }
     }
 }
@@ -943,7 +954,7 @@ IceSSL::TransceiverI::protocol() const
 string
 IceSSL::TransceiverI::toString() const
 {
-    return _stream->toString();
+    return _delegate->toString();
 }
 
 string
@@ -955,66 +966,11 @@ IceSSL::TransceiverI::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceSSL::TransceiverI::getInfo() const
 {
-    NativeConnectionInfoPtr info = new NativeConnectionInfo();
-    fillConnectionInfo(info, info->nativeCerts);
-    return info;
-}
-
-Ice::ConnectionInfoPtr
-IceSSL::TransceiverI::getWSInfo(const Ice::HeaderDict& headers) const
-{
-    WSSNativeConnectionInfoPtr info = new WSSNativeConnectionInfo();
-    fillConnectionInfo(info, info->nativeCerts);
-    info->headers = headers;
-    return info;
-}
-
-void
-IceSSL::TransceiverI::checkSendSize(const IceInternal::Buffer&)
-{
-}
-
-void
-IceSSL::TransceiverI::setBufferSize(int rcvSize, int sndSize)
-{
-    _stream->setBufferSize(rcvSize, sndSize);
-}
-
-IceSSL::TransceiverI::TransceiverI(const InstancePtr& instance,
-                                   const IceInternal::StreamSocketPtr& stream,
-                                   const string& hostOrAdapterName,
-                                   bool incoming) :
-    _instance(instance),
-    _engine(SChannelEnginePtr::dynamicCast(instance->engine())),
-    _host(incoming ? "" : hostOrAdapterName),
-    _adapterName(incoming ? hostOrAdapterName : ""),
-    _incoming(incoming),
-    _stream(stream),
-    _state(StateHandshakeNotStarted),
-    _bufferedW(0),
-    _sslInitialized(false),
-    _credentialsInitialized(false),
-    _verified(false)
-{
-}
-
-IceSSL::TransceiverI::~TransceiverI()
-{
-}
-
-void
-IceSSL::TransceiverI::fillConnectionInfo(const ConnectionInfoPtr& info, vector<CertificatePtr>& nativeCerts) const
-{
-    IceInternal::fdToAddressAndPort(_stream->fd(), info->localAddress, info->localPort, info->remoteAddress,
-                                    info->remotePort);
-    if(_stream->fd() != INVALID_SOCKET)
-    {
-        info->rcvSize = IceInternal::getRecvBufferSize(_stream->fd());
-        info->sndSize = IceInternal::getSendBufferSize(_stream->fd());
-    }
-
+    NativeConnectionInfoPtr info = ICE_MAKE_SHARED(NativeConnectionInfo);
+    info->underlying = _delegate->getInfo();
+    info->incoming = _incoming;
+    info->adapterName = _adapterName;
     info->verified = _verified;
-
     if(_sslInitialized)
     {
         CtxtHandle* ssl = const_cast<CtxtHandle*>(&_ssl);
@@ -1048,8 +1004,8 @@ IceSSL::TransceiverI::fillConnectionInfo(const ConnectionInfoPtr& info, vector<C
                                                 IceUtilInternal::lastErrorToString());
                     }
 
-                    CertificatePtr certificate = new Certificate(cc);
-                    nativeCerts.push_back(certificate);
+                    CertificatePtr certificate = ICE_MAKE_SHARED(Certificate, cc);
+                    info->nativeCerts.push_back(certificate);
                     info->certs.push_back(certificate->encode());
                 }
                 CertFreeCertificateChain(certChain);
@@ -1073,24 +1029,53 @@ IceSSL::TransceiverI::fillConnectionInfo(const ConnectionInfoPtr& info, vector<C
                                     IceUtilInternal::lastErrorToString());
         }
     }
+    return info;
+}
 
-    info->adapterName = _adapterName;
-    info->incoming = _incoming;
+void
+IceSSL::TransceiverI::checkSendSize(const IceInternal::Buffer&)
+{
+}
+
+void
+IceSSL::TransceiverI::setBufferSize(int rcvSize, int sndSize)
+{
+    _delegate->setBufferSize(rcvSize, sndSize);
+}
+
+IceSSL::TransceiverI::TransceiverI(const InstancePtr& instance,
+                                   const IceInternal::TransceiverPtr& delegate,
+                                   const string& hostOrAdapterName,
+                                   bool incoming) :
+    _instance(instance),
+    _engine(SChannelEnginePtr::dynamicCast(instance->engine())),
+    _host(incoming ? "" : hostOrAdapterName),
+    _adapterName(incoming ? hostOrAdapterName : ""),
+    _incoming(incoming),
+    _delegate(delegate),
+    _state(StateNotInitialized),
+    _bufferedW(0),
+    _sslInitialized(false),
+    _credentialsInitialized(false),
+    _verified(false)
+{
+}
+IceSSL::TransceiverI::~TransceiverI()
+{
 }
 
 bool
 IceSSL::TransceiverI::writeRaw(IceInternal::Buffer& buf)
 {
-    ssize_t ret = _stream->write(reinterpret_cast<const char*>(&*buf.i), buf.b.end() - buf.i);
-    buf.i += ret;
+    _delegate->write(buf);
     return buf.i == buf.b.end();
 }
 
 bool
 IceSSL::TransceiverI::readRaw(IceInternal::Buffer& buf)
 {
-    ssize_t ret = _stream->read(reinterpret_cast<char*>(&*buf.i), buf.b.end() - buf.i);
-    buf.i += ret;
-    return ret > 0;
+    IceInternal::Buffer::Container::iterator p = buf.i;
+    _delegate->read(buf);
+    return buf.i != p;
 }
 #endif
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.h b/cpp/src/IceSSL/SChannelTransceiverI.h
index a3fbcf85d02..dc9d8030b61 100644
--- a/cpp/src/IceSSL/SChannelTransceiverI.h
+++ b/cpp/src/IceSSL/SChannelTransceiverI.h
@@ -43,38 +43,39 @@ namespace IceSSL
 class ConnectorI;
 class AcceptorI;
 
-class TransceiverI : public IceInternal::Transceiver, public IceInternal::WSTransceiverDelegate
+class TransceiverI : public IceInternal::Transceiver
 {
 public:
 
     virtual IceInternal::NativeInfoPtr getNativeInfo();
 
-    virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&, bool&);
+    virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&);
+#ifdef ICE_CPP11_MAPPING
+    virtual IceInternal::SocketOperation closing(bool, std::exception_ptr);
+#else
     virtual IceInternal::SocketOperation closing(bool, const Ice::LocalException&);
+#endif
     virtual void close();
     virtual IceInternal::SocketOperation write(IceInternal::Buffer&);
-    virtual IceInternal::SocketOperation read(IceInternal::Buffer&, bool&);
+    virtual IceInternal::SocketOperation read(IceInternal::Buffer&);
 #ifdef ICE_USE_IOCP
     virtual bool startWrite(IceInternal::Buffer&);
     virtual void finishWrite(IceInternal::Buffer&);
     virtual void startRead(IceInternal::Buffer&);
-    virtual void finishRead(IceInternal::Buffer&, bool&);
+    virtual void finishRead(IceInternal::Buffer&);
 #endif
     virtual std::string protocol() const;
     virtual std::string toString() const;
     virtual std::string toDetailedString() const;
     virtual Ice::ConnectionInfoPtr getInfo() const;
-    virtual Ice::ConnectionInfoPtr getWSInfo(const Ice::HeaderDict&) const;
     virtual void checkSendSize(const IceInternal::Buffer&);
     virtual void setBufferSize(int rcvSize, int sndSize);
 
 private:
 
-    TransceiverI(const InstancePtr&, const IceInternal::StreamSocketPtr&, const std::string&, bool);
+    TransceiverI(const InstancePtr&, const IceInternal::TransceiverPtr&, const std::string&, bool);
     virtual ~TransceiverI();
 
-    void fillConnectionInfo(const ConnectionInfoPtr&, std::vector<CertificatePtr>&) const;
-
     IceInternal::SocketOperation sslHandshake();
 
     size_t decryptMessage(IceInternal::Buffer&);
@@ -88,6 +89,7 @@ private:
 
     enum State
     {
+        StateNotInitialized,
         StateHandshakeNotStarted,
         StateHandshakeReadContinue,
         StateHandshakeWriteContinue,
@@ -99,7 +101,7 @@ private:
     const std::string _host;
     const std::string _adapterName;
     const bool _incoming;
-    const IceInternal::StreamSocketPtr _stream;
+    const IceInternal::TransceiverPtr _delegate;
     State _state;
 
     //
diff --git a/cpp/src/IceSSL/SSLEngine.cpp b/cpp/src/IceSSL/SSLEngine.cpp
index 31bc4d54e3d..ed286df2b5b 100644
--- a/cpp/src/IceSSL/SSLEngine.cpp
+++ b/cpp/src/IceSSL/SSLEngine.cpp
@@ -115,23 +115,24 @@ IceSSL::SSLEngine::initialize()
     // VerifyPeer determines whether certificate validation failures abort a connection.
     //
     _verifyPeer = properties->getPropertyAsIntWithDefault(propPrefix + "VerifyPeer", 2);
-    
+
     if(_verifyPeer < 0 || _verifyPeer > 2)
     {
         PluginInitializationException ex(__FILE__, __LINE__);
         ex.reason = "IceSSL: invalid value for " + propPrefix + "VerifyPeer";
         throw ex;
     }
-    
+
     _securityTraceLevel = properties->getPropertyAsInt("IceSSL.Trace.Security");
     _securityTraceCategory = "Security";
 }
 
 void
-IceSSL::SSLEngine::verifyPeer(SOCKET fd, const string& address, const NativeConnectionInfoPtr& info)
+IceSSL::SSLEngine::verifyPeer(const string& address, const NativeConnectionInfoPtr& info, const string& desc)
 {
     const CertificateVerifierPtr verifier = getCertificateVerifier();
-    
+
+#if !defined(ICE_USE_SECURE_TRANSPORT_IOS)
     //
     // For an outgoing connection, we compare the proxy address (if any) against
     // fields in the server's certificate (if any).
@@ -248,6 +249,7 @@ IceSSL::SSLEngine::verifyPeer(SOCKET fd, const string& address, const NativeConn
             }
         }
     }
+#endif
 
     if(_verifyDepthMax > 0 && static_cast<int>(info->certs.size()) > _verifyDepthMax)
     {
@@ -258,19 +260,19 @@ IceSSL::SSLEngine::verifyPeer(SOCKET fd, const string& address, const NativeConn
         string msg = ostr.str();
         if(_securityTraceLevel >= 1)
         {
-            _logger->trace(_securityTraceCategory, msg + "\n" + IceInternal::fdToString(fd));
+            _logger->trace(_securityTraceCategory, msg + "\n" + desc);
         }
         SecurityException ex(__FILE__, __LINE__);
         ex.reason = msg;
         throw ex;
     }
 
-    if(!_trustManager->verify(info))
+    if(!_trustManager->verify(info, desc))
     {
         string msg = string(info->incoming ? "incoming" : "outgoing") + " connection rejected by trust manager";
         if(_securityTraceLevel >= 1)
         {
-            _logger->trace(_securityTraceCategory, msg + "\n" + IceInternal::fdToString(fd));
+            _logger->trace(_securityTraceCategory, msg + "\n" + desc);
         }
         SecurityException ex(__FILE__, __LINE__);
         ex.reason = msg;
@@ -282,7 +284,7 @@ IceSSL::SSLEngine::verifyPeer(SOCKET fd, const string& address, const NativeConn
         string msg = string(info->incoming ? "incoming" : "outgoing") + " connection rejected by certificate verifier";
         if(_securityTraceLevel >= 1)
         {
-            _logger->trace(_securityTraceCategory, msg + "\n" + IceInternal::fdToString(fd));
+            _logger->trace(_securityTraceCategory, msg + "\n" + desc);
         }
         SecurityException ex(__FILE__, __LINE__);
         ex.reason = msg;
diff --git a/cpp/src/IceSSL/SSLEngine.h b/cpp/src/IceSSL/SSLEngine.h
index 08b79e85bd5..25748c71c78 100644
--- a/cpp/src/IceSSL/SSLEngine.h
+++ b/cpp/src/IceSSL/SSLEngine.h
@@ -22,6 +22,7 @@
 
 #if defined(ICE_USE_SECURE_TRANSPORT)
 #   include <Security/Security.h>
+#   include <Security/SecureTransport.h>
 #elif defined(ICE_USE_SCHANNEL)
 
 //
@@ -72,7 +73,7 @@ public:
     //
     // Verify peer certificate
     //
-    void verifyPeer(SOCKET, const std::string&, const NativeConnectionInfoPtr&);
+    void verifyPeer(const std::string&, const NativeConnectionInfoPtr&, const std::string&);
 
     CertificateVerifierPtr getCertificateVerifier() const;
     PasswordPromptPtr getPasswordPrompt() const;
@@ -80,6 +81,7 @@ public:
     std::string getPassword() const;
     void setPassword(const std::string& password);
 
+    bool getCheckCertName() const { return _checkCertName; }
     int getVerifyPeer() const { return _verifyPeer; }
     int securityTraceLevel() const { return _securityTraceLevel; }
     std::string securityTraceCategory() const { return _securityTraceCategory; }
@@ -120,7 +122,6 @@ public:
 private:
 
     void parseCiphers(const std::string&);
-    SecKeychainRef openKeychain();
 
     bool _initialized;
     UniqueRef<CFArrayRef> _certificateAuthorities;
@@ -131,8 +132,9 @@ private:
 
     std::string _defaultDir;
 
+#if TARGET_OS_IPHONE==0
     std::vector<char> _dhParams;
-
+#endif
     std::vector<SSLCipherSuite> _ciphers;
     IceUtil::Mutex _mutex;
 };
@@ -179,6 +181,7 @@ private:
 #   endif
 
 #endif
+
 class SChannelEngine : public SSLEngine
 {
 public:
@@ -219,7 +222,22 @@ private:
     HCERTCHAINENGINE _chainEngine;
     std::vector<ALG_ID> _ciphers;
 };
+
+#elif defined(ICE_OS_WINRT)
+
+class WinRTEngine : public SSLEngine
+{
+public:
+
+    WinRTEngine(const Ice::CommunicatorPtr&);
+
+    virtual void initialize();
+    virtual bool initialized() const;
+    virtual void destroy();
+};
+
 #else // OpenSSL
+
 class OpenSSLEngine : public SSLEngine
 {
 public:
diff --git a/cpp/src/IceSSL/SSLEngineF.h b/cpp/src/IceSSL/SSLEngineF.h
index 6d9c7a1e284..61656a11d2a 100644
--- a/cpp/src/IceSSL/SSLEngineF.h
+++ b/cpp/src/IceSSL/SSLEngineF.h
@@ -19,20 +19,24 @@ namespace IceSSL
 {
 
 class SSLEngine;
-ICE_SSL_API IceUtil::Shared* upCast(IceSSL::SSLEngine*);
+ICE_SSL_API IceUtil::Shared* upCast(SSLEngine*);
 typedef IceInternal::Handle<SSLEngine> SSLEnginePtr;
 
 #if defined(ICE_USE_SECURE_TRANSPORT)
 class SecureTransportEngine;
-ICE_SSL_API IceUtil::Shared* upCast(IceSSL::SecureTransportEngine*);
+ICE_SSL_API IceUtil::Shared* upCast(SecureTransportEngine*);
 typedef IceInternal::Handle<SecureTransportEngine> SecureTransportEnginePtr;
 #elif defined(ICE_USE_SCHANNEL)
 class SChannelEngine;
-ICE_SSL_API IceUtil::Shared* upCast(IceSSL::SChannelEngine*);
+ICE_SSL_API IceUtil::Shared* upCast(SChannelEngine*);
 typedef IceInternal::Handle<SChannelEngine> SChannelEnginePtr;
+#elif defined(ICE_OS_WINRT)
+class WinRTEngine;
+ICE_SSL_API IceUtil::Shared* upCast(WinRTEngine*);
+typedef IceInternal::Handle<WinRTEngine> WinRTEnginePtr;
 #else // OpenSSL
 class OpenSSLEngine;
-ICE_SSL_API IceUtil::Shared* upCast(IceSSL::OpenSSLEngine*);
+ICE_SSL_API IceUtil::Shared* upCast(OpenSSLEngine*);
 typedef IceInternal::Handle<OpenSSLEngine> OpenSSLEnginePtr;
 #endif
 
diff --git a/cpp/src/IceSSL/SecureTransportEngine.cpp b/cpp/src/IceSSL/SecureTransportEngine.cpp
index 00cb59d4c83..1876477794c 100644
--- a/cpp/src/IceSSL/SecureTransportEngine.cpp
+++ b/cpp/src/IceSSL/SecureTransportEngine.cpp
@@ -858,6 +858,9 @@ IceSSL::SecureTransportEngine::initialize()
     string certFile = properties->getProperty("IceSSL.CertFile");
     string keyFile = properties->getProperty("IceSSL.KeyFile");
     string findCert = properties->getProperty("IceSSL.FindCert");
+    string keychain = properties->getProperty("IceSSL.Keychain");
+    string keychainPassword = properties->getProperty("IceSSL.KeychainPassword");
+
     if(!certFile.empty())
     {
         vector<string> files;
@@ -903,10 +906,10 @@ IceSSL::SecureTransportEngine::initialize()
                 keyFile = resolved;
             }
 
-            UniqueRef<SecKeychainRef> kc(openKeychain());
             try
             {
-                _chain.reset(loadCertificateChain(file, keyFile, kc.get(), password, passwordPrompt, passwordRetryMax));
+                _chain.reset(loadCertificateChain(file, keyFile, keychain, keychainPassword, password, passwordPrompt,
+                                                  passwordRetryMax));
                 break;
             }
             catch(const CertificateReadException& ce)
@@ -924,57 +927,13 @@ IceSSL::SecureTransportEngine::initialize()
     }
     else if(!findCert.empty())
     {
-        UniqueRef<SecKeychainRef> kc(openKeychain());
-        UniqueRef<SecCertificateRef> cert(findCertificate(kc.get(), findCert));
-
-        //
-        // Retrieve the certificate chain
-        //
-        UniqueRef<SecPolicyRef> policy(SecPolicyCreateSSL(true, 0));
-        SecTrustRef trust = 0;
-        OSStatus err = SecTrustCreateWithCertificates((CFArrayRef)cert.get(), policy.get(), &trust);
-        if(err || !trust)
-        {
-            throw PluginInitializationException(__FILE__, __LINE__,
-                                                "IceSSL: error creating trust object" +
-                                                (err ? ":\n" + errorToString(err) : ""));
-        }
-        UniqueRef<SecTrustRef> v(trust);
-
-        SecTrustResultType trustResult;
-        if((err = SecTrustEvaluate(trust, &trustResult)))
-        {
-            throw PluginInitializationException(__FILE__, __LINE__,
-                                                "IceSSL: error evaluating trust:\n" + errorToString(err));
-        }
-
-        int chainLength = SecTrustGetCertificateCount(trust);
-        CFMutableArrayRef items = CFArrayCreateMutable(kCFAllocatorDefault, chainLength, &kCFTypeArrayCallBacks);
-        for(int i = 0; i < chainLength; ++i)
-        {
-            CFArrayAppendValue(items, SecTrustGetCertificateAtIndex(trust, i));
-        }
-
-        //
-        // Replace the first certificate in the chain with the
-        // identity.
-        //
-        SecIdentityRef identity;
-        err = SecIdentityCreateWithCertificate(kc.get(), cert.get(), &identity);
-        if(err != noErr)
-        {
-            ostringstream os;
-            os << "IceSSL: couldn't create identity for certificate found in the keychain:\n" << errorToString(err);
-            throw PluginInitializationException(__FILE__, __LINE__, os.str());
-        }
-        CFArraySetValueAtIndex(items, 0, identity);
-        CFRelease(identity);
-        _chain.reset(items);
+        _chain.reset(findCertificateChain(keychain, keychainPassword, findCert));
     }
 
     //
     // DiffieHellmanParams in DER format.
     //
+#if defined(ICE_USE_SECURE_TRANSPORT_MACOS)
     string dhFile = properties->getProperty("IceSSL.DHParams");
     if(!dhFile.empty())
     {
@@ -986,6 +945,7 @@ IceSSL::SecureTransportEngine::initialize()
 
         readFile(resolved, _dhParams);
     }
+#endif
 
     //
     // Establish the cipher list.
@@ -1086,6 +1046,7 @@ IceSSL::SecureTransportEngine::newContext(bool incoming)
             }
         }
 
+#if defined(ICE_USE_SECURE_TRANSPORT_MACOS)
         if(!_dhParams.empty())
         {
             if((err = SSLSetDiffieHellmanParams(ssl, &_dhParams[0], _dhParams.size())))
@@ -1094,6 +1055,7 @@ IceSSL::SecureTransportEngine::newContext(bool incoming)
                                         "IceSSL: unable to create the trust object:\n" + errorToString(err));
             }
         }
+#endif
     }
 
     if(_chain && (err = SSLSetCertificate(ssl, _chain.get())))
@@ -1318,92 +1280,5 @@ IceSSL::SecureTransportEngine::parseCiphers(const string& ciphers)
     }
 }
 
-SecKeychainRef
-SecureTransportEngine::openKeychain()
-{
-    const PropertiesPtr properties = communicator()->getProperties();
-
-    //
-    // Open the application KeyChain or create it if the keychain doesn't exists
-    //
-    string keychainPath = properties->getProperty("IceSSL.Keychain");
-    string keychainPassword = properties->getProperty("IceSSL.KeychainPassword");
-
-    SecKeychainRef keychain = 0;
-    OSStatus err = 0;
-    if(keychainPath.empty())
-    {
-        if((err = SecKeychainCopyDefault(&keychain)))
-        {
-            throw PluginInitializationException(__FILE__, __LINE__,
-                                                "IceSSL: unable to retrieve default keychain:\n" + errorToString(err));
-        }
-    }
-    else
-    {
-        //
-        // KeyChain path is relative to the current working directory.
-        //
-        if(!IceUtilInternal::isAbsolutePath(keychainPath))
-        {
-            string cwd;
-            if(IceUtilInternal::getcwd(cwd) == 0)
-            {
-                keychainPath = string(cwd) + '/' + keychainPath;
-            }
-        }
-
-        if((err = SecKeychainOpen(keychainPath.c_str(), &keychain)))
-        {
-            throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: unable to open keychain: `" +
-                                                keychainPath + "'\n" + errorToString(err));
-        }
-    }
-
-    UniqueRef<SecKeychainRef> k(keychain);
-
-    SecKeychainStatus status;
-    err = SecKeychainGetStatus(keychain, &status);
-    if(err == noErr)
-    {
-        const char* pass = keychainPassword.empty() ? 0 : keychainPassword.c_str();
-        if((err = SecKeychainUnlock(keychain, keychainPassword.size(), pass, pass != 0)))
-        {
-            throw PluginInitializationException(__FILE__, __LINE__,
-                                                "IceSSL: unable to unlock keychain:\n" + errorToString(err));
-        }
-    }
-    else if(err == errSecNoSuchKeychain)
-    {
-        const char* pass = keychainPassword.empty() ? 0 : keychainPassword.c_str();
-        if((err = SecKeychainCreate(keychainPath.c_str(), keychainPassword.size(), pass, pass == 0, 0, &keychain)))
-        {
-            throw PluginInitializationException(__FILE__, __LINE__,
-                                                "IceSSL: unable to create keychain:\n" + errorToString(err));
-        }
-        k.reset(keychain);
-    }
-    else
-    {
-        throw PluginInitializationException(__FILE__, __LINE__,
-                                            "IceSSL: unable to open keychain:\n" + errorToString(err));
-    }
-
-    //
-    // Set keychain settings to avoid keychain lock.
-    //
-    SecKeychainSettings settings;
-    settings.version = SEC_KEYCHAIN_SETTINGS_VERS1;
-    settings.lockOnSleep = FALSE;
-    settings.useLockInterval = FALSE;
-    settings.lockInterval = INT_MAX;
-    if((err = SecKeychainSetSettings(keychain, &settings)))
-    {
-        throw PluginInitializationException(__FILE__, __LINE__,
-                                            "IceSSL: error setting keychain settings:\n" + errorToString(err));
-    }
-
-    return k.release();
-}
 
 #endif
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
index 2b4dff3ab25..f407e008913 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
@@ -96,7 +96,8 @@ socketRead(SSLConnectionRef connection, void* data, size_t* length)
 }
 
 bool
-checkTrustResult(SecTrustRef trust, const SecureTransportEnginePtr& engine, const InstancePtr& instance)
+checkTrustResult(SecTrustRef trust, const SecureTransportEnginePtr& engine, const InstancePtr& instance,
+                 const string& host)
 {
     OSStatus err = noErr;
     SecTrustResultType trustResult = kSecTrustResultOtherError;
@@ -115,6 +116,28 @@ checkTrustResult(SecTrustRef trust, const SecureTransportEnginePtr& engine, cons
             throw SecurityException(__FILE__, __LINE__, "IceSSL: handshake failure:\n" + errorToString(err));
         }
 
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+        if(engine->getCheckCertName() && !host.empty())
+        {
+            //
+            // Add SSL trust policy if we need to check the certificate name.
+            //
+            UniqueRef<SecPolicyRef> policy(SecPolicyCreateSSL(false, toCFString(host)));
+            CFArrayRef policies;
+            if((err = SecTrustCopyPolicies(trust, &policies)))
+            {
+                throw SecurityException(__FILE__, __LINE__, "IceSSL: handshake failure:\n" + errorToString(err));
+            }
+            UniqueRef<CFMutableArrayRef> newPolicies(CFArrayCreateMutableCopy(kCFAllocatorDefault, 0, policies));
+            CFRelease(policies);
+            CFArrayAppendValue(newPolicies.get(), policy.release());
+            if((err = SecTrustSetPolicies(trust, newPolicies.release())))
+            {
+                throw SecurityException(__FILE__, __LINE__, "IceSSL: handshake failure:\n" + errorToString(err));
+            }
+        }
+#endif
+
         //
         // Evaluate the trust
         //
@@ -171,18 +194,29 @@ checkTrustResult(SecTrustRef trust, const SecureTransportEnginePtr& engine, cons
 IceInternal::NativeInfoPtr
 IceSSL::TransceiverI::getNativeInfo()
 {
-    return _stream;
+    return _delegate->getNativeInfo();
 }
 
 IceInternal::SocketOperation
-IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& writeBuffer, bool&)
+IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& writeBuffer)
 {
-    IceInternal::SocketOperation status = _stream->connect(readBuffer, writeBuffer);
-    if(status != IceInternal::SocketOperationNone)
+    if(!_connected)
     {
-        return status;
+        IceInternal::SocketOperation status = _delegate->initialize(readBuffer, writeBuffer);
+        if(status != IceInternal::SocketOperationNone)
+        {
+            return status;
+        }
+        _connected = true;
     }
 
+    //
+    // Limit the size of packets passed to SSLWrite/SSLRead to avoid
+    // blocking and holding too much memory.
+    //
+    _maxSendPacketSize = std::max(512, IceInternal::getSendBufferSize(_delegate->getNativeInfo()->fd()));
+    _maxRecvPacketSize = std::max(512, IceInternal::getRecvBufferSize(_delegate->getNativeInfo()->fd()));
+
     OSStatus err = 0;
     if(!_ssl)
     {
@@ -237,7 +271,7 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B
             }
             if(err == noErr)
             {
-                _verified = checkTrustResult(_trust, _engine, _instance);
+                _verified = checkTrustResult(_trust, _engine, _instance, _host);
                 continue; // Call SSLHandshake to resume the handsake.
             }
             // Let it fall through, this will raise a SecurityException with the SSLCopyPeerTrust error.
@@ -247,18 +281,12 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B
             throw ConnectionLostException(__FILE__, __LINE__, 0);
         }
 
-        IceInternal::Address remoteAddr;
-        string desc = "<not available>";
-        if(IceInternal::fdToRemoteAddress(_stream->fd(), remoteAddr))
-        {
-            desc = IceInternal::addrToString(remoteAddr);
-        }
         ostringstream os;
         os << "IceSSL: ssl error occurred for new " << (_incoming ? "incoming" : "outgoing") << " connection:\n"
-           << "remote address = " << desc << "\n" << errorToString(err);
+           << _delegate->toString() << "\n" << errorToString(err);
         throw ProtocolException(__FILE__, __LINE__, os.str());
     }
-    _engine->verifyPeer(_stream->fd(), _host, NativeConnectionInfoPtr::dynamicCast(getInfo()));
+    _engine->verifyPeer(_host, ICE_DYNAMIC_CAST(NativeConnectionInfo, getInfo()), toString());
 
     if(_instance->engine()->securityTraceLevel() >= 1)
     {
@@ -290,7 +318,11 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B
 }
 
 IceInternal::SocketOperation
+#ifdef ICE_CPP11_MAPPING
+IceSSL::TransceiverI::closing(bool initiator, exception_ptr)
+#else
 IceSSL::TransceiverI::closing(bool initiator, const Ice::LocalException&)
+#endif
 {
     // If we are initiating the connection closure, wait for the peer
     // to close the TCP/IP connection. Otherwise, close immediately.
@@ -313,15 +345,15 @@ IceSSL::TransceiverI::close()
         _ssl = 0;
     }
 
-    _stream->close();
+    _delegate->close();
 }
 
 IceInternal::SocketOperation
 IceSSL::TransceiverI::write(IceInternal::Buffer& buf)
 {
-    if(!_stream->isConnected())
+    if(!_connected)
     {
-        return _stream->write(buf);
+        return _delegate->write(buf);
     }
 
     if(buf.i == buf.b.end())
@@ -396,11 +428,11 @@ IceSSL::TransceiverI::write(IceInternal::Buffer& buf)
 }
 
 IceInternal::SocketOperation
-IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool& hasMoreData)
+IceSSL::TransceiverI::read(IceInternal::Buffer& buf)
 {
-    if(!_stream->isConnected())
+    if(!_connected)
     {
-        return _stream->read(buf);
+        return _delegate->read(buf);
     }
 
     if(buf.i == buf.b.end())
@@ -408,6 +440,8 @@ IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool& hasMoreData)
         return  IceInternal::SocketOperationNone;
     }
 
+    _delegate->getNativeInfo()->ready(IceInternal::SocketOperationRead, false);
+
     size_t packetSize = std::min(static_cast<size_t>(buf.b.end() - buf.i), _maxRecvPacketSize);
     while(buf.i != buf.b.end())
     {
@@ -456,7 +490,7 @@ IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool& hasMoreData)
     }
 
     //
-    // Check if there's still buffered data to read. In this case, set hasMoreData to true.
+    // Check if there's still buffered data to read. In this case, set the read ready status.
     //
     size_t buffered = 0;
     OSStatus err = SSLGetBufferedReadSize(_ssl, &buffered);
@@ -465,7 +499,7 @@ IceSSL::TransceiverI::read(IceInternal::Buffer& buf, bool& hasMoreData)
         errno = err;
         throw SocketException(__FILE__, __LINE__, IceInternal::getSocketErrno());
     }
-    hasMoreData = buffered > 0;
+    _delegate->getNativeInfo()->ready(IceInternal::SocketOperationRead, buffered > 0);
     return IceInternal::SocketOperationNone;
 }
 
@@ -478,7 +512,7 @@ IceSSL::TransceiverI::protocol() const
 string
 IceSSL::TransceiverI::toString() const
 {
-    return _stream->toString();
+    return _delegate->toString();
 }
 
 string
@@ -490,17 +524,31 @@ IceSSL::TransceiverI::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceSSL::TransceiverI::getInfo() const
 {
-    NativeConnectionInfoPtr info = new NativeConnectionInfo();
-    fillConnectionInfo(info, info->nativeCerts);
-    return info;
-}
+    NativeConnectionInfoPtr info = ICE_MAKE_SHARED(NativeConnectionInfo);
+    info->underlying = _delegate->getInfo();
+    info->incoming = _incoming;
+    info->adapterName = _adapterName;
+    if(_ssl)
+    {
+        for(int i = 0, count = SecTrustGetCertificateCount(_trust); i < count; ++i)
+        {
+            SecCertificateRef cert = SecTrustGetCertificateAtIndex(_trust, i);
+            CFRetain(cert);
 
-Ice::ConnectionInfoPtr
-IceSSL::TransceiverI::getWSInfo(const Ice::HeaderDict& headers) const
-{
-    WSSNativeConnectionInfoPtr info = new WSSNativeConnectionInfo();
-    fillConnectionInfo(info, info->nativeCerts);
-    info->headers = headers;
+            CertificatePtr certificate = ICE_MAKE_SHARED(Certificate, cert);
+            info->nativeCerts.push_back(certificate);
+            info->certs.push_back(certificate->encode());
+        }
+
+        SSLCipherSuite cipher;
+        SSLGetNegotiatedCipher(_ssl, &cipher);
+        info->cipher = _engine->getCipherName(cipher);
+        info->verified = _verified;
+    }
+    else
+    {
+        info->verified = false;
+    }
     return info;
 }
 
@@ -512,11 +560,11 @@ IceSSL::TransceiverI::checkSendSize(const IceInternal::Buffer&)
 void
 IceSSL::TransceiverI::setBufferSize(int rcvSize, int sndSize)
 {
-    _stream->setBufferSize(rcvSize, sndSize);
+    _delegate->setBufferSize(rcvSize, sndSize);
 }
 
 IceSSL::TransceiverI::TransceiverI(const InstancePtr& instance,
-                                   const IceInternal::StreamSocketPtr& stream,
+                                   const IceInternal::TransceiverPtr& delegate,
                                    const string& hostOrAdapterName,
                                    bool incoming) :
     _instance(instance),
@@ -524,61 +572,19 @@ IceSSL::TransceiverI::TransceiverI(const InstancePtr& instance,
     _host(incoming ? "" : hostOrAdapterName),
     _adapterName(incoming ? hostOrAdapterName : ""),
     _incoming(incoming),
-    _stream(stream),
+    _delegate(delegate),
     _ssl(0),
     _trust(0),
+    _connected(false),
     _verified(false),
     _buffered(0)
 {
-    //
-    // Limit the size of packets passed to SSLWrite/SSLRead to avoid
-    // blocking and holding too much memory.
-    //
-    _maxSendPacketSize = std::max(512, IceInternal::getSendBufferSize(_stream->fd()));
-    _maxRecvPacketSize = std::max(512, IceInternal::getRecvBufferSize(_stream->fd()));
 }
 
 IceSSL::TransceiverI::~TransceiverI()
 {
 }
 
-void
-IceSSL::TransceiverI::fillConnectionInfo(const ConnectionInfoPtr& info, std::vector<CertificatePtr>& nativeCerts) const
-{
-    IceInternal::fdToAddressAndPort(_stream->fd(), info->localAddress, info->localPort, info->remoteAddress,
-                                    info->remotePort);
-    if(_stream->fd() != INVALID_SOCKET)
-    {
-        info->rcvSize = IceInternal::getRecvBufferSize(_stream->fd());
-        info->sndSize = IceInternal::getSendBufferSize(_stream->fd());
-    }
-
-    if(_ssl)
-    {
-        for(int i = 0, count = SecTrustGetCertificateCount(_trust); i < count; ++i)
-        {
-            SecCertificateRef cert = SecTrustGetCertificateAtIndex(_trust, i);
-            CFRetain(cert);
-
-            CertificatePtr certificate = new Certificate(cert);
-            nativeCerts.push_back(certificate);
-            info->certs.push_back(certificate->encode());
-        }
-
-        SSLCipherSuite cipher;
-        SSLGetNegotiatedCipher(_ssl, &cipher);
-        info->cipher = _engine->getCipherName(cipher);
-        info->verified = _verified;
-    }
-    else
-    {
-        info->verified = false;
-    }
-
-    info->adapterName = _adapterName;
-    info->incoming = _incoming;
-}
-
 OSStatus
 IceSSL::TransceiverI::writeRaw(const char* data, size_t* length) const
 {
@@ -586,13 +592,15 @@ IceSSL::TransceiverI::writeRaw(const char* data, size_t* length) const
 
     try
     {
-        ssize_t ret = _stream->write(data, *length);
-        if(ret < *length)
+        IceInternal::Buffer buf(reinterpret_cast<const Ice::Byte*>(data), reinterpret_cast<const Ice::Byte*>(data) + *length);
+        IceInternal::SocketOperation op = _delegate->write(buf);
+        if(op == IceInternal::SocketOperationWrite)
         {
-            *length = static_cast<size_t>(ret);
+            *length = buf.i - buf.b.begin();
             _flags |= SSLWantWrite;
             return errSSLWouldBlock;
         }
+        assert(op == IceInternal::SocketOperationNone);
     }
     catch(const Ice::ConnectionLostException&)
     {
@@ -617,13 +625,15 @@ IceSSL::TransceiverI::readRaw(char* data, size_t* length) const
 
     try
     {
-        ssize_t ret = _stream->read(data, *length);
-        if(ret < *length)
+        IceInternal::Buffer buf(reinterpret_cast<Ice::Byte*>(data), reinterpret_cast<Ice::Byte*>(data) + *length);
+        IceInternal::SocketOperation op = _delegate->read(buf);
+        if(op == IceInternal::SocketOperationRead)
         {
-            *length = static_cast<size_t>(ret);
+            *length = buf.i - buf.b.begin();
             _flags |= SSLWantRead;
             return errSSLWouldBlock;
         }
+        assert(op == IceInternal::SocketOperationNone);
     }
     catch(const Ice::ConnectionLostException&)
     {
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.h b/cpp/src/IceSSL/SecureTransportTransceiverI.h
index 68280b42503..71a2a6c5f34 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.h
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.h
@@ -17,12 +17,11 @@
 
 #include <Ice/Transceiver.h>
 #include <Ice/Network.h>
-#include <Ice/StreamSocket.h>
-#include <Ice/WSTransceiver.h>
 
 #ifdef ICE_USE_SECURE_TRANSPORT
 
 #include <Security/Security.h>
+#include <Security/SecureTransport.h>
 #include <CoreFoundation/CoreFoundation.h>
 
 namespace IceSSL
@@ -31,23 +30,26 @@ namespace IceSSL
 class ConnectorI;
 class AcceptorI;
 
-class TransceiverI : public IceInternal::Transceiver, public IceInternal::WSTransceiverDelegate
+class TransceiverI : public IceInternal::Transceiver
 {
 public:
 
     virtual IceInternal::NativeInfoPtr getNativeInfo();
 
-    virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&, bool&);
+    virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&);
+#ifdef ICE_CPP11_MAPPING
+    virtual IceInternal::SocketOperation closing(bool, std::exception_ptr);
+#else
     virtual IceInternal::SocketOperation closing(bool, const Ice::LocalException&);
+#endif
     virtual void close();
     virtual IceInternal::SocketOperation write(IceInternal::Buffer&);
-    virtual IceInternal::SocketOperation read(IceInternal::Buffer&, bool&);
+    virtual IceInternal::SocketOperation read(IceInternal::Buffer&);
 
     virtual std::string protocol() const;
     virtual std::string toString() const;
     virtual std::string toDetailedString() const;
     virtual Ice::ConnectionInfoPtr getInfo() const;
-    virtual Ice::ConnectionInfoPtr getWSInfo(const Ice::HeaderDict&) const;
     virtual void checkSendSize(const IceInternal::Buffer&);
     virtual void setBufferSize(int rcvSize, int sndSize);
 
@@ -56,11 +58,9 @@ public:
 
 private:
 
-    TransceiverI(const InstancePtr&, const IceInternal::StreamSocketPtr&, const std::string&, bool);
+    TransceiverI(const InstancePtr&, const IceInternal::TransceiverPtr&, const std::string&, bool);
     virtual ~TransceiverI();
 
-    void fillConnectionInfo(const ConnectionInfoPtr&, std::vector<CertificatePtr>&) const;
-
     friend class ConnectorI;
     friend class AcceptorI;
 
@@ -69,12 +69,13 @@ private:
     const std::string _host;
     const std::string _adapterName;
     const bool _incoming;
-    const IceInternal::StreamSocketPtr _stream;
+    const IceInternal::TransceiverPtr _delegate;
 
     SSLContextRef _ssl;
     SecTrustRef _trust;
+    bool _connected;
     bool _verified;
-    
+
     size_t _buffered;
     enum SSLWantFlags
     {
diff --git a/cpp/src/IceSSL/TrustManager.cpp b/cpp/src/IceSSL/TrustManager.cpp
index 0e60abb5a82..31b42291db3 100644
--- a/cpp/src/IceSSL/TrustManager.cpp
+++ b/cpp/src/IceSSL/TrustManager.cpp
@@ -62,7 +62,7 @@ TrustManager::TrustManager(const Ice::CommunicatorPtr& communicator) :
 }
 
 bool
-TrustManager::verify(const NativeConnectionInfoPtr& info)
+TrustManager::verify(const NativeConnectionInfoPtr& info, const std::string& desc)
 {
     list<list<DistinguishedName> > reject, accept;
 
@@ -139,19 +139,14 @@ TrustManager::verify(const NativeConnectionInfoPtr& info)
             Ice::Trace trace(_communicator->getLogger(), "Security");
             if(info->incoming)
             {
-                trace << "trust manager evaluating client:\n"
-                      << "subject = " << string(subject) << '\n'
-                      << "adapter = " << info->adapterName << '\n'
-                      << "local addr = " << info->localAddress << ":" << info->localPort << '\n'
-                      << "remote addr = " << info->remoteAddress << ":" << info->remotePort;
+                trace << "trust manager evaluating client:\n" << "subject = " << string(subject) << '\n'
+                      << "adapter = " << info->adapterName << '\n';
             }
             else
             {
-                trace << "trust manager evaluating server:\n"
-                      << "subject = " << string(subject) << '\n'
-                      << "local addr = " << info->localAddress << ":" << info->localPort << '\n'
-                      << "remote addr = " << info->remoteAddress << ":" << info->remotePort;
+                trace << "trust manager evaluating server:\n" << "subject = " << string(subject) << '\n';
             }
+            trace << desc;
         }
 
         //
diff --git a/cpp/src/IceSSL/TrustManager.h b/cpp/src/IceSSL/TrustManager.h
index a03c5d2a694..a99363baf05 100644
--- a/cpp/src/IceSSL/TrustManager.h
+++ b/cpp/src/IceSSL/TrustManager.h
@@ -25,7 +25,7 @@ public:
 
     TrustManager(const Ice::CommunicatorPtr&);
 
-    bool verify(const NativeConnectionInfoPtr&);
+    bool verify(const NativeConnectionInfoPtr&, const std::string&);
 
 private:
 
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp
index a60ee4c1e97..ced265c943e 100644..100755
--- a/cpp/src/IceSSL/Util.cpp
+++ b/cpp/src/IceSSL/Util.cpp
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 #include <IceUtil/Config.h>
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(ICE_OS_WINRT)
 #   include <winsock2.h>
 #endif
 
@@ -16,6 +16,7 @@
 #include <IceUtil/FileUtil.h>
 #include <IceUtil/StringUtil.h>
 
+#include <Ice/Base64.h>
 #include <Ice/LocalException.h>
 #include <Ice/Network.h>
 #include <Ice/Object.h>
@@ -33,30 +34,7 @@ using namespace Ice;
 using namespace IceUtil;
 using namespace IceSSL;
 
-void
-IceSSL::readFile(const string& file, vector<char>& buffer)
-{
-    IceUtilInternal::ifstream is(file, ios::in | ios::binary);
-    if(!is.good())
-    {
-        throw CertificateReadException(__FILE__, __LINE__, "error opening file " + file);
-    }
-
-    is.seekg(0, is.end);
-    buffer.resize(static_cast<int>(is.tellg()));
-    is.seekg(0, is.beg);
-
-    if(!buffer.empty())
-    {
-        is.read(&buffer[0], buffer.size());
-        if(!is.good())
-        {
-            throw CertificateReadException(__FILE__, __LINE__, "error reading file " + file);
-        }
-    }
-}
-
-#ifndef ICE_USE_OPENSSL
+#if !defined(ICE_USE_OPENSSL)
 
 namespace
 {
@@ -574,12 +552,14 @@ IceSSL::errorToString(OSStatus status)
 {
     ostringstream os;
     os << "(error: " << status;
+#if defined(ICE_USE_SECURE_TRANSPORT_MACOS)
     CFStringRef s = SecCopyErrorMessageString(status, 0);
     if(s)
     {
         os << " description: " << fromCFString(s);
         CFRelease(s);
     }
+#endif
     os << ")";
     return os.str();
 }
@@ -599,6 +579,7 @@ IceSSL::fromCFString(CFStringRef v)
     return s;
 }
 
+#if defined(ICE_USE_SECURE_TRANSPORT_MACOS)
 CFDictionaryRef
 IceSSL::getCertificateProperty(SecCertificateRef cert, CFTypeRef key)
 {
@@ -622,10 +603,36 @@ IceSSL::getCertificateProperty(SecCertificateRef cert, CFTypeRef key)
     CFRelease(values);
     return property;
 }
+#endif
 
 namespace
 {
 
+CFDataRef
+readCertFile(const string& file)
+{
+    IceUtilInternal::ifstream is(file, ios::in | ios::binary);
+    if(!is.good())
+    {
+        throw CertificateReadException(__FILE__, __LINE__, "error opening file " + file);
+    }
+
+    is.seekg(0, is.end);
+    size_t size = is.tellg();
+    is.seekg(0, is.beg);
+
+    CFMutableDataRef data = CFDataCreateMutable(kCFAllocatorDefault, size);
+    CFDataSetLength(data, size);
+    is.read(reinterpret_cast<char*>(CFDataGetMutableBytePtr(data)), size);
+    if(!is.good())
+    {
+        CFRelease(data);
+        throw CertificateReadException(__FILE__, __LINE__, "error reading file " + file);
+    }
+    return data;
+}
+
+#if defined(ICE_USE_SECURE_TRANSPORT_MACOS)
 //
 // Check the certificate basic constraints to check if the certificate is marked as a CA.
 //
@@ -657,12 +664,7 @@ CFArrayRef
 loadKeychainItems(const string& file, SecExternalItemType type, SecKeychainRef keychain, const string& passphrase,
                   const PasswordPromptPtr& prompt, int retryMax)
 {
-    vector<char> buffer;
-    readFile(file, buffer);
-    UniqueRef<CFDataRef> data(CFDataCreateWithBytesNoCopy(kCFAllocatorDefault,
-                                                          reinterpret_cast<const UInt8*>(&buffer[0]),
-                                                          buffer.size(),
-                                                          kCFAllocatorNull));
+    UniqueRef<CFDataRef> data(readCertFile(file));
 
     SecItemImportExportKeyParameters params;
     memset(&params, 0, sizeof(params));
@@ -742,14 +744,93 @@ loadKeychainItems(const string& file, SecExternalItemType type, SecKeychainRef k
     return items;
 }
 
+SecKeychainRef
+openKeychain(const std::string& path, const std::string& keychainPassword)
+{
+    string keychainPath = path;
+    SecKeychainRef keychain = 0;
+    OSStatus err = 0;
+    if(keychainPath.empty())
+    {
+        if((err = SecKeychainCopyDefault(&keychain)))
+        {
+            throw PluginInitializationException(__FILE__, __LINE__,
+                                                "IceSSL: unable to retrieve default keychain:\n" + errorToString(err));
+        }
+    }
+    else
+    {
+        //
+        // KeyChain path is relative to the current working directory.
+        //
+        if(!IceUtilInternal::isAbsolutePath(keychainPath))
+        {
+            string cwd;
+            if(IceUtilInternal::getcwd(cwd) == 0)
+            {
+                keychainPath = string(cwd) + '/' + keychainPath;
+            }
+        }
+
+        if((err = SecKeychainOpen(keychainPath.c_str(), &keychain)))
+        {
+            throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: unable to open keychain: `" +
+                                                keychainPath + "'\n" + errorToString(err));
+        }
+    }
+
+    UniqueRef<SecKeychainRef> k(keychain);
+
+    SecKeychainStatus status;
+    err = SecKeychainGetStatus(keychain, &status);
+    if(err == noErr)
+    {
+        const char* pass = keychainPassword.empty() ? 0 : keychainPassword.c_str();
+        if((err = SecKeychainUnlock(keychain, keychainPassword.size(), pass, pass != 0)))
+        {
+            throw PluginInitializationException(__FILE__, __LINE__,
+                                                "IceSSL: unable to unlock keychain:\n" + errorToString(err));
+        }
+    }
+    else if(err == errSecNoSuchKeychain)
+    {
+        const char* pass = keychainPassword.empty() ? 0 : keychainPassword.c_str();
+        if((err = SecKeychainCreate(keychainPath.c_str(), keychainPassword.size(), pass, pass == 0, 0, &keychain)))
+        {
+            throw PluginInitializationException(__FILE__, __LINE__,
+                                                "IceSSL: unable to create keychain:\n" + errorToString(err));
+        }
+        k.reset(keychain);
+    }
+    else
+    {
+        throw PluginInitializationException(__FILE__, __LINE__,
+                                            "IceSSL: unable to open keychain:\n" + errorToString(err));
+    }
+
+    //
+    // Set keychain settings to avoid keychain lock.
+    //
+    SecKeychainSettings settings;
+    settings.version = SEC_KEYCHAIN_SETTINGS_VERS1;
+    settings.lockOnSleep = FALSE;
+    settings.useLockInterval = FALSE;
+    settings.lockInterval = INT_MAX;
+    if((err = SecKeychainSetSettings(keychain, &settings)))
+    {
+        throw PluginInitializationException(__FILE__, __LINE__,
+                                            "IceSSL: error setting keychain settings:\n" + errorToString(err));
+    }
+
+    return k.release();
 }
 
 //
 // Imports a certificate private key and optionally add it to a keychain.
 //
 SecIdentityRef
-IceSSL::loadPrivateKey(const string& file, SecCertificateRef cert, SecKeychainRef keychain, const string& password,
-                       const PasswordPromptPtr& prompt, int retryMax)
+loadPrivateKey(const string& file, SecCertificateRef cert, SecKeychainRef keychain, const string& password,
+               const PasswordPromptPtr& prompt, int retryMax)
 {
     //
     // Check if we already imported the certificate
@@ -902,17 +983,139 @@ IceSSL::loadPrivateKey(const string& file, SecCertificateRef cert, SecKeychainRe
     }
     return identity;
 }
+#else
+
+CFArrayRef
+loadCerts(const string& file)
+{
+    UniqueRef<CFMutableArrayRef> certs(CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks));
+    if(file.find(".pem") != string::npos)
+    {
+        vector<char> buffer;
+        readFile(file, buffer);
+        string strbuf(buffer.begin(), buffer.end());
+        string::size_type size, startpos, endpos = 0;
+        bool first = true;
+        while(true)
+        {
+            startpos = strbuf.find("-----BEGIN CERTIFICATE-----", endpos);
+            if(startpos != string::npos)
+            {
+                startpos += sizeof("-----BEGIN CERTIFICATE-----");
+                endpos = strbuf.find("-----END CERTIFICATE-----", startpos);
+                if(endpos == string::npos)
+                {
+                    InitializationException ex(__FILE__, __LINE__);
+                    ex.reason = "IceSSL: certificate " + file + " is not a valid PEM-encoded certificate";
+                    throw ex;
+                }
+                size = endpos - startpos;
+            }
+            else if(first)
+            {
+                startpos = 0;
+                endpos = string::npos;
+                size = strbuf.size();
+            }
+            else
+            {
+                break;
+            }
+
+            vector<unsigned char> data(IceInternal::Base64::decode(string(&buffer[startpos], size)));
+            UniqueRef<CFDataRef> certdata(CFDataCreate(kCFAllocatorDefault, &data[0], data.size()));
+            SecCertificateRef cert = SecCertificateCreateWithData(0, certdata.get());
+            if(!cert)
+            {
+                InitializationException ex(__FILE__, __LINE__);
+                ex.reason = "IceSSL: certificate " + file + " is not a valid PEM-encoded certificate";
+                throw ex;
+            }
+            CFArrayAppendValue(certs.get(), cert);
+            CFRelease(cert);
+            first = false;
+        }
+    }
+    else
+    {
+        UniqueRef<CFDataRef> data(readCertFile(file));
+        SecCertificateRef cert = SecCertificateCreateWithData(0, data.get());
+        if(!cert)
+        {
+            InitializationException ex(__FILE__, __LINE__);
+            ex.reason = "IceSSL: certificate " + file + " is not a valid DER-encoded certificate";
+            throw ex;
+        }
+        CFArrayAppendValue(certs.get(), cert);
+        CFRelease(cert);
+    }
+    return certs.release();
+}
+#endif
+
+}
 
 //
 // Imports a certificate (it might contain an identity or certificate depending on the format).
 //
 CFArrayRef
-IceSSL::loadCertificateChain(const string& file, const string& keyFile, SecKeychainRef keychain,
-                             const string& password, const PasswordPromptPtr& prompt, int retryMax)
+IceSSL::loadCertificateChain(const string& file, const string& keyFile, const std::string& keychainPath,
+                             const string& keychainPassword, const string& password, const PasswordPromptPtr& prompt,
+                             int retryMax)
 {
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+    UniqueRef<CFDataRef> cert(readCertFile(file));
+
+    UniqueRef<CFMutableDictionaryRef> settings(CFDictionaryCreateMutable(0, 1, &kCFTypeDictionaryKeyCallBacks,
+                                                                               &kCFTypeDictionaryValueCallBacks));
+    CFArrayRef items = 0;
+    OSStatus err;
+    if(password.empty() && prompt)
+    {
+        int count = 0;
+        do
+        {
+            UniqueRef<CFStringRef> pass(toCFString(prompt->getPassword()));
+            CFDictionarySetValue(settings.get(), kSecImportExportPassphrase, pass.get());
+            err = SecPKCS12Import(cert.get(), settings.get(), &items);
+            ++count;
+        }
+        while(err == errSecAuthFailed && count < retryMax);
+    }
+    else
+    {
+        UniqueRef<CFStringRef> pass(toCFString(password));
+        CFDictionarySetValue(settings.get(), kSecImportExportPassphrase, pass.get());
+        err = SecPKCS12Import(cert.get(), settings.get(), &items);
+    }
+    if(err != noErr)
+    {
+        ostringstream os;
+        os << "IceSSL: unable to import certificate from file " << file << " (error = " << err << ")";
+        throw InitializationException(__FILE__, __LINE__, os.str());
+    }
+
+    UniqueRef<CFArrayRef> itemsHolder(items);;
+    for(int i = 0; i < CFArrayGetCount(items); ++i)
+    {
+        CFDictionaryRef dict = (CFDictionaryRef)CFArrayGetValueAtIndex(items, i);
+        SecIdentityRef identity = (SecIdentityRef)CFDictionaryGetValue(dict, kSecImportItemIdentity);
+        if(identity)
+        {
+            CFArrayRef certs = (CFArrayRef)CFDictionaryGetValue(dict, kSecImportItemCertChain);
+            CFMutableArrayRef a = CFArrayCreateMutableCopy(kCFAllocatorDefault, 0, certs);
+            CFArraySetValueAtIndex(a, 0, identity);
+            return a;
+        }
+    }
+    ostringstream os;
+    os << "IceSSL: couldn't find identity in file " << file;
+    throw InitializationException(__FILE__, __LINE__, os.str());
+#else
+    UniqueRef<SecKeychainRef> keychain(openKeychain(keychainPath, keychainPassword));
     if(keyFile.empty())
     {
-        return loadKeychainItems(file, kSecItemTypeUnknown, keychain, password, prompt, retryMax);
+        return loadKeychainItems(file, kSecItemTypeUnknown, keychain.get(), password, prompt, retryMax);
     }
     else
     {
@@ -934,26 +1137,37 @@ IceSSL::loadCertificateChain(const string& file, const string& keyFile, SecKeych
         // add the certificate/key to the keychain if they aren't
         // already present in the keychain.
         //
-        UniqueRef<SecIdentityRef> identity(loadPrivateKey(keyFile, cert, keychain, password, prompt, retryMax));
+        UniqueRef<SecIdentityRef> identity(loadPrivateKey(keyFile, cert, keychain.get(), password, prompt, retryMax));
         CFMutableArrayRef a = CFArrayCreateMutableCopy(kCFAllocatorDefault, 0, items.get());
         CFArraySetValueAtIndex(a, 0, identity.get());
         return a;
     }
+#endif
 }
 
 SecCertificateRef
 IceSSL::loadCertificate(const string& file)
 {
-    CFArrayRef items = loadKeychainItems(file, kSecItemTypeCertificate, 0, "", 0, 0);
-    SecCertificateRef cert = (SecCertificateRef)CFArrayGetValueAtIndex(items, 0);
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+    UniqueRef<CFArrayRef> certs(loadCerts(file));
+    assert(CFArrayGetCount(certs.get()) > 0);
+    SecCertificateRef cert = (SecCertificateRef)CFArrayGetValueAtIndex(certs.get(), 0);
+    CFRetain(cert);
+    return cert;
+#else
+    UniqueRef<CFArrayRef> items(loadKeychainItems(file, kSecItemTypeCertificate, 0, "", 0, 0));
+    SecCertificateRef cert = (SecCertificateRef)CFArrayGetValueAtIndex(items.get(), 0);
     CFRetain(cert);
-    CFRelease(items);
     return cert;
+#endif
 }
 
 CFArrayRef
 IceSSL::loadCACertificates(const string& file)
 {
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+    return loadCerts(file);
+#else
     UniqueRef<CFArrayRef> items(loadKeychainItems(file, kSecItemTypeCertificate, 0, "", 0, 0));
     CFMutableArrayRef certificateAuthorities = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);
     int count = CFArrayGetCount(items.get());
@@ -967,10 +1181,11 @@ IceSSL::loadCACertificates(const string& file)
         }
     }
     return certificateAuthorities;
+#endif
 }
 
-SecCertificateRef
-IceSSL::findCertificate(SecKeychainRef keychain, const string& value)
+CFArrayRef
+IceSSL::findCertificateChain(const std::string& keychainPath, const std::string& keychainPassword, const string& value)
 {
     //
     //  Search the keychain using key:value pairs. The following keys are supported:
@@ -987,17 +1202,20 @@ IceSSL::findCertificate(SecKeychainRef keychain, const string& value)
                                                                       &kCFTypeDictionaryKeyCallBacks,
                                                                       &kCFTypeDictionaryValueCallBacks));
 
-    const void* values[] = { keychain };
+#if defined(ICE_USE_SECURE_TRANSPORT_MACOS)
+    UniqueRef<SecKeychainRef> keychain(openKeychain(keychainPath, keychainPassword));
+    const void* values[] = { keychain.get() };
     UniqueRef<CFArrayRef> searchList(CFArrayCreate(kCFAllocatorDefault, values, 1, &kCFTypeArrayCallBacks));
-
-    CFDictionarySetValue(query.get(), kSecMatchLimit, kSecMatchLimitOne);
     CFDictionarySetValue(query.get(), kSecMatchSearchList, searchList.get());
+#endif
+    CFDictionarySetValue(query.get(), kSecMatchLimit, kSecMatchLimitOne);
     CFDictionarySetValue(query.get(), kSecClass, kSecClassCertificate);
     CFDictionarySetValue(query.get(), kSecReturnRef, kCFBooleanTrue);
     CFDictionarySetValue(query.get(), kSecMatchCaseInsensitive, kCFBooleanTrue);
 
     size_t start = 0;
     size_t pos;
+    bool valid = false;
     while((pos = value.find(':', start)) != string::npos)
     {
         string field = IceUtilInternal::toUpper(IceUtilInternal::trim(value.substr(start, pos - start)));
@@ -1057,6 +1275,7 @@ IceSSL::findCertificate(SecKeychainRef keychain, const string& value)
         {
             UniqueRef<CFStringRef> v(toCFString(arg));
             CFDictionarySetValue(query.get(), field == "LABEL" ? kSecAttrLabel : kSecMatchSubjectContains, v.get());
+            valid = true;
         }
         else if(field == "SUBJECTKEYID" || field == "SERIAL")
         {
@@ -1068,10 +1287,11 @@ IceSSL::findCertificate(SecKeychainRef keychain, const string& value)
             UniqueRef<CFDataRef> v(CFDataCreate(kCFAllocatorDefault, &buffer[0], buffer.size()));
             CFDictionarySetValue(query.get(), field == "SUBJECTKEYID" ? kSecAttrSubjectKeyID : kSecAttrSerialNumber,
                                  v.get());
+            valid = true;
         }
     }
 
-    if(CFDictionaryGetCount(query.get()) == 5)
+    if(!valid)
     {
         throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: invalid value `" + value + "'");
     }
@@ -1083,7 +1303,92 @@ IceSSL::findCertificate(SecKeychainRef keychain, const string& value)
         throw PluginInitializationException(__FILE__, __LINE__,
                                             "IceSSL: find certificate `" + value + "' failed:\n" + errorToString(err));
     }
-    return cert;
+
+    UniqueRef<SecCertificateRef> certHolder(cert);
+
+    //
+    // Retrieve the certificate chain
+    //
+    UniqueRef<SecPolicyRef> policy(SecPolicyCreateSSL(true, 0));
+    SecTrustRef trust = 0;
+    err = SecTrustCreateWithCertificates((CFArrayRef)cert, policy.get(), &trust);
+    if(err || !trust)
+    {
+        throw PluginInitializationException(__FILE__, __LINE__,
+                                            "IceSSL: error creating trust object" +
+                                            (err ? ":\n" + errorToString(err) : ""));
+    }
+    UniqueRef<SecTrustRef> v(trust);
+
+    SecTrustResultType trustResult;
+    if((err = SecTrustEvaluate(trust, &trustResult)))
+    {
+        throw PluginInitializationException(__FILE__, __LINE__,
+                                            "IceSSL: error evaluating trust:\n" + errorToString(err));
+    }
+
+    int chainLength = SecTrustGetCertificateCount(trust);
+    CFMutableArrayRef items = CFArrayCreateMutable(kCFAllocatorDefault, chainLength, &kCFTypeArrayCallBacks);
+    UniqueRef<CFMutableArrayRef> itemsHolder(items);
+    for(int i = 0; i < chainLength; ++i)
+    {
+        CFArrayAppendValue(items, SecTrustGetCertificateAtIndex(trust, i));
+    }
+
+    //
+    // Replace the first certificate in the chain with the
+    // identity.
+    //
+    SecIdentityRef identity;
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+
+    //
+    // SecIdentityCreateWithCertificate isn't supported on iOS so we lookup the identity
+    // using the certicate label. If the user added the identity with SecItemAdd the
+    // identity has the same label as the certificate.
+    //
+    query.reset(CFDictionaryCreateMutable(0, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+    CFDictionarySetValue(query.get(), kSecClass, kSecClassCertificate);
+    CFDictionarySetValue(query.get(), kSecValueRef, cert);
+    CFDictionarySetValue(query.get(), kSecReturnAttributes, kCFBooleanTrue);
+    CFDictionaryRef attributes;
+    err = SecItemCopyMatching(query.get(), (CFTypeRef*)&attributes);
+    if(err != noErr)
+    {
+        ostringstream os;
+        os << "IceSSL: couldn't create identity for certificate found in the keychain:\n" << errorToString(err);
+        throw PluginInitializationException(__FILE__, __LINE__, os.str());
+    }
+    UniqueRef<CFDictionaryRef> attributesHolder(attributes);
+
+    // Now lookup the identity with the label
+    query.reset(CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+    CFDictionarySetValue(query.get(), kSecMatchLimit, kSecMatchLimitOne);
+    CFDictionarySetValue(query.get(), kSecClass, kSecClassIdentity);
+    CFDictionarySetValue(query.get(), kSecAttrLabel, (CFDataRef)CFDictionaryGetValue(attributes, kSecAttrLabel));
+    CFDictionarySetValue(query.get(), kSecReturnRef, kCFBooleanTrue);
+    err = SecItemCopyMatching(query.get(), (CFTypeRef*)&identity);
+    if(err == noErr)
+    {
+        SecCertificateRef cert2 = NULL;
+        if((err = SecIdentityCopyCertificate(identity, &cert2)) == noErr)
+        {
+            err = CFEqual(cert2, cert) ? noErr : errSecItemNotFound;
+            CFRelease(cert2);
+        }
+    }
+#else
+    err = SecIdentityCreateWithCertificate(keychain.get(), cert, &identity);
+#endif
+    if(err != noErr)
+    {
+        ostringstream os;
+        os << "IceSSL: couldn't create identity for certificate found in the keychain:\n" << errorToString(err);
+        throw PluginInitializationException(__FILE__, __LINE__, os.str());
+    }
+    CFArraySetValueAtIndex(items, 0, identity);
+    CFRelease(identity);
+    return itemsHolder.release();
 }
 
 #elif defined(ICE_USE_SCHANNEL)
@@ -1346,9 +1651,55 @@ IceSSL::findCertificates(const string& location, const string& name, const strin
 }
 #endif
 
+void
+IceSSL::readFile(const string& file, vector<char>& buffer)
+{
+    IceUtilInternal::ifstream is(file, ios::in | ios::binary);
+    if(!is.good())
+    {
+        throw CertificateReadException(__FILE__, __LINE__, "error opening file " + file);
+    }
+
+    is.seekg(0, is.end);
+    buffer.resize(static_cast<int>(is.tellg()));
+    is.seekg(0, is.beg);
+
+    if(!buffer.empty())
+    {
+        is.read(&buffer[0], buffer.size());
+        if(!is.good())
+        {
+            throw CertificateReadException(__FILE__, __LINE__, "error reading file " + file);
+        }
+    }
+}
+
 bool
 IceSSL::checkPath(const string& path, const string& defaultDir, bool dir, string& resolved)
 {
+#if defined(ICE_USE_SECURE_TRANSPORT_IOS)
+    CFURLRef url = 0;
+    CFBundleRef bundle = CFBundleGetMainBundle();
+    if(bundle)
+    {
+        CFStringRef resourceName = toCFString(path);
+        CFStringRef subDirName = toCFString(defaultDir);
+        url = CFBundleCopyResourceURL(bundle, resourceName, 0, subDirName);
+        CFRelease(resourceName);
+        CFRelease(subDirName);
+
+        UInt8 filePath[PATH_MAX];
+        if(CFURLGetFileSystemRepresentation(url, true, filePath, sizeof(filePath)))
+        {
+            string tmp = string(reinterpret_cast<char*>(filePath));
+            if((dir && IceUtilInternal::directoryExists(tmp)) || (!dir && IceUtilInternal::fileExists(tmp)))
+            {
+                resolved = tmp;
+                return true;
+            }
+        }
+    }
+#endif
     if(IceUtilInternal::isAbsolutePath(path))
     {
         if((dir && IceUtilInternal::directoryExists(path)) || (!dir && IceUtilInternal::fileExists(path)))
diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h
index 855e0ac71b8..3e98050ee35 100644
--- a/cpp/src/IceSSL/Util.h
+++ b/cpp/src/IceSSL/Util.h
@@ -150,27 +150,23 @@ toCFString(const std::string& s)
 std::string errorToString(CFErrorRef);
 std::string errorToString(OSStatus);
 
+#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
 //
 // Retrieve a certificate property
 //
 CFDictionaryRef getCertificateProperty(SecCertificateRef, CFTypeRef);
-
-//
-// Read a private key from an file and associate it to the given certificate.
-//
-SecIdentityRef loadPrivateKey(const std::string&, SecCertificateRef, SecKeychainRef, const std::string&,
-                              const PasswordPromptPtr&, int);
+#endif
 
 //
 // Read certificate from a file.
 //
-CFArrayRef loadCertificateChain(const std::string&, const std::string&, SecKeychainRef, const std::string&,
-                                const PasswordPromptPtr&, int);
+CFArrayRef loadCertificateChain(const std::string&, const std::string&, const std::string&, const std::string&,
+                                const std::string&, const PasswordPromptPtr&, int);
 
 SecCertificateRef loadCertificate(const std::string&);
 CFArrayRef loadCACertificates(const std::string&);
 
-SecCertificateRef findCertificate(SecKeychainRef, const std::string&);
+CFArrayRef findCertificateChain(const std::string&, const std::string&, const std::string&);
 
 #elif defined(ICE_USE_SCHANNEL)
 std::vector<PCCERT_CONTEXT>
diff --git a/cpp/src/IceSSL/WinRTEngine.cpp b/cpp/src/IceSSL/WinRTEngine.cpp
new file mode 100755
index 00000000000..a6dc675c581
--- /dev/null
+++ b/cpp/src/IceSSL/WinRTEngine.cpp
@@ -0,0 +1,43 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceSSL/Config.h>
+
+#ifdef ICE_OS_WINRT
+
+#include <IceSSL/SSLEngine.h>
+#include <IceUtil/Shared.h>
+
+IceUtil::Shared* IceSSL::upCast(IceSSL::WinRTEngine* p) { return p; }
+
+using namespace IceSSL;
+
+WinRTEngine::WinRTEngine(const Ice::CommunicatorPtr& communicator) : SSLEngine(communicator)
+{
+
+}
+
+void
+WinRTEngine::initialize()
+{
+}
+
+bool
+WinRTEngine::initialized() const
+{
+    return true;
+}
+
+void
+WinRTEngine::destroy()
+{
+}
+
+#endif
+
diff --git a/cpp/src/IceSSL/WinRTTransceiverI.cpp b/cpp/src/IceSSL/WinRTTransceiverI.cpp
new file mode 100755
index 00000000000..5c7058a3d31
--- /dev/null
+++ b/cpp/src/IceSSL/WinRTTransceiverI.cpp
@@ -0,0 +1,199 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceSSL/Config.h>
+
+#ifdef ICE_OS_WINRT
+
+#include <IceSSL/WinRTTransceiverI.h>
+#include <IceSSL/Instance.h>
+#include <IceSSL/SSLEngine.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceSSL;
+
+using namespace Platform;
+using namespace Windows::Networking;
+using namespace Windows::Networking::Sockets;
+
+IceInternal::NativeInfoPtr
+IceSSL::TransceiverI::getNativeInfo()
+{
+    return _delegate->getNativeInfo();
+}
+
+IceInternal::SocketOperation
+IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& writeBuffer)
+{
+    if(!_connected)
+    {
+        IceInternal::SocketOperation status = _delegate->initialize(readBuffer, writeBuffer);
+        if(status != IceInternal::SocketOperationNone)
+        {
+            return status;
+        }
+        _connected = true;
+
+        //
+        // Continue connecting, this will call startWrite/finishWrite to upgrade the stream
+        // to SSL.
+        //
+        return IceInternal::SocketOperationConnect;
+    }
+    else if(!_upgraded)
+    {
+        _upgraded = true;
+    }
+    return IceInternal::SocketOperationNone;
+}
+
+IceInternal::SocketOperation
+#ifdef ICE_CPP11_MAPPING
+IceSSL::TransceiverI::closing(bool initiator, exception_ptr ex)
+#else
+IceSSL::TransceiverI::closing(bool initiator, const Ice::LocalException& ex)
+#endif
+{
+    return _delegate->closing(initiator, ex);
+}
+
+void
+IceSSL::TransceiverI::close()
+{
+    _delegate->close();
+}
+
+IceInternal::SocketOperation
+IceSSL::TransceiverI::write(IceInternal::Buffer& buf)
+{
+    return _delegate->write(buf);
+}
+
+IceInternal::SocketOperation
+IceSSL::TransceiverI::read(IceInternal::Buffer& buf)
+{
+    return _delegate->read(buf);
+}
+
+bool
+IceSSL::TransceiverI::startWrite(IceInternal::Buffer& buf)
+{
+    if(_connected && !_upgraded)
+    {
+        StreamSocket^ stream = safe_cast<StreamSocket^>(_delegate->getNativeInfo()->fd());
+        HostName^ host = ref new HostName(ref new String(IceUtil::stringToWstring(_host).c_str()));
+        try
+        {
+            Windows::Foundation::IAsyncAction^ action = stream->UpgradeToSslAsync(SocketProtectionLevel::Tls12, host);
+            getNativeInfo()->queueAction(IceInternal::SocketOperationWrite, action);
+        }
+        catch(Platform::Exception^ ex)
+        {
+            IceInternal::checkErrorCode(__FILE__, __LINE__, ex->HResult);
+        }
+        return true;
+    }
+    return _delegate->startWrite(buf);
+}
+
+void
+IceSSL::TransceiverI::finishWrite(IceInternal::Buffer& buf)
+{
+    if(_connected && !_upgraded)
+    {
+        IceInternal::AsyncInfo* asyncInfo = getNativeInfo()->getAsyncInfo(IceInternal::SocketOperationWrite);
+        if(asyncInfo->count == SOCKET_ERROR)
+        {
+            IceInternal::checkErrorCode(__FILE__, __LINE__, asyncInfo->error);
+        }
+        return;
+    }
+    _delegate->finishWrite(buf);
+}
+
+void
+IceSSL::TransceiverI::startRead(IceInternal::Buffer& buf)
+{
+    _delegate->startRead(buf);
+}
+
+void
+IceSSL::TransceiverI::finishRead(IceInternal::Buffer& buf)
+{
+    _delegate->finishRead(buf);
+}
+
+string
+IceSSL::TransceiverI::protocol() const
+{
+    return _instance->protocol();
+}
+
+string
+IceSSL::TransceiverI::toString() const
+{
+    return _delegate->toString();
+}
+
+string
+IceSSL::TransceiverI::toDetailedString() const
+{
+    return toString();
+}
+
+Ice::ConnectionInfoPtr
+IceSSL::TransceiverI::getInfo() const
+{
+    NativeConnectionInfoPtr info = ICE_MAKE_SHARED(NativeConnectionInfo);
+    StreamSocket^ stream = safe_cast<StreamSocket^>(_delegate->getNativeInfo()->fd());
+    info->nativeCerts.push_back(ICE_MAKE_SHARED(Certificate, stream->Information->ServerCertificate));
+    info->certs.push_back(info->nativeCerts.back()->encode());
+    for(auto iter = stream->Information->ServerIntermediateCertificates->First(); iter->HasCurrent; iter->MoveNext())
+    {
+        info->nativeCerts.push_back(ICE_MAKE_SHARED(Certificate, iter->Current));
+        info->certs.push_back(info->nativeCerts.back()->encode());
+    }
+    info->adapterName = _adapterName;
+    info->incoming = _incoming;
+    info->underlying = _delegate->getInfo();
+    return info;
+}
+
+void
+IceSSL::TransceiverI::checkSendSize(const IceInternal::Buffer&)
+{
+}
+
+void
+IceSSL::TransceiverI::setBufferSize(int rcvSize, int sndSize)
+{
+    _delegate->setBufferSize(rcvSize, sndSize);
+}
+
+IceSSL::TransceiverI::TransceiverI(const InstancePtr& instance,
+                                   const IceInternal::TransceiverPtr& delegate,
+                                   const string& hostOrAdapterName,
+                                   bool incoming) :
+    _instance(instance),
+    _engine(WinRTEnginePtr::dynamicCast(instance->engine())),
+    _host(incoming ? "" : hostOrAdapterName),
+    _adapterName(incoming ? hostOrAdapterName : ""),
+    _incoming(incoming),
+    _delegate(delegate),
+    _connected(false),
+    _upgraded(false)
+{
+}
+
+IceSSL::TransceiverI::~TransceiverI()
+{
+}
+
+#endif
diff --git a/cpp/src/IceSSL/WinRTTransceiverI.h b/cpp/src/IceSSL/WinRTTransceiverI.h
new file mode 100755
index 00000000000..d3994eb359a
--- /dev/null
+++ b/cpp/src/IceSSL/WinRTTransceiverI.h
@@ -0,0 +1,81 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_SSL_WINRT_TRANSCEIVER_I_H
+#define ICE_SSL_WINRT_TRANSCEIVER_I_H
+
+#include <IceSSL/Config.h>
+
+#ifdef ICE_OS_WINRT
+
+#include <IceSSL/InstanceF.h>
+#include <IceSSL/SSLEngineF.h>
+#include <IceSSL/Plugin.h>
+
+#include <Ice/Transceiver.h>
+#include <Ice/Network.h>
+
+namespace IceSSL
+{
+
+class ConnectorI;
+class AcceptorI;
+
+class TransceiverI : public IceInternal::Transceiver
+{
+public:
+
+    virtual IceInternal::NativeInfoPtr getNativeInfo();
+
+    virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&);
+#ifdef ICE_CPP11_MAPPING
+    virtual IceInternal::SocketOperation closing(bool, std::exception_ptr);
+#else
+    virtual IceInternal::SocketOperation closing(bool, const Ice::LocalException&);
+#endif
+    virtual void close();
+    virtual IceInternal::SocketOperation write(IceInternal::Buffer&);
+    virtual IceInternal::SocketOperation read(IceInternal::Buffer&);
+    virtual bool startWrite(IceInternal::Buffer&);
+    virtual void finishWrite(IceInternal::Buffer&);
+    virtual void startRead(IceInternal::Buffer&);
+    virtual void finishRead(IceInternal::Buffer&);
+
+    virtual std::string protocol() const;
+    virtual std::string toString() const;
+    virtual std::string toDetailedString() const;
+    virtual Ice::ConnectionInfoPtr getInfo() const;
+    virtual void checkSendSize(const IceInternal::Buffer&);
+    virtual void setBufferSize(int rcvSize, int sndSize);
+
+private:
+
+    TransceiverI(const InstancePtr&, const IceInternal::TransceiverPtr&, const std::string&, bool);
+    virtual ~TransceiverI();
+
+    friend class ConnectorI;
+    friend class AcceptorI;
+
+    const InstancePtr _instance;
+    const WinRTEnginePtr _engine;
+    const std::string _host;
+    const std::string _adapterName;
+    const bool _incoming;
+    const IceInternal::TransceiverPtr _delegate;
+
+    bool _connected;
+    bool _upgraded;
+};
+typedef IceUtil::Handle<TransceiverI> TransceiverIPtr;
+
+}
+
+#endif
+
+#endif
diff --git a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj
new file mode 100644
index 00000000000..046de28a09a
--- /dev/null
+++ b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5923B17D-2873-4245-87A7-FB8F4BE12501}</ProjectGuid>
+    <RootNamespace>IceSSL</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceSSL</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderDLLExport>ICE_SSL_API</IceBuilderDLLExport>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceSSL.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceSSL\ConnectionInfo.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceSSL\EndpointInfo.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\AcceptorI.cpp" />
+    <ClCompile Include="..\..\Certificate.cpp" />
+    <ClCompile Include="..\..\ConnectorI.cpp" />
+    <ClCompile Include="..\..\EndpointI.cpp" />
+    <ClCompile Include="..\..\Instance.cpp" />
+    <ClCompile Include="..\..\PluginI.cpp" />
+    <ClCompile Include="..\..\RFC2253.cpp" />
+    <ClCompile Include="..\..\SChannelEngine.cpp" />
+    <ClCompile Include="..\..\SChannelTransceiverI.cpp" />
+    <ClCompile Include="..\..\SSLEngine.cpp" />
+    <ClCompile Include="..\..\TrustManager.cpp" />
+    <ClCompile Include="..\..\Util.cpp" />
+    <ClCompile Include="Win32\Debug\ConnectionInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ConnectionInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ConnectionInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ConnectionInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceSSL\ConnectionInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceSSL\EndpointInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceSSL\ConnectionInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceSSL\EndpointInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceSSL\ConnectionInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceSSL\EndpointInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceSSL\ConnectionInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceSSL\EndpointInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceSSL\Config.h" />
+    <ClInclude Include="..\..\..\..\include\IceSSL\IceSSL.h" />
+    <ClInclude Include="..\..\..\..\include\IceSSL\Plugin.h" />
+    <ClInclude Include="..\..\AcceptorI.h" />
+    <ClInclude Include="..\..\ConnectorI.h" />
+    <ClInclude Include="..\..\EndpointI.h" />
+    <ClInclude Include="..\..\Instance.h" />
+    <ClInclude Include="..\..\InstanceF.h" />
+    <ClInclude Include="..\..\PluginI.h" />
+    <ClInclude Include="..\..\RFC2253.h" />
+    <ClInclude Include="..\..\SChannelTransceiverI.h" />
+    <ClInclude Include="..\..\SSLEngine.h" />
+    <ClInclude Include="..\..\SSLEngineF.h" />
+    <ClInclude Include="..\..\TrustManager.h" />
+    <ClInclude Include="..\..\TrustManagerF.h" />
+    <ClInclude Include="..\..\Util.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj.filters b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj.filters
new file mode 100644
index 00000000000..b57a4914467
--- /dev/null
+++ b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj.filters
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{4d9f616e-1934-41a2-8ba4-83b5113d1ee9}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{dc46ba85-888a-44c6-a892-02ca81802a4f}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{7f20c422-9df1-492a-8b6f-5dd7f3188a7a}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{9007c33c-0c7e-42bb-8400-baae022a4a6d}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{e9fe80ae-1aff-4267-84d9-1f75b1b573a6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{0f9d0820-dd66-4cea-a839-576ef894e6da}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{85447365-08ad-4445-93c9-5b2d697c26d3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{3970e819-06e0-4ff0-90ae-36e4d3e2599e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{e29283e2-0bcc-4737-ba65-4d7818277667}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{37734e94-4269-46ce-a869-b343baada79c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{799ccbb8-b61f-49d0-ab9b-c35577f4fc90}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{919084ad-57a8-4656-8e9c-7e297ade0cba}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{a9faf6cb-dac5-4226-b78f-e8d540941d95}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{5b553fdf-f103-40de-901e-e625bbac9df6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{4a704c57-97d4-44e6-a7fe-54071c38a0d1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{d5c1d6b6-0241-4fb2-8d58-451aee18ef20}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceSSL.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceSSL\ConnectionInfo.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceSSL\EndpointInfo.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TrustManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SSLEngine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SChannelTransceiverI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SChannelEngine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RFC2253.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PluginI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Instance.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\EndpointI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ConnectorI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Certificate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AcceptorI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ConnectionInfo.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointInfo.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ConnectionInfo.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointInfo.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ConnectionInfo.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointInfo.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ConnectionInfo.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointInfo.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\TrustManagerF.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\TrustManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\SSLEngineF.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\SSLEngine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\SChannelTransceiverI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\RFC2253.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\PluginI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\InstanceF.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Instance.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\EndpointI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ConnectorI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\AcceptorI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceSSL\Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceSSL\IceSSL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceSSL\Plugin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceSSL\ConnectionInfo.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceSSL\EndpointInfo.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceSSL\ConnectionInfo.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceSSL\EndpointInfo.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceSSL\ConnectionInfo.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceSSL\EndpointInfo.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceSSL\ConnectionInfo.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceSSL\EndpointInfo.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj
new file mode 100644
index 00000000000..4826c43666e
--- /dev/null
+++ b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{72FA68A9-49B6-4AB6-94AE-34BB03770A51}</ProjectGuid>
+    <RootNamespace>IceSSL</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceSSL</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderDLLExport>ICE_SSL_API</IceBuilderDLLExport>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceSSL.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceSSL\ConnectionInfo.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceSSL\EndpointInfo.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\AcceptorI.cpp" />
+    <ClCompile Include="..\..\Certificate.cpp" />
+    <ClCompile Include="..\..\ConnectorI.cpp" />
+    <ClCompile Include="..\..\EndpointI.cpp" />
+    <ClCompile Include="..\..\Instance.cpp" />
+    <ClCompile Include="..\..\PluginI.cpp" />
+    <ClCompile Include="..\..\RFC2253.cpp" />
+    <ClCompile Include="..\..\SChannelEngine.cpp" />
+    <ClCompile Include="..\..\SChannelTransceiverI.cpp" />
+    <ClCompile Include="..\..\SSLEngine.cpp" />
+    <ClCompile Include="..\..\TrustManager.cpp" />
+    <ClCompile Include="..\..\Util.cpp" />
+    <ClCompile Include="Win32\Debug\ConnectionInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ConnectionInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ConnectionInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ConnectionInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceSSL\ConnectionInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceSSL\EndpointInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceSSL\ConnectionInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceSSL\EndpointInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceSSL\ConnectionInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceSSL\EndpointInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceSSL\ConnectionInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceSSL\EndpointInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceSSL\Config.h" />
+    <ClInclude Include="..\..\..\..\include\IceSSL\IceSSL.h" />
+    <ClInclude Include="..\..\..\..\include\IceSSL\Plugin.h" />
+    <ClInclude Include="..\..\AcceptorI.h" />
+    <ClInclude Include="..\..\ConnectorI.h" />
+    <ClInclude Include="..\..\EndpointI.h" />
+    <ClInclude Include="..\..\Instance.h" />
+    <ClInclude Include="..\..\InstanceF.h" />
+    <ClInclude Include="..\..\PluginI.h" />
+    <ClInclude Include="..\..\RFC2253.h" />
+    <ClInclude Include="..\..\SChannelTransceiverI.h" />
+    <ClInclude Include="..\..\SSLEngine.h" />
+    <ClInclude Include="..\..\SSLEngineF.h" />
+    <ClInclude Include="..\..\TrustManager.h" />
+    <ClInclude Include="..\..\TrustManagerF.h" />
+    <ClInclude Include="..\..\Util.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj.filters b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj.filters
new file mode 100644
index 00000000000..1365285ff1d
--- /dev/null
+++ b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj.filters
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{0255b63a-660b-4a1c-805f-0abe632c5677}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{956d2580-1d49-4b49-a059-988288782db2}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{e83d242d-b1ea-4c9c-b23c-e89105597587}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{448e5844-aa20-4e5e-8876-57eb2a5cbe2f}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{8fbefc16-ee09-44ab-b2b4-d752bd5377ea}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{9ad49193-c783-4a96-a912-221addf43f04}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{0feba132-cf9d-4d8f-b4d6-20001d1d8ae6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{c0691be0-ad4d-45b0-9b58-ff51634b7abe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{c9a4873d-7104-447e-a4c6-393349a8ff39}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{e34f5387-2c17-4311-b257-1344b9008865}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{c662649c-a902-4c7e-8616-ea54f436eb45}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{9ff83beb-868b-4a94-9b0e-3afc3bab37d6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{2a739cdd-800d-4fb5-b656-2e647b26bd3f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{bf287f75-264e-406d-a75e-b19d15f4a387}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{2d055007-bfcb-4301-8c18-3c394e9d2b71}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{d89224e9-0392-47b3-9a1a-f4b0b186ab08}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceSSL.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceSSL\ConnectionInfo.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceSSL\EndpointInfo.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\TrustManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SSLEngine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SChannelTransceiverI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SChannelEngine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RFC2253.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PluginI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Instance.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\EndpointI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ConnectorI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Certificate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AcceptorI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ConnectionInfo.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointInfo.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ConnectionInfo.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointInfo.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ConnectionInfo.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointInfo.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ConnectionInfo.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointInfo.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\TrustManagerF.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\TrustManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\SSLEngineF.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\SSLEngine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\SChannelTransceiverI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\RFC2253.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\PluginI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\InstanceF.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Instance.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\EndpointI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ConnectorI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\AcceptorI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceSSL\Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceSSL\IceSSL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceSSL\Plugin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceSSL\ConnectionInfo.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceSSL\EndpointInfo.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceSSL\ConnectionInfo.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceSSL\EndpointInfo.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceSSL\ConnectionInfo.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceSSL\EndpointInfo.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceSSL\ConnectionInfo.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceSSL\EndpointInfo.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj
new file mode 100644
index 00000000000..6b376e66034
--- /dev/null
+++ b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4493C7D1-2063-418D-94B5-20A04602C2AA}</ProjectGuid>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WindowsAppContainer>true</WindowsAppContainer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceSSL</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceSSL\ConnectionInfo.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceSSL\EndpointInfo.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\AcceptorI.cpp" />
+    <ClCompile Include="..\..\Certificate.cpp" />
+    <ClCompile Include="..\..\ConnectorI.cpp" />
+    <ClCompile Include="..\..\EndpointI.cpp" />
+    <ClCompile Include="..\..\Instance.cpp" />
+    <ClCompile Include="..\..\PluginI.cpp" />
+    <ClCompile Include="..\..\RFC2253.cpp" />
+    <ClCompile Include="..\..\SSLEngine.cpp" />
+    <ClCompile Include="..\..\TrustManager.cpp" />
+    <ClCompile Include="..\..\Util.cpp" />
+    <ClCompile Include="..\..\WinRTEngine.cpp" />
+    <ClCompile Include="..\..\WinRTTransceiverI.cpp" />
+    <ClCompile Include="ARM\Debug\ConnectionInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\EndpointInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ConnectionInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\EndpointInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\ConnectionInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ConnectionInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ConnectionInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ConnectionInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointInfo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceSSL\ConnectionInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceSSL\EndpointInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceSSL\ConnectionInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceSSL\EndpointInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceSSL\ConnectionInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceSSL\EndpointInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceSSL\ConnectionInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceSSL\EndpointInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceSSL\ConnectionInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceSSL\EndpointInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceSSL\ConnectionInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceSSL\EndpointInfo.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\uwp\AcceptorI.h" />
+    <ClInclude Include="..\..\uwp\ConnectorI.h" />
+    <ClInclude Include="..\..\uwp\EndpointI.h" />
+    <ClInclude Include="..\..\uwp\TransceiverI.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj.filters b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj.filters
new file mode 100644
index 00000000000..17f262f778e
--- /dev/null
+++ b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj.filters
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{26ae403e-fb59-4fd0-9566-afe1b43972db}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{3310f1a2-bb2e-483d-b43b-dc481222864c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{eb8d6254-7941-4cde-9652-586a73c5a62c}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{06dc9a0d-9837-438b-b2ef-ed2f8869d230}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{19c636cf-db9a-413c-96c3-e04655aa094f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{3a138c46-6abb-44bc-a13e-7862660955ce}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{ca42aeb2-052e-4953-b00b-06e23f3eab2e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM">
+      <UniqueIdentifier>{63f1e8a5-9c2a-4a9c-9031-d480b9443d6a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Debug">
+      <UniqueIdentifier>{f1676d59-8f1f-4348-af9a-7933e247c5df}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM">
+      <UniqueIdentifier>{9a4b0cc8-a125-4b7a-8b7b-b3ee8ae75fb9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Debug">
+      <UniqueIdentifier>{ea1b1278-cba6-47ae-b8b3-7150ccee948f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{4aac9631-cd25-447f-a4b6-03e80ade6b47}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{3bc16577-ba96-45bb-a5d4-f54f2f01a6f7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{7c175a6e-5f4a-4723-9ba4-542f4795af5f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{50234365-3f7b-44f7-9653-1fbe9678f6bb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{d757219e-61bd-4c14-af73-071b1f6a550f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{09481f4b-5607-4425-982a-c05119438dba}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Release">
+      <UniqueIdentifier>{eedfe309-1946-4c1d-962b-5df8ca44965f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Release">
+      <UniqueIdentifier>{fc682571-2b8c-4ae2-b820-1a8caeea50ef}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{1d31c81d-814a-4e00-8881-b10ca027ff99}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{b94ddd96-ed9e-4695-abab-bb8b9df3fc3e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceSSL\ConnectionInfo.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceSSL\EndpointInfo.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Win32\Debug\ConnectionInfo.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\EndpointInfo.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\ConnectionInfo.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\EndpointInfo.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\ConnectionInfo.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\EndpointInfo.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\ConnectionInfo.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\EndpointInfo.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\ConnectionInfo.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\EndpointInfo.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\ConnectionInfo.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\EndpointInfo.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ConnectorI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\AcceptorI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\EndpointI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Instance.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SSLEngine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TrustManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\WinRTTransceiverI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PluginI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Certificate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\WinRTEngine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RFC2253.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\uwp\AcceptorI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\uwp\ConnectorI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\uwp\EndpointI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\uwp\TransceiverI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceSSL\ConnectionInfo.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceSSL\EndpointInfo.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceSSL\ConnectionInfo.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceSSL\EndpointInfo.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceSSL\ConnectionInfo.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceSSL\EndpointInfo.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceSSL\ConnectionInfo.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceSSL\EndpointInfo.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceSSL\ConnectionInfo.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceSSL\EndpointInfo.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceSSL\ConnectionInfo.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceSSL\EndpointInfo.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/Ice/winrt/StreamAcceptor.cpp b/cpp/src/IceSSL/uwp/AcceptorI.cpp
index f3363c39822..c7732d5b1c5 100644
--- a/cpp/src/Ice/winrt/StreamAcceptor.cpp
+++ b/cpp/src/IceSSL/uwp/AcceptorI.cpp
@@ -7,9 +7,9 @@
 //
 // **********************************************************************
 
-#include <Ice/winrt/StreamAcceptor.h>
-#include <Ice/winrt/StreamTransceiver.h>
-#include <Ice/winrt/StreamEndpointI.h>
+#include <IceSSL/uwp/AcceptorI.h>
+#include <IceSSL/uwp/TransceiverI.h>
+#include <IceSSL/uwp/EndpointI.h>
 
 #include <Ice/ProtocolInstance.h>
 #include <Ice/LocalException.h>
@@ -20,7 +20,7 @@
 
 using namespace std;
 using namespace Ice;
-using namespace IceInternal;
+using namespace IceSSL;
 
 using namespace Platform;
 using namespace Windows::Foundation;
@@ -28,52 +28,52 @@ using namespace Windows::Storage::Streams;
 using namespace Windows::Networking;
 using namespace Windows::Networking::Sockets;
 
-IceUtil::Shared* IceInternal::upCast(StreamAcceptor* p) { return p; }
+IceUtil::Shared* IceSSL::upCast(AcceptorI* p) { return p; }
 
-NativeInfoPtr
-IceInternal::StreamAcceptor::getNativeInfo()
+IceInternal::NativeInfoPtr
+IceSSL::AcceptorI::getNativeInfo()
 {
     return this;
 }
 
 void
-IceInternal::StreamAcceptor::setCompletedHandler(SocketOperationCompletedHandler^ handler)
+IceSSL::AcceptorI::setCompletedHandler(IceInternal::SocketOperationCompletedHandler^ handler)
 {
     _completedHandler = handler;
 }
 
 void
-IceInternal::StreamAcceptor::close()
+IceSSL::AcceptorI::close()
 {
     IceUtil::Mutex::Lock lock(_mutex);
     if(_acceptPending)
     {
         assert(_accepted.empty());
-        _completedHandler(SocketOperationRead);
+        _completedHandler(IceInternal::SocketOperationRead);
         _acceptPending = false;
     }
     else if(!_accepted.empty())
     {
         for(deque<StreamSocket^>::const_iterator p = _accepted.begin(); p != _accepted.end(); ++p)
         {
-            closeSocket(*p);
+            IceInternal::closeSocket(*p);
         }
         _accepted.clear();
     }
 
     if(_fd != INVALID_SOCKET)
     {
-        closeSocketNoThrow(_fd);
+        IceInternal::closeSocketNoThrow(_fd);
         _fd = INVALID_SOCKET;
     }
 }
 
-EndpointIPtr
-IceInternal::StreamAcceptor::listen()
+IceInternal::EndpointIPtr
+IceSSL::AcceptorI::listen()
 {
     try
     {
-        const_cast<Address&>(_addr) = doBind(_fd, _addr);
+        const_cast<IceInternal::Address&>(_addr) = IceInternal::doBind(_fd, _addr);
     }
     catch(...)
     {
@@ -85,7 +85,7 @@ IceInternal::StreamAcceptor::listen()
 }
 
 void
-IceInternal::StreamAcceptor::startAccept()
+IceSSL::AcceptorI::startAccept()
 {
     assert(_fd != INVALID_SOCKET);
 
@@ -100,7 +100,7 @@ IceInternal::StreamAcceptor::startAccept()
     assert(!_acceptPending);
     if(!_accepted.empty())
     {
-        _completedHandler(SocketOperationRead);
+        _completedHandler(IceInternal::SocketOperationRead);
     }
     else
     {
@@ -109,7 +109,7 @@ IceInternal::StreamAcceptor::startAccept()
 }
 
 void
-IceInternal::StreamAcceptor::finishAccept()
+IceSSL::AcceptorI::finishAccept()
 {
     //
     // Nothing to do, we just check there's at least one accepted
@@ -119,8 +119,8 @@ IceInternal::StreamAcceptor::finishAccept()
     assert(!_acceptPending && (!_accepted.empty() || _fd == INVALID_SOCKET));
 }
 
-TransceiverPtr
-IceInternal::StreamAcceptor::accept()
+IceInternal::TransceiverPtr
+IceSSL::AcceptorI::accept()
 {
     if(_fd == INVALID_SOCKET) // Acceptor closed.
     {
@@ -136,27 +136,27 @@ IceInternal::StreamAcceptor::accept()
         _accepted.pop_front();
     }
 
-    return new StreamTransceiver(_instance, fd, true);
+    return new TransceiverI(_instance, fd, true);
 }
 
 string
-IceInternal::StreamAcceptor::protocol() const
+IceSSL::AcceptorI::protocol() const
 {
     return _instance->protocol();
 }
 
 string
-IceInternal::StreamAcceptor::toString() const
+IceSSL::AcceptorI::toString() const
 {
-    return addrToString(_addr);
+    return IceInternal::addrToString(_addr);
 }
 
 string
-IceInternal::StreamAcceptor::toDetailedString() const
+IceSSL::AcceptorI::toDetailedString() const
 {
     ostringstream os;
     os << "local address = " << toString();
-    vector<string> intfs = getHostsForEndpointExpand(inetAddrToString(_addr), _instance->protocolSupport(), true);
+    vector<string> intfs = IceInternal::getHostsForEndpointExpand(IceInternal::inetAddrToString(_addr), _instance->protocolSupport(), true);
     if(!intfs.empty())
     {
         os << "\nlocal interfaces = ";
@@ -166,15 +166,15 @@ IceInternal::StreamAcceptor::toDetailedString() const
 }
 
 int
-IceInternal::StreamAcceptor::effectivePort() const
+IceSSL::AcceptorI::effectivePort() const
 {
-    return getPort(_addr);
+    return IceInternal::getPort(_addr);
 }
 
-IceInternal::StreamAcceptor::StreamAcceptor(const StreamEndpointIPtr& endpoint,
-                                            const ProtocolInstancePtr& instance,
-                                            const string& host,
-                                            int port) :
+IceSSL::AcceptorI::AcceptorI(const EndpointIPtr& endpoint,
+                             const IceInternal::ProtocolInstancePtr& instance,
+                             const string& host,
+                             int port) :
     _endpoint(endpoint),
     _instance(instance),
     _addr(getAddressForServer(host, port, _instance->protocolSupport(), instance->preferIPv6())),
@@ -190,18 +190,18 @@ IceInternal::StreamAcceptor::StreamAcceptor(const StreamEndpointIPtr& endpoint,
                 });
 }
 
-IceInternal::StreamAcceptor::~StreamAcceptor()
+IceSSL::AcceptorI::~AcceptorI()
 {
     assert(_fd == INVALID_SOCKET);
 }
 
 void
-IceInternal::StreamAcceptor::queueAcceptedSocket(StreamSocket^ socket)
+IceSSL::AcceptorI::queueAcceptedSocket(StreamSocket^ socket)
 {
     IceUtil::Mutex::Lock lock(_mutex);
     if(_fd == INVALID_SOCKET) // Acceptor was closed.
     {
-        closeSocket(socket);
+        IceInternal::closeSocket(socket);
         return;
     }
     _accepted.push_back(socket);
@@ -215,7 +215,7 @@ IceInternal::StreamAcceptor::queueAcceptedSocket(StreamSocket^ socket)
     //
     if(_acceptPending)
     {
-        _completedHandler(SocketOperationRead);
+        _completedHandler(IceInternal::SocketOperationRead);
         _acceptPending = false;
     }
 }
diff --git a/cpp/src/Ice/winrt/StreamAcceptor.h b/cpp/src/IceSSL/uwp/AcceptorI.h
index 8a1fd9d899c..b64b2bde924 100644
--- a/cpp/src/Ice/winrt/StreamAcceptor.h
+++ b/cpp/src/IceSSL/uwp/AcceptorI.h
@@ -7,36 +7,37 @@
 //
 // **********************************************************************
 
-#ifndef ICE_STREAM_ACCEPTOR_H
-#define ICE_STREAM_ACCEPTOR_H
+#ifndef ICE_SSL_UWP_ACCEPTOR_I_H
+#define ICE_SSL_UWP_ACCEPTOR_I_H
 
 #include <Ice/TransceiverF.h>
 #include <Ice/ProtocolInstanceF.h>
 #include <Ice/Acceptor.h>
 #include <Ice/Network.h>
-#include <Ice/winrt/StreamF.h>
+#include <IceSSL/uwp/TransceiverF.h>
 
 #include <IceUtil/Mutex.h>
 
 #include <deque>
 
-namespace IceInternal
+namespace IceSSL
 {
 
-class StreamAcceptor : public Acceptor, public NativeInfo
+class AcceptorI : public IceInternal::Acceptor,
+                  public IceInternal::NativeInfo
 {
 public:
 
-    virtual NativeInfoPtr getNativeInfo();
-    virtual void setCompletedHandler(SocketOperationCompletedHandler^);
+    virtual IceInternal::NativeInfoPtr getNativeInfo();
+    virtual void setCompletedHandler(IceInternal::SocketOperationCompletedHandler^);
 
     virtual void close();
-    virtual EndpointIPtr listen();
+    virtual IceInternal::EndpointIPtr listen();
 
     virtual void startAccept();
     virtual void finishAccept();
 
-    virtual TransceiverPtr accept();
+    virtual IceInternal::TransceiverPtr accept();
     virtual std::string protocol() const;
     virtual std::string toString() const;
     virtual std::string toDetailedString() const;
@@ -45,22 +46,21 @@ public:
 
 private:
 
-    StreamAcceptor(const StreamEndpointIPtr&, const ProtocolInstancePtr&, const std::string&, int);
-    virtual ~StreamAcceptor();
-    friend class StreamEndpointI;
+    AcceptorI(const EndpointIPtr&, const IceInternal::ProtocolInstancePtr&, const std::string&, int);
+    virtual ~AcceptorI();
+    friend class EndpointI;
 
     virtual void queueAcceptedSocket(Windows::Networking::Sockets::StreamSocket^);
 
-    StreamEndpointIPtr _endpoint;
-    const ProtocolInstancePtr _instance;
-    const Address _addr;
+    EndpointIPtr _endpoint;
+    const IceInternal::ProtocolInstancePtr _instance;
+    const IceInternal::Address _addr;
 
     IceUtil::Mutex _mutex;
     bool _acceptPending;
-    SocketOperationCompletedHandler^ _completedHandler;
+    IceInternal::SocketOperationCompletedHandler^ _completedHandler;
     std::deque<Windows::Networking::Sockets::StreamSocket^> _accepted;
 };
 
 }
 #endif
-
diff --git a/cpp/src/Ice/winrt/StreamConnector.cpp b/cpp/src/IceSSL/uwp/ConnectorI.cpp
index ae6f17e6ab5..b02cc2c95dd 100644
--- a/cpp/src/Ice/winrt/StreamConnector.cpp
+++ b/cpp/src/IceSSL/uwp/ConnectorI.cpp
@@ -7,9 +7,9 @@
 //
 // **********************************************************************
 
-#include <Ice/winrt/StreamConnector.h>
-#include <Ice/winrt/StreamTransceiver.h>
-#include <Ice/winrt/StreamEndpointI.h>
+#include <IceSSL/uwp/ConnectorI.h>
+#include <IceSSL/uwp/TransceiverI.h>
+#include <IceSSL/uwp/EndpointI.h>
 
 #include <Ice/ProtocolInstance.h>
 #include <Ice/LoggerUtil.h>
@@ -18,32 +18,32 @@
 
 using namespace std;
 using namespace Ice;
-using namespace IceInternal;
+using namespace IceSSL;
 
-TransceiverPtr
-IceInternal::StreamConnector::connect()
+IceInternal::TransceiverPtr
+IceSSL::ConnectorI::connect()
 {
-    TransceiverPtr transceiver = new StreamTransceiver(_instance, createSocket(false, _addr), false);
-    dynamic_cast<StreamTransceiver*>(transceiver.get())->connect(_addr);
+    IceInternal::TransceiverPtr transceiver = new TransceiverI(_instance, createSocket(false, _addr), false);
+    dynamic_cast<TransceiverI*>(transceiver.get())->connect(_addr);
     return transceiver;
 }
 
 Short
-IceInternal::StreamConnector::type() const
+IceSSL::ConnectorI::type() const
 {
     return _instance->type();
 }
 
 string
-IceInternal::StreamConnector::toString() const
+IceSSL::ConnectorI::toString() const
 {
     return addrToString(_addr);
 }
 
 bool
-IceInternal::StreamConnector::operator==(const Connector& r) const
+IceSSL::ConnectorI::operator==(const Connector& r) const
 {
-    const StreamConnector* p = dynamic_cast<const StreamConnector*>(&r);
+    const ConnectorI* p = dynamic_cast<const ConnectorI*>(&r);
     if(!p)
     {
         return false;
@@ -73,15 +73,15 @@ IceInternal::StreamConnector::operator==(const Connector& r) const
 }
 
 bool
-IceInternal::StreamConnector::operator!=(const Connector& r) const
+IceSSL::ConnectorI::operator!=(const Connector& r) const
 {
     return !operator==(r);
 }
 
 bool
-IceInternal::StreamConnector::operator<(const Connector& r) const
+IceSSL::ConnectorI::operator<(const Connector& r) const
 {
-    const StreamConnector* p = dynamic_cast<const StreamConnector*>(&r);
+    const ConnectorI* p = dynamic_cast<const ConnectorI*>(&r);
     if(!p)
     {
         return type() < r.type();
@@ -116,15 +116,11 @@ IceInternal::StreamConnector::operator<(const Connector& r) const
     return compareAddress(_addr, p->_addr) < 0;
 }
 
-IceInternal::StreamConnector::StreamConnector(const ProtocolInstancePtr& instance, const Address& addr,
-                                              Ice::Int timeout, const string& connectionId) :
+IceSSL::ConnectorI::ConnectorI(const IceInternal::ProtocolInstancePtr& instance, const IceInternal::Address& addr,
+                               Ice::Int timeout, const string& connectionId) :
     _instance(instance),
     _addr(addr),
     _timeout(timeout),
     _connectionId(connectionId)
 {
 }
-
-IceInternal::StreamConnector::~StreamConnector()
-{
-}
diff --git a/cpp/src/Ice/winrt/StreamConnector.h b/cpp/src/IceSSL/uwp/ConnectorI.h
index f54d39e02cb..0df71fc6cda 100644
--- a/cpp/src/Ice/winrt/StreamConnector.h
+++ b/cpp/src/IceSSL/uwp/ConnectorI.h
@@ -7,38 +7,37 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TCP_CONNECTOR_H
-#define ICE_TCP_CONNECTOR_H
+#ifndef ICE_SSL_UWP_CONNECTOR_I_H
+#define ICE_SSL_UWP_CONNECTOR_I_H
 
 #include <Ice/TransceiverF.h>
 #include <Ice/ProtocolInstanceF.h>
 #include <Ice/Connector.h>
 #include <Ice/Network.h>
 
-namespace IceInternal
+namespace IceSSL
 {
 
-class StreamConnector : public Connector
+class ConnectorI : public IceInternal::Connector
 {
 public:
-    
-    virtual TransceiverPtr connect();
+
+    virtual IceInternal::TransceiverPtr connect();
 
     virtual Ice::Short type() const;
     virtual std::string toString() const;
 
-    virtual bool operator==(const Connector&) const;
-    virtual bool operator!=(const Connector&) const;
-    virtual bool operator<(const Connector&) const;
+    virtual bool operator==(const IceInternal::Connector&) const;
+    virtual bool operator!=(const IceInternal::Connector&) const;
+    virtual bool operator<(const IceInternal::Connector&) const;
 
 private:
 
-    StreamConnector(const ProtocolInstancePtr&, const Address&, Ice::Int, const std::string&); 
-    virtual ~StreamConnector();
-    friend class StreamEndpointI;
+    ConnectorI(const IceInternal::ProtocolInstancePtr&, const IceInternal::Address&, Ice::Int, const std::string&);
+    friend class EndpointI;
 
-    const ProtocolInstancePtr _instance;
-    const Address _addr;
+    const IceInternal::ProtocolInstancePtr _instance;
+    const IceInternal::Address _addr;
     const Ice::Int _timeout;
     const std::string _connectionId;
 };
diff --git a/cpp/src/Ice/winrt/StreamEndpointI.cpp b/cpp/src/IceSSL/uwp/EndpointI.cpp
index 1aae6f4859d..846bcab6d23 100644
--- a/cpp/src/Ice/winrt/StreamEndpointI.cpp
+++ b/cpp/src/IceSSL/uwp/EndpointI.cpp
@@ -7,13 +7,14 @@
 //
 // **********************************************************************
 
-#include <Ice/winrt/StreamEndpointI.h>
-#include <Ice/winrt/StreamAcceptor.h>
-#include <Ice/winrt/StreamConnector.h>
-#include <Ice/winrt/StreamTransceiver.h>
+#include <IceSSL/uwp/EndpointI.h>
+#include <IceSSL/uwp/AcceptorI.h>
+#include <IceSSL/uwp/ConnectorI.h>
+#include <IceSSL/uwp/TransceiverI.h>
 
 #include <Ice/Network.h>
-#include <Ice/BasicStream.h>
+#include <Ice/OutputStream.h>
+#include <Ice/InputStream.h>
 #include <Ice/LocalException.h>
 #include <Ice/ProtocolInstance.h>
 #include <Ice/DefaultsAndOverrides.h>
@@ -23,45 +24,51 @@
 
 using namespace std;
 using namespace Ice;
-using namespace IceInternal;
+using namespace IceSSL;
 
 extern "C"
 {
 
 Plugin*
-createIceTCP(const CommunicatorPtr& com, const string&, const StringSeq&)
+createIceSSL(const CommunicatorPtr& com, const string&, const StringSeq&)
 {
-    ProtocolInstancePtr instance = new ProtocolInstance(com, TCPEndpointType, "tcp", false);
-    return new EndpointFactoryPlugin(com, new StreamEndpointFactory(instance));
+    IceInternal::ProtocolInstancePtr instance = new IceInternal::ProtocolInstance(com, SSLEndpointType, "ssl", true);
+    return new IceInternal::EndpointFactoryPlugin(com, new EndpointFactoryI(instance));
 }
 
-Plugin*
-createIceSSL(const CommunicatorPtr& com, const string&, const StringSeq&)
+}
+
+namespace Ice
+{
+
+void
+registerIceSSL(bool loadOnInitialize)
 {
-    ProtocolInstancePtr instance = new ProtocolInstance(com, SSLEndpointType, "ssl", true);
-    return new EndpointFactoryPlugin(com, new StreamEndpointFactory(instance));
+    Ice::registerPluginFactory("IceSSL", createIceSSL, true);
 }
 
 }
 
-IceUtil::Shared* IceInternal::upCast(StreamEndpointI* p) { return p; }
+#ifndef ICE_CPP11_MAPPING
+IceUtil::Shared* IceInternal::upCast(EndpointI* p) { return p; }
+#endif
 
-IceInternal::StreamEndpointI::StreamEndpointI(const ProtocolInstancePtr& instance, const string& ho, Int po, Int ti,
+IceSSL::EndpointI::EndpointI(const IceInternal::ProtocolInstancePtr& instance, const string& ho, Int po, Int ti,
                                               const string& conId, bool co) :
-    IPEndpointI(instance, ho, po, Address(), conId),
+    IPEndpointI(instance, ho, po, IceInternal::Address(), conId),
     _timeout(ti),
     _compress(co)
 {
 }
 
-IceInternal::StreamEndpointI::StreamEndpointI(const ProtocolInstancePtr& instance) :
+IceSSL::EndpointI::EndpointI(const IceInternal::ProtocolInstancePtr& instance) :
     IPEndpointI(instance),
     _timeout(-2),
     _compress(false)
 {
 }
 
-IceInternal::StreamEndpointI::StreamEndpointI(const ProtocolInstancePtr& instance, BasicStream* s) :
+IceSSL::EndpointI::EndpointI(const IceInternal::ProtocolInstancePtr& instance, InputStream* s) :
     IPEndpointI(instance, s),
     _timeout(-1),
     _compress(false)
@@ -70,125 +77,116 @@ IceInternal::StreamEndpointI::StreamEndpointI(const ProtocolInstancePtr& instanc
     s->read(const_cast<bool&>(_compress));
 }
 
-EndpointInfoPtr
-IceInternal::StreamEndpointI::getInfo() const
+Ice::EndpointInfoPtr
+IceSSL::EndpointI::getInfo() const
 {
     IPEndpointInfoPtr info;
     if(_instance->secure())
     {
-        info = new InfoI<IceSSL::EndpointInfo>(const_cast<StreamEndpointI*>(this));
+        info = ICE_MAKE_SHARED(IceInternal::InfoI<IceSSL::EndpointInfo>, shared_from_this());
     }
     else
     {
-        info = new InfoI<Ice::TCPEndpointInfo>(const_cast<StreamEndpointI*>(this));
+        info = ICE_MAKE_SHARED(IceInternal::InfoI<Ice::TCPEndpointInfo>, shared_from_this());
     }
     fillEndpointInfo(info.get());
     return info;
 }
 
-EndpointInfoPtr
-IceInternal::StreamEndpointI::getWSInfo(const string& resource) const
+Ice::EndpointInfoPtr
+IceSSL::EndpointI::getWSInfo(const string& resource) const
 {
     IPEndpointInfoPtr info;
-    if(_instance->secure())
-    {
-        IceSSL::WSSEndpointInfoPtr i = new InfoI<IceSSL::WSSEndpointInfo>(const_cast<StreamEndpointI*>(this));
-        i->resource = resource;
-        info = i;
-    }
-    else
-    {
-        Ice::WSEndpointInfoPtr i = new InfoI<Ice::WSEndpointInfo>(const_cast<StreamEndpointI*>(this));
-        i->resource = resource;
-        info = i;
-    }
+    IceSSL::WSSEndpointInfoPtr i = ICE_MAKE_SHARED(IceInternal::InfoI<IceSSL::WSSEndpointInfo>, shared_from_this());
+    i->resource = resource;
+    info = i;
     fillEndpointInfo(info.get());
     return info;
 }
 
 Int
-IceInternal::StreamEndpointI::timeout() const
+IceSSL::EndpointI::timeout() const
 {
     return _timeout;
 }
 
-EndpointIPtr
-IceInternal::StreamEndpointI::timeout(Int timeout) const
+IceInternal::EndpointIPtr
+IceSSL::EndpointI::timeout(Int timeout) const
 {
     if(timeout == _timeout)
     {
-        return const_cast<StreamEndpointI*>(this);
+        return shared_from_this();
     }
     else
     {
-        return new StreamEndpointI(_instance, _host, _port, timeout, _connectionId, _compress);
+        return ICE_MAKE_SHARED(EndpointI, _instance, _host, _port, timeout, _connectionId, _compress);
     }
 }
 
-EndpointIPtr
-IceInternal::StreamEndpointI::connectionId(const string& connectionId) const
+IceInternal::EndpointIPtr
+IceSSL::EndpointI::connectionId(const string& connectionId) const
 {
     if(connectionId == _connectionId)
     {
-        return const_cast<StreamEndpointI*>(this);
+        return shared_from_this();
     }
     else
     {
-      return new StreamEndpointI(_instance, _host, _port, _timeout, connectionId, _compress);
+      return ICE_MAKE_SHARED(EndpointI, _instance, _host, _port, _timeout, connectionId, _compress);
     }
 }
 
 bool
-IceInternal::StreamEndpointI::compress() const
+IceSSL::EndpointI::compress() const
 {
     return _compress;
 }
 
-EndpointIPtr
-IceInternal::StreamEndpointI::compress(bool compress) const
+IceInternal::EndpointIPtr
+IceSSL::EndpointI::compress(bool compress) const
 {
     if(compress == _compress)
     {
-        return const_cast<StreamEndpointI*>(this);
+        return shared_from_this();
     }
     else
     {
-        return new StreamEndpointI(_instance, _host, _port, _timeout, _connectionId, compress);
+        return ICE_MAKE_SHARED(EndpointI, _instance, _host, _port, _timeout, _connectionId, compress);
     }
 }
 
 bool
-IceInternal::StreamEndpointI::datagram() const
+IceSSL::EndpointI::datagram() const
 {
     return false;
 }
 
 bool
-IceInternal::StreamEndpointI::secure() const
+IceSSL::EndpointI::secure() const
 {
-    return _instance->type() == IceSSL::EndpointType || _instance->type() == WSSEndpointType;
+    return true;
 }
 
-TransceiverPtr
-IceInternal::StreamEndpointI::transceiver() const
+IceInternal::TransceiverPtr
+IceSSL::EndpointI::transceiver() const
 {
     return 0;
 }
 
-AcceptorPtr
-IceInternal::StreamEndpointI::acceptor(const string&) const
+IceInternal::AcceptorPtr
+IceSSL::EndpointI::acceptor(const string&) const
 {
-    return new StreamAcceptor(const_cast<StreamEndpointI*>(this), _instance, _host, _port);
+    return new AcceptorI(ICE_DYNAMIC_CAST(EndpointI, shared_from_this()), _instance, _host, _port);
 }
 
-StreamEndpointIPtr
-IceInternal::StreamEndpointI::endpoint(const StreamAcceptorPtr& acceptor) const
+EndpointIPtr
+IceSSL::EndpointI::endpoint(const AcceptorIPtr& acceptor) const
 {
-    return new StreamEndpointI(_instance, _host, acceptor->effectivePort(), _timeout, _connectionId, _compress);
+    return ICE_MAKE_SHARED(EndpointI, _instance, _host, acceptor->effectivePort(), _timeout, _connectionId, _compress);
 }
 
 string
-IceInternal::StreamEndpointI::options() const
+IceSSL::EndpointI::options() const
 {
     //
     // WARNING: Certain features, such as proxy validation in Glacier2,
@@ -219,14 +217,18 @@ IceInternal::StreamEndpointI::options() const
 }
 
 bool
-IceInternal::StreamEndpointI::operator==(const LocalObject& r) const
+#ifdef ICE_CPP11_MAPPING
+IceSSL::EndpointI::operator==(const Endpoint& r) const
+#else
+IceSSL::EndpointI::operator==(const LocalObject& r) const
+#endif
 {
     if(!IPEndpointI::operator==(r))
     {
         return false;
     }
 
-    const StreamEndpointI* p = dynamic_cast<const StreamEndpointI*>(&r);
+    const EndpointI* p = dynamic_cast<const EndpointI*>(&r);
     if(!p)
     {
         return false;
@@ -251,9 +253,13 @@ IceInternal::StreamEndpointI::operator==(const LocalObject& r) const
 }
 
 bool
-IceInternal::StreamEndpointI::operator<(const LocalObject& r) const
+#ifdef ICE_CPP11_MAPPING
+IceSSL::EndpointI::operator<(const Endpoint& r) const
+#else
+IceSSL::EndpointI::operator<(const LocalObject& r) const
+#endif
 {
-    const StreamEndpointI* p = dynamic_cast<const StreamEndpointI*>(&r);
+    const EndpointI* p = dynamic_cast<const EndpointI*>(&r);
     if(!p)
     {
         const EndpointI* e = dynamic_cast<const EndpointI*>(&r);
@@ -291,7 +297,7 @@ IceInternal::StreamEndpointI::operator<(const LocalObject& r) const
 }
 
 void
-IceInternal::StreamEndpointI::streamWriteImpl(BasicStream* s) const
+IceSSL::EndpointI::streamWriteImpl(OutputStream* s) const
 {
     IPEndpointI::streamWriteImpl(s);
     s->write(_timeout);
@@ -299,15 +305,15 @@ IceInternal::StreamEndpointI::streamWriteImpl(BasicStream* s) const
 }
 
 void
-IceInternal::StreamEndpointI::hashInit(Ice::Int& h) const
+IceSSL::EndpointI::hashInit(Ice::Int& h) const
 {
     IPEndpointI::hashInit(h);
-    hashAdd(h, _timeout);
-    hashAdd(h, _compress);
+    IceInternal::hashAdd(h, _timeout);
+    IceInternal::hashAdd(h, _compress);
 }
 
 void
-IceInternal::StreamEndpointI::fillEndpointInfo(IPEndpointInfo* info) const
+IceSSL::EndpointI::fillEndpointInfo(IPEndpointInfo* info) const
 {
     IPEndpointI::fillEndpointInfo(info);
     info->timeout = _timeout;
@@ -315,7 +321,7 @@ IceInternal::StreamEndpointI::fillEndpointInfo(IPEndpointInfo* info) const
 }
 
 void
-IceInternal::StreamEndpointI::initWithOptions(vector<string>& args, bool oaEndpoint)
+IceSSL::EndpointI::initWithOptions(vector<string>& args, bool oaEndpoint)
 {
     IPEndpointI::initWithOptions(args, oaEndpoint);
 
@@ -326,7 +332,7 @@ IceInternal::StreamEndpointI::initWithOptions(vector<string>& args, bool oaEndpo
 }
 
 bool
-IceInternal::StreamEndpointI::checkOption(const string& option, const string& argument, const string& endpoint)
+IceSSL::EndpointI::checkOption(const string& option, const string& argument, const string& endpoint)
 {
     if(IPEndpointI::checkOption(option, argument, endpoint))
     {
@@ -380,61 +386,57 @@ IceInternal::StreamEndpointI::checkOption(const string& option, const string& ar
     }
 }
 
-ConnectorPtr
-IceInternal::StreamEndpointI::createConnector(const Address& address, const NetworkProxyPtr& proxy) const
+IceInternal::ConnectorPtr
+IceSSL::EndpointI::createConnector(const IceInternal::Address& address, const IceInternal::NetworkProxyPtr& proxy) const
 {
     // TODO: Add support for network proxies?
-    return new StreamConnector(_instance, address, _timeout, _connectionId);
-}
-
-IPEndpointIPtr
-IceInternal::StreamEndpointI::createEndpoint(const string& host, int port, const string& connectionId) const
-{
-    return new StreamEndpointI(_instance, host, port, _timeout, connectionId, _compress);
+    return new ConnectorI(_instance, address, _timeout, _connectionId);
 }
 
-IceInternal::StreamEndpointFactory::StreamEndpointFactory(const ProtocolInstancePtr& instance) : _instance(instance)
+IceInternal::IPEndpointIPtr
+IceSSL::EndpointI::createEndpoint(const string& host, int port, const string& connectionId) const
 {
+    return ICE_MAKE_SHARED(EndpointI, _instance, host, port, _timeout, connectionId, _compress);
 }
 
-IceInternal::StreamEndpointFactory::~StreamEndpointFactory()
+IceSSL::EndpointFactoryI::EndpointFactoryI(const IceInternal::ProtocolInstancePtr& instance) : _instance(instance)
 {
 }
 
 Short
-IceInternal::StreamEndpointFactory::type() const
+IceSSL::EndpointFactoryI::type() const
 {
     return _instance->type();
 }
 
 string
-IceInternal::StreamEndpointFactory::protocol() const
+IceSSL::EndpointFactoryI::protocol() const
 {
     return _instance->protocol();
 }
 
-EndpointIPtr
-IceInternal::StreamEndpointFactory::create(vector<string>& args, bool oaEndpoint) const
+IceInternal::EndpointIPtr
+IceSSL::EndpointFactoryI::create(vector<string>& args, bool oaEndpoint) const
 {
-    IPEndpointIPtr endpt = new StreamEndpointI(_instance);
+    IceInternal::IPEndpointIPtr endpt = ICE_MAKE_SHARED(EndpointI, _instance);
     endpt->initWithOptions(args, oaEndpoint);
     return endpt;
 }
 
-EndpointIPtr
-IceInternal::StreamEndpointFactory::read(BasicStream* s) const
+IceInternal::EndpointIPtr
+IceSSL::EndpointFactoryI::read(InputStream* s) const
 {
-    return new StreamEndpointI(_instance, s);
+    return ICE_MAKE_SHARED(EndpointI, _instance, s);
 }
 
 void
-IceInternal::StreamEndpointFactory::destroy()
+IceSSL::EndpointFactoryI::destroy()
 {
     _instance = 0;
 }
 
-EndpointFactoryPtr
-IceInternal::StreamEndpointFactory::clone(const ProtocolInstancePtr& instance) const
+IceInternal::EndpointFactoryPtr
+IceSSL::EndpointFactoryI::clone(const IceInternal::ProtocolInstancePtr& instance) const
 {
-    return new StreamEndpointFactory(instance);
+    return new EndpointFactoryI(instance);
 }
diff --git a/cpp/src/IceSSL/uwp/EndpointI.h b/cpp/src/IceSSL/uwp/EndpointI.h
new file mode 100644
index 00000000000..02b2ecab644
--- /dev/null
+++ b/cpp/src/IceSSL/uwp/EndpointI.h
@@ -0,0 +1,99 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_SSL_UWP_ENDPOINT_I_H
+#define ICE_SSL_UWP_ENDPOINT_I_H
+
+#include <IceUtil/Config.h>
+#include <Ice/IPEndpointI.h>
+#include <Ice/EndpointFactory.h>
+#include <Ice/WSEndpoint.h>
+#include <Ice/Network.h> // for IceIternal::Address
+#include <IceSSL/uwp/TransceiverF.h>
+
+namespace IceSSL
+{
+
+class EndpointI : public IceInternal::IPEndpointI, public IceInternal::WSEndpointDelegate
+{
+public:
+
+    EndpointI(const IceInternal::ProtocolInstancePtr&, const std::string&, Ice::Int, Ice::Int, const std::string&, bool);
+    EndpointI(const IceInternal::ProtocolInstancePtr&);
+    EndpointI(const IceInternal::ProtocolInstancePtr&, Ice::InputStream*);
+
+    virtual Ice::EndpointInfoPtr getInfo() const;
+    virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const;
+
+    virtual Ice::Int timeout() const;
+    virtual IceInternal::EndpointIPtr timeout(Ice::Int) const;
+    virtual IceInternal::EndpointIPtr connectionId(const ::std::string&) const;
+    virtual bool compress() const;
+    virtual IceInternal::EndpointIPtr compress(bool) const;
+    virtual bool datagram() const;
+    virtual bool secure() const;
+
+    virtual IceInternal::TransceiverPtr transceiver() const;
+    virtual IceInternal::AcceptorPtr acceptor(const std::string&) const;
+    virtual std::string options() const;
+
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const Ice::Endpoint&) const;
+    virtual bool operator<(const Ice::Endpoint&) const;
+#else
+    virtual bool operator==(const Ice::LocalObject&) const;
+    virtual bool operator<(const Ice::LocalObject&) const;
+#endif
+
+    EndpointIPtr endpoint(const AcceptorIPtr&) const;
+
+    using IceInternal::IPEndpointI::connectionId;
+
+protected:
+
+    virtual void streamWriteImpl(Ice::OutputStream*) const;
+    virtual void hashInit(Ice::Int&) const;
+    virtual void initWithOptions(std::vector<std::string>&, bool);
+    virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const;
+    virtual bool checkOption(const std::string&, const std::string&, const std::string&);
+
+    virtual IceInternal::ConnectorPtr createConnector(const IceInternal::Address&, const IceInternal::NetworkProxyPtr&) const;
+    virtual IceInternal::IPEndpointIPtr createEndpoint(const std::string&, int, const std::string&) const;
+
+private:
+
+    //
+    // All members are const, because endpoints are immutable.
+    //
+    const Ice::Int _timeout;
+    const bool _compress;
+};
+
+class EndpointFactoryI : public IceInternal::EndpointFactory
+{
+public:
+
+    EndpointFactoryI(const IceInternal::ProtocolInstancePtr&);
+
+    virtual Ice::Short type() const;
+    virtual std::string protocol() const;
+    virtual IceInternal::EndpointIPtr create(std::vector<std::string>&, bool) const;
+    virtual IceInternal::EndpointIPtr read(Ice::InputStream*) const;
+    virtual void destroy();
+
+    virtual IceInternal::EndpointFactoryPtr clone(const IceInternal::ProtocolInstancePtr&) const;
+
+private:
+
+    IceInternal::ProtocolInstancePtr _instance;
+};
+
+}
+
+#endif
diff --git a/cpp/src/IceSSL/uwp/PluginI.cpp b/cpp/src/IceSSL/uwp/PluginI.cpp
new file mode 100644
index 00000000000..6ee5ba21755
--- /dev/null
+++ b/cpp/src/IceSSL/uwp/PluginI.cpp
@@ -0,0 +1,36 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceSSL/PluginI.h>
+#include <IceSSL/Instance.h>
+#include <IceSSL/SSLEngine.h>
+#include <IceSSL/EndpointI.h>
+
+#include <Ice/ProtocolPluginFacade.h>
+#include <Ice/ProtocolInstance.h>
+#include <Ice/LocalException.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceSSL;
+
+//
+// Plug-in factory function.
+//
+
+namespace Ice
+{
+
+ICE_SSL_API void
+registerIceSSL(bool loadOnInitialize)
+{
+    Ice::registerPluginFactory("IceSSL", createIceSSL, true);
+}
+
+}
diff --git a/cpp/src/IceSSL/uwp/TransceiverF.h b/cpp/src/IceSSL/uwp/TransceiverF.h
new file mode 100644
index 00000000000..5384607f1a9
--- /dev/null
+++ b/cpp/src/IceSSL/uwp/TransceiverF.h
@@ -0,0 +1,31 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_UWP_TRANSCEIVER_F_H
+#define ICE_UWP_TRANSCEIVER_F_H
+
+#include <IceUtil/Shared.h>
+#include <Ice/Handle.h>
+
+namespace IceSSL
+{
+
+class EndpointI;
+#ifndef  ICE_CPP11_MAPPING
+ICE_API IceUtil::Shared* upCast(EndpointI*);
+#endif
+ICE_DEFINE_PTR(EndpointIPtr, EndpointI);
+
+class AcceptorI;
+ICE_API IceUtil::Shared* upCast(AcceptorI*);
+typedef IceInternal::Handle<AcceptorI> AcceptorIPtr;
+
+}
+
+#endif
diff --git a/cpp/src/Ice/winrt/StreamTransceiver.cpp b/cpp/src/IceSSL/uwp/TransceiverI.cpp
index d81dfa61d36..06ef9f8a6e1 100644
--- a/cpp/src/Ice/winrt/StreamTransceiver.cpp
+++ b/cpp/src/IceSSL/uwp/TransceiverI.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#include <Ice/winrt/StreamTransceiver.h>
+#include <IceSSL/uwp/TransceiverI.h>
 #include <Ice/Connection.h>
 #include <Ice/ProtocolInstance.h>
 #include <Ice/LoggerUtil.h>
@@ -20,7 +20,7 @@
 
 using namespace std;
 using namespace Ice;
-using namespace IceInternal;
+using namespace IceSSL;
 
 using namespace Platform;
 using namespace Windows::Foundation;
@@ -32,7 +32,7 @@ namespace
 {
 
 AsyncOperationCompletedHandler<unsigned int>^
-createAsyncOperationCompletedHandler(SocketOperationCompletedHandler^ cb, SocketOperation op, AsyncInfo& info)
+createAsyncOperationCompletedHandler(IceInternal::SocketOperationCompletedHandler^ cb, IceInternal::SocketOperation op, IceInternal::AsyncInfo& info)
 {
     return ref new AsyncOperationCompletedHandler<unsigned int>(
         [=,&info] (IAsyncOperation<unsigned int>^ operation, Windows::Foundation::AsyncStatus status)
@@ -52,51 +52,55 @@ createAsyncOperationCompletedHandler(SocketOperationCompletedHandler^ cb, Socket
 
 }
 
-NativeInfoPtr
-IceInternal::StreamTransceiver::getNativeInfo()
+IceInternal::NativeInfoPtr
+IceSSL::TransceiverI::getNativeInfo()
 {
     return this;
 }
 
 void
-IceInternal::StreamTransceiver::setCompletedHandler(SocketOperationCompletedHandler^ handler)
+IceSSL::TransceiverI::setCompletedHandler(IceInternal::SocketOperationCompletedHandler^ handler)
 {
     _completedHandler = handler;
-    _readOperationCompletedHandler = createAsyncOperationCompletedHandler(handler, SocketOperationRead, _read);
-    _writeOperationCompletedHandler = createAsyncOperationCompletedHandler(handler, SocketOperationWrite, _write);
+    _readOperationCompletedHandler = createAsyncOperationCompletedHandler(handler, IceInternal::SocketOperationRead, _read);
+    _writeOperationCompletedHandler = createAsyncOperationCompletedHandler(handler, IceInternal::SocketOperationWrite, _write);
 }
 
-SocketOperation
-IceInternal::StreamTransceiver::initialize(Buffer&, Buffer&,bool&)
+IceInternal::SocketOperation
+IceSSL::TransceiverI::initialize(IceInternal::Buffer&, IceInternal::Buffer&)
 {
     if(_state == StateNeedConnect)
     {
         _state = StateConnectPending;
-        return SocketOperationConnect;
+        return IceInternal::SocketOperationConnect;
     }
     else if(_state <= StateConnectPending)
     {
          if(_write.count == SOCKET_ERROR)
         {
-            checkConnectErrorCode(__FILE__, __LINE__, _write.error, _connectAddr.host);
+            IceInternal::checkConnectErrorCode(__FILE__, __LINE__, _write.error, _connectAddr.host);
         }
         _state = StateConnected;
-        _desc = fdToString(_fd);
+        _desc = IceInternal::fdToString(_fd);
     }
     assert(_state == StateConnected);
-    return SocketOperationNone;
+    return IceInternal::SocketOperationNone;
 }
 
-SocketOperation
-IceInternal::StreamTransceiver::closing(bool initiator, const Ice::LocalException&)
+IceInternal::SocketOperation
+#ifdef ICE_CPP11_MAPPING
+IceSSL::TransceiverI::closing(bool initiator, exception_ptr)
+#else
+IceSSL::TransceiverI::closing(bool initiator, const Ice::LocalException&)
+#endif
 {
     // If we are initiating the connection closure, wait for the peer
     // to close the TCP/IP connection. Otherwise, close immediately.
-    return initiator ? SocketOperationRead : SocketOperationNone;
+    return initiator ? IceInternal::SocketOperationRead : IceInternal::SocketOperationNone;
 }
 
 void
-IceInternal::StreamTransceiver::close()
+IceSSL::TransceiverI::close()
 {
     assert(_fd != INVALID_SOCKET);
 
@@ -106,7 +110,7 @@ IceInternal::StreamTransceiver::close()
 
     try
     {
-        closeSocket(_fd);
+        IceInternal::closeSocket(_fd);
         _fd = INVALID_SOCKET;
     }
     catch(const SocketException&)
@@ -116,42 +120,32 @@ IceInternal::StreamTransceiver::close()
     }
 }
 
-SocketOperation
-IceInternal::StreamTransceiver::write(Buffer& buf)
+IceInternal::SocketOperation
+IceSSL::TransceiverI::write(IceInternal::Buffer& buf)
 {
-    return buf.i == buf.b.end() ? SocketOperationNone : SocketOperationWrite;
+    return buf.i == buf.b.end() ? IceInternal::SocketOperationNone : IceInternal::SocketOperationWrite;
 }
 
-SocketOperation
-IceInternal::StreamTransceiver::read(Buffer& buf, bool&)
+IceInternal::SocketOperation
+IceSSL::TransceiverI::read(IceInternal::Buffer& buf)
 {
-    return buf.i == buf.b.end() ? SocketOperationNone : SocketOperationRead;
+    return buf.i == buf.b.end() ? IceInternal::SocketOperationNone : IceInternal::SocketOperationRead;
 }
 
 bool
-IceInternal::StreamTransceiver::startWrite(Buffer& buf)
+IceSSL::TransceiverI::startWrite(IceInternal::Buffer& buf)
 {
     if(_state < StateConnected)
     {
         try
         {
-            IAsyncAction^ action = safe_cast<StreamSocket^>(_fd)->ConnectAsync(
-                _connectAddr.host,
-                _connectAddr.port,
-                _instance->secure() ?
-                    //
-                    // SocketProtectionLevel::Tls12 is new in Windows 8.1 SDK
-                    //
-#if defined(_MSC_VER) && _MSC_VER >= 1800
-                    SocketProtectionLevel::Tls12 :
-#else
-                    SocketProtectionLevel::Ssl :
-#endif
-                    SocketProtectionLevel::PlainSocket);
+            IAsyncAction^ action = safe_cast<StreamSocket^>(_fd)->ConnectAsync(_connectAddr.host,
+                                                                               _connectAddr.port,
+                                                                               SocketProtectionLevel::Tls12);
 
-            if(!checkIfErrorOrCompleted(SocketOperationConnect, action))
+            if(!checkIfErrorOrCompleted(IceInternal::SocketOperationConnect, action))
             {
-                SocketOperationCompletedHandler^ completed = _completedHandler;
+                IceInternal::SocketOperationCompletedHandler^ completed = _completedHandler;
                 action->Completed = ref new AsyncActionCompletedHandler(
                     [=] (IAsyncAction^ info, Windows::Foundation::AsyncStatus status)
                     {
@@ -164,13 +158,13 @@ IceInternal::StreamTransceiver::startWrite(Buffer& buf)
                         {
                             _write.count = 0;
                         }
-                        completed(SocketOperationConnect);
+                        completed(IceInternal::SocketOperationConnect);
                     });
             }
         }
         catch(Platform::Exception^ ex)
         {
-            checkConnectErrorCode(__FILE__, __LINE__, ex->HResult, _connectAddr.host);
+            IceInternal::checkConnectErrorCode(__FILE__, __LINE__, ex->HResult, _connectAddr.host);
         }
         return false;
     }
@@ -188,7 +182,7 @@ IceInternal::StreamTransceiver::startWrite(Buffer& buf)
     try
     {
         DataWriterStoreOperation^ operation = _writer->StoreAsync();
-        if(checkIfErrorOrCompleted(SocketOperationWrite, operation))
+        if(checkIfErrorOrCompleted(IceInternal::SocketOperationWrite, operation))
         {
             _write.count = operation->GetResults();
         }
@@ -199,19 +193,19 @@ IceInternal::StreamTransceiver::startWrite(Buffer& buf)
     }
     catch(Platform::Exception^ ex)
     {
-        checkErrorCode(__FILE__, __LINE__, ex->HResult);
+        IceInternal::checkErrorCode(__FILE__, __LINE__, ex->HResult);
     }
     return packetSize == static_cast<int>(buf.b.end() - buf.i);
 }
 
 void
-IceInternal::StreamTransceiver::finishWrite(Buffer& buf)
+IceSSL::TransceiverI::finishWrite(IceInternal::Buffer& buf)
 {
     if(_state < StateConnected)
     {
         if(_write.count == SOCKET_ERROR)
         {
-            checkConnectErrorCode(__FILE__, __LINE__, _write.error, _connectAddr.host);
+            IceInternal::checkConnectErrorCode(__FILE__, __LINE__, _write.error, _connectAddr.host);
         }
         _verified = true;
         return;
@@ -219,14 +213,14 @@ IceInternal::StreamTransceiver::finishWrite(Buffer& buf)
 
     if(_write.count == SOCKET_ERROR)
     {
-        checkErrorCode(__FILE__, __LINE__, _write.error);
+        IceInternal::checkErrorCode(__FILE__, __LINE__, _write.error);
     }
 
     buf.i += _write.count;
 }
 
 void
-IceInternal::StreamTransceiver::startRead(Buffer& buf)
+IceSSL::TransceiverI::startRead(IceInternal::Buffer& buf)
 {
     int packetSize = static_cast<int>(buf.b.end() - buf.i);
     if(_maxReceivePacketSize > 0 && packetSize > _maxReceivePacketSize)
@@ -238,7 +232,7 @@ IceInternal::StreamTransceiver::startRead(Buffer& buf)
     try
     {
         DataReaderLoadOperation^ operation = _reader->LoadAsync(packetSize);
-        if(checkIfErrorOrCompleted(SocketOperationRead, operation))
+        if(checkIfErrorOrCompleted(IceInternal::SocketOperationRead, operation))
         {
             _read.count = operation->GetResults();
         }
@@ -249,16 +243,16 @@ IceInternal::StreamTransceiver::startRead(Buffer& buf)
     }
     catch(Platform::Exception^ ex)
     {
-        checkErrorCode(__FILE__, __LINE__, ex->HResult);
+        IceInternal::checkErrorCode(__FILE__, __LINE__, ex->HResult);
     }
 }
 
 void
-IceInternal::StreamTransceiver::finishRead(Buffer& buf, bool& hasMoreData)
+IceSSL::TransceiverI::finishRead(IceInternal::Buffer& buf)
 {
     if(_read.count == SOCKET_ERROR)
     {
-        checkErrorCode(__FILE__, __LINE__, _read.error);
+        IceInternal::checkErrorCode(__FILE__, __LINE__, _read.error);
     }
     else if(_read.count == 0)
     {
@@ -275,54 +269,54 @@ IceInternal::StreamTransceiver::finishRead(Buffer& buf, bool& hasMoreData)
     }
     catch(Platform::Exception^ ex)
     {
-        checkErrorCode(__FILE__, __LINE__, ex->HResult);
+        IceInternal::checkErrorCode(__FILE__, __LINE__, ex->HResult);
     }
 
     buf.i += _read.count;
 }
 
 string
-IceInternal::StreamTransceiver::protocol() const
+IceSSL::TransceiverI::protocol() const
 {
     return _instance->protocol();
 }
 
 string
-IceInternal::StreamTransceiver::toString() const
+IceSSL::TransceiverI::toString() const
 {
     return _desc;
 }
 
 string
-IceInternal::StreamTransceiver::toDetailedString() const
+IceSSL::TransceiverI::toDetailedString() const
 {
     return toString();
 }
 
 Ice::ConnectionInfoPtr
-IceInternal::StreamTransceiver::getInfo() const
+IceSSL::TransceiverI::getInfo() const
 {
     Ice::IPConnectionInfoPtr info;
     if(_instance->secure())
     {
-        IceSSL::ConnectionInfoPtr sslInfo = new IceSSL::ConnectionInfo();
+        IceSSL::ConnectionInfoPtr sslInfo = ICE_MAKE_SHARED(IceSSL::ConnectionInfo);
         sslInfo->verified = _verified;
         info = sslInfo;
     }
     else
     {
-        info = new Ice::TCPConnectionInfo();
+        info = ICE_MAKE_SHARED(Ice::TCPConnectionInfo);
     }
     fillConnectionInfo(info);
     return info;
 }
 
 Ice::ConnectionInfoPtr
-IceInternal::StreamTransceiver::getWSInfo(const Ice::HeaderDict& headers) const
+IceSSL::TransceiverI::getWSInfo(const Ice::HeaderDict& headers) const
 {
     if(_instance->secure())
     {
-        IceSSL::WSSConnectionInfoPtr info = new IceSSL::WSSConnectionInfo();
+        IceSSL::WSSConnectionInfoPtr info = ICE_MAKE_SHARED(IceSSL::WSSConnectionInfo);
         info->verified = _verified;
         fillConnectionInfo(info);
         info->headers = headers;
@@ -330,7 +324,7 @@ IceInternal::StreamTransceiver::getWSInfo(const Ice::HeaderDict& headers) const
     }
     else
     {
-        Ice::WSConnectionInfoPtr info = new Ice::WSConnectionInfo();
+        Ice::WSConnectionInfoPtr info = ICE_MAKE_SHARED(Ice::WSConnectionInfo);
         fillConnectionInfo(info);
         info->headers = headers;
         return info;
@@ -338,20 +332,21 @@ IceInternal::StreamTransceiver::getWSInfo(const Ice::HeaderDict& headers) const
 }
 
 void
-IceInternal::StreamTransceiver::checkSendSize(const Buffer&)
+IceSSL::TransceiverI::checkSendSize(const IceInternal::Buffer&)
 {
 }
 
  void
- IceInternal::StreamTransceiver::setBufferSize(int rcvSize, int sndSize)
+ IceSSL::TransceiverI::setBufferSize(int rcvSize, int sndSize)
  {
     setTcpBufSize(_fd, rcvSize, sndSize, _instance);
  }
 
-IceInternal::StreamTransceiver::StreamTransceiver(const ProtocolInstancePtr& instance, SOCKET fd, bool connected) :
+IceSSL::TransceiverI::TransceiverI(const IceInternal::ProtocolInstancePtr& instance, SOCKET fd, bool connected) :
     NativeInfo(fd),
     _instance(instance),
     _state(connected ? StateConnected : StateNeedConnect),
+    _desc(connected ? IceInternal::fdToString(_fd) : string()),
     _verified(false)
 {
     StreamSocket^ streamSocket = safe_cast<StreamSocket^>(_fd);
@@ -359,19 +354,6 @@ IceInternal::StreamTransceiver::StreamTransceiver(const ProtocolInstancePtr& ins
     _reader = ref new DataReader(streamSocket->InputStream);
     _reader->InputStreamOptions = InputStreamOptions::Partial;
 
-    if(connected)
-    {
-        try
-        {
-            _desc = fdToString(_fd);
-        }
-        catch(const Ice::Exception&)
-        {
-            closeSocketNoThrow(_fd);
-            throw;
-        }
-    }
-
     setTcpBufSize(_fd, _instance);
 
     _maxSendPacketSize = streamSocket->Control->OutboundBufferSizeInBytes / 2;
@@ -383,19 +365,19 @@ IceInternal::StreamTransceiver::StreamTransceiver(const ProtocolInstancePtr& ins
     _maxReceivePacketSize = instance->properties()->getPropertyAsIntWithDefault("Ice.TCP.RcvSize", 128 * 1024);
 }
 
-IceInternal::StreamTransceiver::~StreamTransceiver()
+IceSSL::TransceiverI::~TransceiverI()
 {
     assert(_fd == INVALID_SOCKET);
 }
 
 void
-IceInternal::StreamTransceiver::connect(const Address& addr)
+IceSSL::TransceiverI::connect(const IceInternal::Address& addr)
 {
     _connectAddr = addr;
 }
 
 bool
-IceInternal::StreamTransceiver::checkIfErrorOrCompleted(SocketOperation op, IAsyncInfo^ info, int count)
+IceSSL::TransceiverI::checkIfErrorOrCompleted(IceInternal::SocketOperation op, IAsyncInfo^ info, int count)
 {
     //
     // NOTE: It's important to only check for info->Status once as it
@@ -420,21 +402,20 @@ IceInternal::StreamTransceiver::checkIfErrorOrCompleted(SocketOperation op, IAsy
     {
         if(_state < StateConnected)
         {
-            checkConnectErrorCode(__FILE__, __LINE__, info->ErrorCode.Value, _connectAddr.host);
+            IceInternal::checkConnectErrorCode(__FILE__, __LINE__, info->ErrorCode.Value, _connectAddr.host);
         }
         else
         {
-            checkErrorCode(__FILE__, __LINE__, info->ErrorCode.Value);
+            IceInternal::checkErrorCode(__FILE__, __LINE__, info->ErrorCode.Value);
         }
         return true; // Prevent compiler warning.
     }
 }
 
 void
-IceInternal::StreamTransceiver::fillConnectionInfo(const Ice::IPConnectionInfoPtr& info) const
+IceSSL::TransceiverI::fillConnectionInfo(const Ice::IPConnectionInfoPtr& info) const
 {
-    fdToAddressAndPort(_fd, info->localAddress, info->localPort, info->remoteAddress, info->remotePort);
-    info->rcvSize = getRecvBufferSize(_fd);
-    info->sndSize = getSendBufferSize(_fd);
+    IceInternal::fdToAddressAndPort(_fd, info->localAddress, info->localPort, info->remoteAddress, info->remotePort);
+    info->rcvSize = IceInternal::getRecvBufferSize(_fd);
+    info->sndSize = IceInternal::getSendBufferSize(_fd);
 }
-
diff --git a/cpp/src/IceSSL/uwp/TransceiverI.h b/cpp/src/IceSSL/uwp/TransceiverI.h
new file mode 100644
index 00000000000..ef7a51fb7af
--- /dev/null
+++ b/cpp/src/IceSSL/uwp/TransceiverI.h
@@ -0,0 +1,96 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_SSL_UWP_TRANSCEIVER_I_H
+#define ICE_SSL_UWP_TRANSCEIVER_I_H
+
+#include <Ice/ProtocolInstanceF.h>
+#include <Ice/Transceiver.h>
+#include <Ice/Network.h>
+#include <Ice/WSTransceiver.h>
+
+namespace IceSSL
+{
+
+class ConnectorI;
+class AcceptorI;
+
+class TransceiverI : public IceInternal::Transceiver,
+                     public IceInternal::NativeInfo,
+                     public IceInternal::WSTransceiverDelegate
+{
+    enum State
+    {
+        StateNeedConnect,
+        StateConnectPending,
+        StateConnected
+    };
+
+public:
+
+    virtual IceInternal::NativeInfoPtr getNativeInfo();
+    virtual void setCompletedHandler(IceInternal::SocketOperationCompletedHandler^);
+
+    virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&);
+#ifdef ICE_CPP11_MAPPING
+    virtual IceInternal::SocketOperation closing(bool, std::exception_ptr);
+#else
+    virtual IceInternal::SocketOperation closing(bool, const Ice::LocalException&);
+#endif
+    virtual void close();
+    virtual IceInternal::SocketOperation write(IceInternal::Buffer&);
+    virtual IceInternal::SocketOperation read(IceInternal::Buffer&);
+
+    virtual bool startWrite(IceInternal::Buffer&);
+    virtual void finishWrite(IceInternal::Buffer&);
+    virtual void startRead(IceInternal::Buffer&);
+    virtual void finishRead(IceInternal::Buffer&);
+
+    virtual std::string protocol() const;
+    virtual std::string toString() const;
+    virtual std::string toDetailedString() const;
+    virtual Ice::ConnectionInfoPtr getInfo() const;
+    virtual Ice::ConnectionInfoPtr getWSInfo(const Ice::HeaderDict&) const;
+    virtual void checkSendSize(const IceInternal::Buffer&);
+    virtual void setBufferSize(int rcvSize, int sndSize);
+
+private:
+
+    TransceiverI(const IceInternal::ProtocolInstancePtr&, SOCKET, bool);
+    virtual ~TransceiverI();
+
+    void connect(const IceInternal::Address&);
+    bool checkIfErrorOrCompleted(IceInternal::SocketOperation, Windows::Foundation::IAsyncInfo^, int = 0);
+    void fillConnectionInfo(const Ice::IPConnectionInfoPtr&) const;
+
+    friend class ConnectorI;
+    friend class AcceptorI;
+
+    const IceInternal::ProtocolInstancePtr _instance;
+
+    State _state;
+    std::string _desc;
+    bool _verified;
+    IceInternal::Address _connectAddr;
+
+    IceInternal::AsyncInfo _read;
+    IceInternal::AsyncInfo _write;
+    int _maxSendPacketSize;
+    int _maxReceivePacketSize;
+
+    Windows::Storage::Streams::DataReader^ _reader;
+    Windows::Storage::Streams::DataWriter^ _writer;
+
+    Windows::Foundation::AsyncOperationCompletedHandler<unsigned int>^ _readOperationCompletedHandler;
+    Windows::Foundation::AsyncOperationCompletedHandler<unsigned int>^ _writeOperationCompletedHandler;
+};
+
+}
+
+#endif
diff --git a/cpp/src/IceStorm/.depend.mak b/cpp/src/IceStorm/.depend.mak
deleted file mode 100755
index 2779eac2bee..00000000000
--- a/cpp/src/IceStorm/.depend.mak
+++ /dev/null
@@ -1,3923 +0,0 @@
-
-Election.h: \
-    Election.ice \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    ./SubscriberRecord.ice \
-    "$(slicedir)/IceStorm/IceStorm.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/IceStorm/Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    ./LLURecord.ice
-
-IceStormInternal.h: \
-    IceStormInternal.ice \
-    "$(slicedir)/IceStorm/IceStorm.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/IceStorm/Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    ./Election.ice \
-    ./SubscriberRecord.ice \
-    ./LLURecord.ice \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Version.ice"
-
-Instrumentation.h: \
-    Instrumentation.ice \
-    "$(slicedir)/Ice/Instrumentation.ice" \
-    "$(slicedir)/Ice/EndpointF.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/IceStorm/IceStorm.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/IceStorm/Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-LinkRecord.h: \
-    LinkRecord.ice \
-    "$(slicedir)/Ice/Identity.ice" \
-    ./IceStormInternal.ice \
-    "$(slicedir)/IceStorm/IceStorm.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/IceStorm/Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    ./Election.ice \
-    ./SubscriberRecord.ice \
-    ./LLURecord.ice \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Version.ice"
-
-LLURecord.h: \
-    LLURecord.ice
-
-SubscriberRecord.h: \
-    SubscriberRecord.ice \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/IceStorm/IceStorm.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/IceStorm/Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-V31Format.h: \
-    V31Format.ice \
-    ./LinkRecord.ice \
-    "$(slicedir)/Ice/Identity.ice" \
-    ./IceStormInternal.ice \
-    "$(slicedir)/IceStorm/IceStorm.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/IceStorm/Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    ./Election.ice \
-    ./SubscriberRecord.ice \
-    ./LLURecord.ice \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Version.ice"
-
-V32Format.h: \
-    V32Format.ice \
-    ./LinkRecord.ice \
-    "$(slicedir)/Ice/Identity.ice" \
-    ./IceStormInternal.ice \
-    "$(slicedir)/IceStorm/IceStorm.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/IceStorm/Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    ./Election.ice \
-    ./SubscriberRecord.ice \
-    ./LLURecord.ice \
-    "$(slicedir)/Ice/Current.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Version.ice"
-
-DBTypes.h: \
-    DBTypes.ice \
-    ./SubscriberRecord.ice \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/IceStorm/IceStorm.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/IceStorm/Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    ./LLURecord.ice
-
-Instance.obj: \
-	Instance.cpp \
-    "Instance.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "Election.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "SubscriberRecord.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "LLURecord.h" \
-    "Instrumentation.h" \
-    "TraceLevels.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "Observers.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "Replica.h" \
-    "NodeI.h" \
-    "InstrumentationI.h" \
-    "$(includedir)\Ice\MetricsObserverI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\Ice\MetricsAdminI.h" \
-    "$(includedir)\Ice\MetricsFunctional.h" \
-    "..\..\src\Ice\InstrumentationI.h" \
-
-InstrumentationI.obj: \
-	InstrumentationI.cpp \
-    "InstrumentationI.h" \
-    "$(includedir)\Ice\MetricsObserverI.h" \
-    "..\..\src\IceUtil\StopWatch.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\MetricsAdminI.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\MetricsFunctional.h" \
-    "Instrumentation.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\Logger.h" \
-
-LLUMap.obj: \
-	LLUMap.cpp \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "LLUMap.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "LLURecord.h" \
-
-NodeI.obj: \
-	NodeI.cpp \
-    "NodeI.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "LLURecord.h" \
-    "Replica.h" \
-    "Instance.h" \
-    "Instrumentation.h" \
-    "Observers.h" \
-    "TraceLevels.h" \
-
-Observers.obj: \
-	Observers.cpp \
-    "Observers.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "LLURecord.h" \
-    "Replica.h" \
-    "Instance.h" \
-    "Instrumentation.h" \
-    "TraceLevels.h" \
-
-Service.obj: \
-	Service.cpp \
-    "..\..\src\Ice\PluginManagerI.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\DynamicLibraryF.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "TopicI.h" \
-    "IceStormInternal.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "LLURecord.h" \
-    "Instrumentation.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "TopicManagerI.h" \
-    "Replica.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "TransientTopicManagerI.h" \
-    "Instance.h" \
-    "Service.h" \
-    "$(includedir)\IceBox\IceBox.h" \
-    "$(includedir)\IceBox\Config.h" \
-    "Observers.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "TraceLevels.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "NodeI.h" \
-    "TransientTopicI.h" \
-    "$(includedir)\IceGrid\Locator.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "$(includedir)\IceGrid\Exception.h" \
-
-Subscriber.obj: \
-	Subscriber.cpp \
-    "Subscriber.h" \
-    "IceStormInternal.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "LLURecord.h" \
-    "Instrumentation.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "Instance.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "TraceLevels.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "NodeI.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Replica.h" \
-    "Util.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-
-SubscriberMap.obj: \
-	SubscriberMap.cpp \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "SubscriberMap.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "SubscriberRecord.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-
-TopicI.obj: \
-	TopicI.cpp \
-    "TopicI.h" \
-    "IceStormInternal.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "LLURecord.h" \
-    "Instrumentation.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "Instance.h" \
-    "Subscriber.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "TraceLevels.h" \
-    "NodeI.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "Replica.h" \
-    "Observers.h" \
-    "SubscriberMap.h" \
-    "LLUMap.h" \
-    "Util.h" \
-
-TopicManagerI.obj: \
-	TopicManagerI.cpp \
-    "TopicManagerI.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Replica.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "LLURecord.h" \
-    "Instrumentation.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "TopicI.h" \
-    "IceStormInternal.h" \
-    "TraceLevels.h" \
-    "Instance.h" \
-    "NodeI.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "Observers.h" \
-    "Subscriber.h" \
-    "SubscriberMap.h" \
-    "LLUMap.h" \
-    "Util.h" \
-
-TraceLevels.obj: \
-	TraceLevels.cpp \
-    "TraceLevels.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-
-TransientTopicI.obj: \
-	TransientTopicI.cpp \
-    "TransientTopicI.h" \
-    "IceStormInternal.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "LLURecord.h" \
-    "Instance.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "Instrumentation.h" \
-    "Subscriber.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "TraceLevels.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "Util.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-
-TransientTopicManagerI.obj: \
-	TransientTopicManagerI.cpp \
-    "TransientTopicManagerI.h" \
-    "IceStormInternal.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "LLURecord.h" \
-    "TransientTopicI.h" \
-    "TraceLevels.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "Instance.h" \
-    "Instrumentation.h" \
-    "Subscriber.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-
-Util.obj: \
-	Util.cpp \
-    "Util.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "LLURecord.h" \
-    "LLUMap.h" \
-
-V31FormatDB.obj: \
-	V31FormatDB.cpp \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "V31FormatDB.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "V31Format.h" \
-    "LinkRecord.h" \
-    "IceStormInternal.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "LLURecord.h" \
-
-V32FormatDB.obj: \
-	V32FormatDB.cpp \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "V32FormatDB.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "V32Format.h" \
-    "LinkRecord.h" \
-    "IceStormInternal.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "LLURecord.h" \
-
-Election.obj: \
-	Election.cpp \
-    "Election.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "SubscriberRecord.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "LLURecord.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-IceStormInternal.obj: \
-	IceStormInternal.cpp \
-    "IceStormInternal.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "LLURecord.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-Instrumentation.obj: \
-	Instrumentation.cpp \
-    "Instrumentation.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-LinkRecord.obj: \
-	LinkRecord.cpp \
-    "LinkRecord.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "IceStormInternal.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "LLURecord.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-LLURecord.obj: \
-	LLURecord.cpp \
-    "LLURecord.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-
-SubscriberRecord.obj: \
-	SubscriberRecord.cpp \
-    "SubscriberRecord.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-V31Format.obj: \
-	V31Format.cpp \
-    "V31Format.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "LinkRecord.h" \
-    "IceStormInternal.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "LLURecord.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-V32Format.obj: \
-	V32Format.cpp \
-    "V32Format.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "LinkRecord.h" \
-    "IceStormInternal.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "LLURecord.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-
-Admin.obj: \
-	Admin.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Parser.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-
-Parser.obj: \
-	Parser.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Parser.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "IceStormInternal.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "LLURecord.h" \
-
-Grammar.obj: \
-	Grammar.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Parser.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-
-Scanner.obj: \
-	Scanner.cpp \
-    "$(includedir)\IceUtil\ScannerConfig.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "Parser.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Grammar.h" \
-
-Migrate.obj: \
-	Migrate.cpp \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "IceStormInternal.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "Election.h" \
-    "SubscriberRecord.h" \
-    "LLURecord.h" \
-    "SubscriberMap.h" \
-    "LLUMap.h" \
-    "V32FormatDB.h" \
-    "V32Format.h" \
-    "LinkRecord.h" \
-    "V31FormatDB.h" \
-    "V31Format.h" \
-
-IceStormDB.obj: \
-	IceStormDB.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\Freeze\Freeze.h" \
-    "$(includedir)\Freeze\Initialize.h" \
-    "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\Freeze\ConnectionF.h" \
-    "$(includedir)\Freeze\Index.h" \
-    "$(includedir)\Freeze\DB.h" \
-    "$(includedir)\Freeze\Transaction.h" \
-    "$(includedir)\Freeze\BackgroundSaveEvictor.h" \
-    "$(includedir)\Freeze\Evictor.h" \
-    "$(includedir)\Freeze\Exception.h" \
-    "$(includedir)\Freeze\TransactionalEvictor.h" \
-    "$(includedir)\Freeze\Map.h" \
-    "$(includedir)\Freeze\Connection.h" \
-    "$(includedir)\Freeze\TransactionHolder.h" \
-    "$(includedir)\Freeze\Catalog.h" \
-    "$(includedir)\Freeze\CatalogData.h" \
-    "..\..\src\IcePatch2Lib\Util.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
-    "DBTypes.h" \
-    "SubscriberRecord.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "LLURecord.h" \
-    "LLUMap.h" \
-    "SubscriberMap.h" \
-
-DBTypes.obj: \
-	DBTypes.cpp \
-    "DBTypes.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "SubscriberRecord.h" \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "LLURecord.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
diff --git a/cpp/src/IceStorm/.gitignore b/cpp/src/IceStorm/.gitignore
deleted file mode 100644
index a32b97ba56c..00000000000
--- a/cpp/src/IceStorm/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
-Election.cpp
-IceStormInternal.cpp
-Instrumentation.cpp
-LinkRecord.cpp
-LLURecord.cpp
-SubscriberRecord.cpp
-V31Format.cpp
-V32Format.cpp
-DBTypes.cpp
-Election.h
-IceStormInternal.h
-Instrumentation.h
-LinkRecord.h
-LLURecord.h
-SubscriberRecord.h
-V31Format.h
-V32Format.h
-DBTypes.h
-LinkRecord.h
-LinkRecord.cpp
-LLUMap.h
-LLUMap.cpp
-SubscriberMap.h
-SubscriberMap.cpp
-V31FormatDB.h
-V31FormatDB.cpp
-V32FormatDB.h
-V32FormatDB.cpp
diff --git a/cpp/src/IceStorm/DBTypes.ice b/cpp/src/IceStorm/DBTypes.ice
index c75556f7100..79a9154c07f 100644
--- a/cpp/src/IceStorm/DBTypes.ice
+++ b/cpp/src/IceStorm/DBTypes.ice
@@ -11,8 +11,8 @@
 
 [["cpp:header-ext:h"]]
 
-#include <SubscriberRecord.ice>
-#include <LLURecord.ice>
+#include <IceStorm/SubscriberRecord.ice>
+#include <IceStorm/LLURecord.ice>
 
 module IceStormElection
 {
diff --git a/cpp/src/IceStorm/IceStormAdmin.rc b/cpp/src/IceStorm/IceStormAdmin.rc
index 7614ab71078..678a3e1ea2f 100644
--- a/cpp/src/IceStorm/IceStormAdmin.rc
+++ b/cpp/src/IceStorm/IceStormAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm Admin\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "icestormadmin\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icestormadmin.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp
index 0777c842272..20ff33ed6a6 100644
--- a/cpp/src/IceStorm/IceStormDB.cpp
+++ b/cpp/src/IceStorm/IceStormDB.cpp
@@ -7,14 +7,11 @@
 //
 // **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <IceUtil/Options.h>
-#include <IceUtil/FileUtil.h>
 #include <Ice/Application.h>
-#include <Freeze/Freeze.h>
-#include <DBTypes.h>
-#include <LLUMap.h>
-#include <SubscriberMap.h>
+#include <IceDB/IceDB.h>
+#include <IceStorm/DBTypes.h>
+#include <IceUtil/DisableWarnings.h>
 
 using namespace std;
 using namespace Ice;
@@ -55,7 +52,9 @@ Client::usage()
         "-v, --version          Display version.\n"
         "--import FILE          Import database from FILE.\n"
         "--export FILE          Export database to FILE.\n"
-        "--dbhome DIR           The database directory.\n"
+        "--dbhome DIR           Source or target database environment.\n"
+        "--dbpath DIR           Source or target database environment.\n"
+        "--mapsize VALUE        Set LMDB map size in MB (optional, import only).\n"
         "-d, --debug            Print debug messages.\n"
         ;
 }
@@ -70,6 +69,8 @@ Client::run(int argc, char* argv[])
     opts.addOpt("", "import", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "export", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "dbhome", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "dbpath", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "mapsize", IceUtilInternal::Options::NeedArg);
 
     vector<string> args;
     try
@@ -101,16 +102,16 @@ Client::run(int argc, char* argv[])
         return EXIT_SUCCESS;
     }
 
-    if((!opts.isSet("import") && !opts.isSet("export")) || (opts.isSet("import") && opts.isSet("export")))
+    if(!(opts.isSet("import") ^ opts.isSet("export")))
     {
         cerr << argv[0] << ": either --import or --export must be set" << endl;
         usage();
         return EXIT_FAILURE;
     }
 
-    if(!opts.isSet("dbhome"))
+    if(!(opts.isSet("dbhome") ^ opts.isSet("dbpath")))
     {
-        cerr << argv[0] << ": database path must be specified" << endl;
+        cerr << argv[0] << ": set the database environment directory with either --dbhome or --dbpath" << endl;
         usage();
         return EXIT_FAILURE;
     }
@@ -118,17 +119,27 @@ Client::run(int argc, char* argv[])
     bool debug = opts.isSet("debug");
     bool import = opts.isSet("import");
     string dbFile = opts.optArg(import ? "import" : "export");
-    string dbPath = opts.optArg("dbhome");
+    string dbPath;
+    if(opts.isSet("dbhome"))
+    {
+        dbPath = opts.optArg("dbhome");
+    }
+    else
+    {
+        dbPath = opts.optArg("dbpath");
+    }
+
+    string mapSizeStr = opts.optArg("mapsize");
+    size_t mapSize = IceDB::getMapSize(atoi(mapSizeStr.c_str()));
 
     try
     {
         IceStorm::AllData data;
 
-        EncodingVersion encoding;
-        encoding.major = 1;
-        encoding.minor = 1;
-
-        communicator()->getProperties()->setProperty("Freeze.DbEnv.IceStorm.DbHome", dbPath);
+        IceDB::IceContext dbContext;
+        dbContext.communicator = communicator();
+        dbContext.encoding.major = 1;
+        dbContext.encoding.minor = 1;
 
         if(import)
         {
@@ -156,6 +167,14 @@ Client::run(int argc, char* argv[])
 
             fs.seekg(0, ios::end);
             streampos fileSize = fs.tellg();
+
+            if(!fileSize)
+            {
+                fs.close();
+                cerr << argv[0] << ": empty input file" << endl;
+                return EXIT_FAILURE;
+            }
+
             fs.seekg(0, ios::beg);
 
             vector<Ice::Byte> buf;
@@ -167,33 +186,35 @@ Client::run(int argc, char* argv[])
             string type;
             int version;
 
-            Ice::InputStreamPtr stream = Ice::wrapInputStream(communicator(), buf, encoding);
-            stream->read(type);
+            Ice::InputStream stream(communicator(), dbContext.encoding, buf);
+            stream.read(type);
             if(type != "IceStorm")
             {
                 cerr << argv[0] << ": incorrect input file type: " << type << endl;
                 return EXIT_FAILURE;
             }
-            stream->read(version);
-            stream->read(data);
+            stream.read(version);
+            stream.read(data);
 
             {
-                Freeze::ConnectionPtr connection = Freeze::createConnection(communicator(), "IceStorm");
-                Freeze::TransactionHolder txn(connection);
+                IceDB::Env env(dbPath, 2, mapSize);
+                IceDB::ReadWriteTxn txn(env);
 
                 if(debug)
                 {
                     cout << "Writing LLU Map:" << endl;
                 }
 
-                IceStorm::LLUMap llumap(connection, "llu");
+                IceDB::Dbi<string, LogUpdate, IceDB::IceContext, Ice::OutputStream>
+                    lluMap(txn, "llu", dbContext, MDB_CREATE);
+
                 for(StringLogUpdateDict::const_iterator p = data.llus.begin(); p != data.llus.end(); ++p)
                 {
                     if(debug)
                     {
                         cout << "  KEY = " << p->first << endl;
                     }
-                    llumap.put(*p);
+                    lluMap.put(txn, p->first, p->second);
                 }
 
                 if(debug)
@@ -201,7 +222,9 @@ Client::run(int argc, char* argv[])
                     cout << "Writing Subscriber Map:" << endl;
                 }
 
-                IceStorm::SubscriberMap subscribers(connection, "subscribers");
+                IceDB::Dbi<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
+                    subscriberMap(txn, "subscribers", dbContext, MDB_CREATE);
+
                 for(SubscriberRecordDict::const_iterator q = data.subscribers.begin(); q != data.subscribers.end(); ++q)
                 {
                     if(debug)
@@ -209,10 +232,11 @@ Client::run(int argc, char* argv[])
                         cout << "  KEY = TOPIC(" << communicator()->identityToString(q->first.topic)
                              << ") ID(" << communicator()->identityToString(q->first.id) << ")" <<endl;
                     }
-                    subscribers.put(*q);
+                    subscriberMap.put(txn, q->first, q->second);
                 }
 
                 txn.commit();
+                env.close();
             }
         }
         else
@@ -220,45 +244,61 @@ Client::run(int argc, char* argv[])
             cout << "Exporting database from directory " << dbPath << " to file " << dbFile << endl;
 
             {
-                Freeze::ConnectionPtr connection = Freeze::createConnection(communicator(), "IceStorm");
+                IceDB::Env env(dbPath, 2);
+                IceDB::ReadOnlyTxn txn(env);
 
                 if(debug)
                 {
                     cout << "Reading LLU Map:" << endl;
                 }
 
-                IceStorm::LLUMap llumap(connection, "llu", false);
-                for(IceStorm::LLUMap::const_iterator p = llumap.begin(); p != llumap.end(); ++p)
+                IceDB::Dbi<string, LogUpdate, IceDB::IceContext, Ice::OutputStream>
+                    lluMap(txn, "llu", dbContext, 0);
+
+                string s;
+                LogUpdate llu;
+                IceDB::ReadOnlyCursor<string, LogUpdate, IceDB::IceContext, Ice::OutputStream> lluCursor(lluMap, txn);
+                while(lluCursor.get(s, llu, MDB_NEXT))
                 {
                     if(debug)
                     {
-                        cout << "  KEY = " << p->first << endl;
+                        cout << "  KEY = " << s << endl;
                     }
-                    data.llus.insert(*p);
+                    data.llus.insert(std::make_pair(s, llu));
                 }
+                lluCursor.close();
 
                 if(debug)
                 {
                     cout << "Reading Subscriber Map:" << endl;
                 }
 
-                IceStorm::SubscriberMap subscribers(connection, "subscribers", false);
-                for(IceStorm::SubscriberMap::const_iterator q = subscribers.begin(); q != subscribers.end(); ++q)
+                IceDB::Dbi<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
+                    subscriberMap(txn, "subscribers", dbContext, 0);
+
+                SubscriberRecordKey key;
+                SubscriberRecord record;
+                IceDB::ReadOnlyCursor<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
+                    subCursor(subscriberMap, txn);
+                while(subCursor.get(key, record, MDB_NEXT))
                 {
                     if(debug)
                     {
-                        cout << "  KEY = TOPIC(" << communicator()->identityToString(q->first.topic)
-                             << ") ID(" << communicator()->identityToString(q->first.id) << ")" <<endl;
+                        cout << "  KEY = TOPIC(" << communicator()->identityToString(key.topic)
+                             << ") ID(" << communicator()->identityToString(key.id) << ")" <<endl;
                     }
-                    data.subscribers.insert(*q);
+                    data.subscribers.insert(std::make_pair(key, record));
                 }
+                subCursor.close();
+
+                txn.rollback();
+                env.close();
             }
 
-            Ice::OutputStreamPtr stream = Ice::createOutputStream(communicator(), encoding);
-            stream->write("IceStorm");
-            stream->write(ICE_INT_VERSION);
-            stream->write(data);
-            pair<const Ice::Byte*, const Ice::Byte*> buf = stream->finished();
+            Ice::OutputStream stream(communicator(), dbContext.encoding);
+            stream.write("IceStorm");
+            stream.write(ICE_INT_VERSION);
+            stream.write(data);
 
             ofstream fs(dbFile.c_str(), ios::binary);
             if(fs.fail())
@@ -266,7 +306,7 @@ Client::run(int argc, char* argv[])
                 cerr << argv[0] << ": could not open output file: " << strerror(errno) << endl;
                 return EXIT_FAILURE;
             }
-            fs.write(reinterpret_cast<const char*>(buf.first), buf.second - buf.first);
+            fs.write(reinterpret_cast<const char*>(stream.b.begin()), stream.b.size());
             fs.close();
         }
     }
diff --git a/cpp/src/IceStorm/IceStormDB.rc b/cpp/src/IceStorm/IceStormDB.rc
index 7c5d32fbcfd..1b38a416e96 100644
--- a/cpp/src/IceStorm/IceStormDB.rc
+++ b/cpp/src/IceStorm/IceStormDB.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStormDB\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "icestormdb\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icestormdb.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormMigrate.rc b/cpp/src/IceStorm/IceStormMigrate.rc
deleted file mode 100644
index 29c235d5bbf..00000000000
--- a/cpp/src/IceStorm/IceStormMigrate.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "Migration Utility for IceStorm Database\0"
-            VALUE "FileVersion", "3.6.3\0"
-            VALUE "InternalName", "icestormmigrate\0"
-            VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
-            VALUE "OriginalFilename", "icestormmigrate.exe\0"
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
diff --git a/cpp/src/IceStorm/IceStormService.rc b/cpp/src/IceStorm/IceStormService.rc
index a415a7657bb..5c3b0119f9f 100644
--- a/cpp/src/IceStorm/IceStormService.rc
+++ b/cpp/src/IceStorm/IceStormService.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormservice36d\0"
- #define ORIGINALFILENAME "icestormservice36d.dll\0"
+ #define INTERNALNAME "icestormservice37a2d\0"
+ #define ORIGINALFILENAME "icestormservice37a2d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icestormservice36\0"
- #define ORIGINALFILENAME "icestormservice36.dll\0"
+ #define INTERNALNAME "icestormservice37a2\0"
+ #define ORIGINALFILENAME "icestormservice37a2.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm C++ Service for IceBox\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/Instance.cpp b/cpp/src/IceStorm/Instance.cpp
index c894184865b..e9e96e49bf5 100644
--- a/cpp/src/IceStorm/Instance.cpp
+++ b/cpp/src/IceStorm/Instance.cpp
@@ -21,6 +21,12 @@
 using namespace std;
 using namespace IceStorm;
 using namespace IceStormElection;
+using namespace IceStormInternal;
+
+namespace IceStormInternal
+{
+extern IceDB::IceContext dbContext;
+}
 
 void
 TopicReaper::add(const string& name)
@@ -38,6 +44,50 @@ TopicReaper::consumeReapedTopics()
     return reaped;
 }
 
+PersistentInstance::PersistentInstance(
+    const string& instanceName,
+    const string& name,
+    const Ice::CommunicatorPtr& communicator,
+    const Ice::ObjectAdapterPtr& publishAdapter,
+    const Ice::ObjectAdapterPtr& topicAdapter,
+    const Ice::ObjectAdapterPtr& nodeAdapter,
+    const NodePrx& nodeProxy) :
+    Instance(instanceName, name, communicator, publishAdapter, topicAdapter, nodeAdapter, nodeProxy),
+    _dbLock(communicator->getProperties()->getPropertyWithDefault(name + ".LMDB.Path", name) + "/icedb.lock"),
+    _dbEnv(communicator->getProperties()->getPropertyWithDefault(name + ".LMDB.Path", name), 2,
+           IceDB::getMapSize(communicator->getProperties()->getPropertyAsInt(name + ".LMDB.MapSize")))
+{
+    try
+    {
+        dbContext.communicator = communicator;
+        dbContext.encoding.minor = 1;
+        dbContext.encoding.major = 1;
+
+        IceDB::ReadWriteTxn txn(_dbEnv);
+
+        _lluMap = LLUMap(txn, "llu", dbContext, MDB_CREATE);
+        _subscriberMap = SubscriberMap(txn, "subscribers", dbContext, MDB_CREATE, compareSubscriberRecordKey);
+
+        txn.commit();
+    }
+    catch(...)
+    {
+        shutdown();
+        destroy();
+
+        throw;
+    }
+}
+
+void
+PersistentInstance::destroy()
+{
+    _dbEnv.close();
+    dbContext.communicator = 0;
+
+    Instance::destroy();
+}
+
 Instance::Instance(
     const string& instanceName,
     const string& name,
diff --git a/cpp/src/IceStorm/Instance.h b/cpp/src/IceStorm/Instance.h
index 9b4a31ba88e..e7e5814a598 100644
--- a/cpp/src/IceStorm/Instance.h
+++ b/cpp/src/IceStorm/Instance.h
@@ -17,6 +17,7 @@
 #include <IceUtil/Time.h>
 #include <IceStorm/Election.h>
 #include <IceStorm/Instrumentation.h>
+#include <IceStorm/Util.h>
 
 namespace IceUtil
 {
@@ -89,7 +90,7 @@ public:
     int sendTimeout() const;
 
     void shutdown();
-    void destroy();
+    virtual void destroy();
 
 private:
 
@@ -112,9 +113,37 @@ private:
     IceUtil::TimerPtr _batchFlusher;
     IceUtil::TimerPtr _timer;
     IceStorm::Instrumentation::TopicManagerObserverPtr _observer;
+
+
 };
 typedef IceUtil::Handle<Instance> InstancePtr;
 
+typedef IceDB::ReadWriteCursor<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
+        SubscriberMapRWCursor;
+
+class PersistentInstance : public Instance
+{
+public:
+
+    PersistentInstance(const std::string&, const std::string&, const Ice::CommunicatorPtr&,
+                       const Ice::ObjectAdapterPtr&, const Ice::ObjectAdapterPtr&, const Ice::ObjectAdapterPtr& = 0,
+                       const IceStormElection::NodePrx& = 0);
+
+    const IceDB::Env& dbEnv() const { return _dbEnv; }
+    LLUMap lluMap() const { return _lluMap; }
+    SubscriberMap subscriberMap() const { return _subscriberMap; }
+
+    virtual void destroy();
+
+private:
+
+    IceUtilInternal::FileLock _dbLock;
+    IceDB::Env _dbEnv;
+    LLUMap _lluMap;
+    SubscriberMap _subscriberMap;
+};
+typedef IceUtil::Handle<PersistentInstance> PersistentInstancePtr;
+
 } // End namespace IceStorm
 
 #endif
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
deleted file mode 100644
index 83b770860f6..00000000000
--- a/cpp/src/IceStorm/Makefile
+++ /dev/null
@@ -1,159 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME  	= $(call mklibfilename,IceStormService,$(VERSION))
-SONAME       	= $(call mksoname,IceStormService,$(SOVERSION))
-LIBNAME	     	= $(call mklibname,IceStormService)
-
-ADMIN		= $(bindir)/icestormadmin
-DB		= $(bindir)/icestormdb
-MIGRATE		= $(bindir)/icestormmigrate
-LIBTARGETS   	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-TARGETS         = $(LIBTARGETS) $(ADMIN) $(MIGRATE) $(DB)
-
-CSLICE_OBJS	= Election.o \
-		  IceStormInternal.o \
-		  Instrumentation.o \
-		  LinkRecord.o \
-		  LLURecord.o \
-		  SubscriberRecord.o \
-		  V31Format.o \
-		  V32Format.o
-
-LIB_OBJS	= Instance.o \
-		  InstrumentationI.o \
-		  LLUMap.o \
-		  NodeI.o \
-		  Observers.o \
-		  Service.o \
-		  Subscriber.o \
-		  SubscriberMap.o \
-		  TopicI.o \
-		  TopicManagerI.o \
-		  TraceLevels.o \
-		  TransientTopicI.o \
-		  TransientTopicManagerI.o \
-		  Util.o \
-		  V31FormatDB.o \
-		  V32FormatDB.o \
-		  $(CSLICE_OBJS)
-
-AOBJS		= Admin.o \
-		  Grammar.o \
-		  Parser.o \
-		  Scanner.o \
-		  $(CSLICE_OBJS)
-
-MOBJS		= LLUMap.o \
-		  Migrate.o \
-		  SubscriberMap.o \
-		  V31FormatDB.o \
-		  V32FormatDB.o \
-		  $(CSLICE_OBJS)
-
-DSLICE_OBJS	= DBTypes.o
-
-DOBJS		= IceStormDB.o \
-		  LLUMap.o \
-		  SubscriberMap.o \
-		  $(DSLICE_OBJS)
-
-OBJS		= $(LIB_OBJS) \
-		  $(AOBJS) \
-		  $(MOBJS) \
-		  $(DOBJS)
-
-SLICE_OBJS	= $(CSLICE_OBJS) \
-		  $(DSLICE_OBJS)
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-SLICE2FREEZECMD = $(SLICE2FREEZE) -I../.. --ice --include-dir IceStorm $(ICECPPFLAGS)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= $(CPPFLAGS) -I. -I.. $(READLINE_FLAGS)
-ICECPPFLAGS	:= $(ICECPPFLAGS) -I..
-SLICE2CPPFLAGS	:= --ice --include-dir IceStorm -I. $(SLICE2CPPFLAGS)
-LINKWITH	:= $(BZIP2_RPATH_LINK) -lIceStorm -lIceGrid -lGlacier2 -lFreeze -lIceBox -lIce -lIceUtil
-
-$(libdir)/$(LIBFILENAME): $(LIB_OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(LIB_OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	@mkdir -p $(libdir)$(cpp11libdirsuffix)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-
-$(ADMIN): $(AOBJS) $(LIBTARGETS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(AOBJS) -lIceStorm $(READLINE_LIBS) $(LIBS)
-
-$(DB): $(DOBJS) $(LIBTARGETS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(DOBJS) -lIceStorm -lFreeze $(LIBS)
-
-$(MIGRATE): $(MOBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(DB_RPATH_LINK) $(LDEXEFLAGS) -o $@ $(MOBJS) -lIceStorm -lFreeze $(LIBS)
-
-# The slice2freeze rules are structured like this to avoid issues with
-# parallel make.
-../IceStorm/LLUMap.h: LLUMap.cpp
-LLUMap.cpp: ../IceStorm/LLURecord.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	rm -f LLUMap.h LLUMap.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate \
-	LLUMap ../IceStorm/LLURecord.ice
-
-../IceStorm/SubscriberMap.h: SubscriberMap.cpp
-SubscriberMap.cpp: ../IceStorm/SubscriberRecord.ice $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	rm -f SubscriberMap.h SubscriberMap.cpp
-	$(SLICE2FREEZECMD) \
-	--dict IceStorm::SubscriberMap,IceStorm::SubscriberRecordKey,IceStorm::SubscriberRecord,sort \
-	SubscriberMap ../IceStorm/SubscriberRecord.ice
-
-# Needed for migration.
-../IceStorm/V32FormatDB.h: V32FormatDB.cpp
-V32FormatDB.cpp: ../IceStorm/V32Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	rm -f V32FormatDB.h V32FormatDB.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \
-	V32FormatDB ../IceStorm/V32Format.ice
-
-../IceStorm/V31FormatDB.h: V31FormatDB.cpp
-V31FormatDB.cpp: ../IceStorm/V31Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	rm -f V31FormatDB.h V31FormatDB.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \
-	V31FormatDB ../IceStorm/V31Format.ice
-
-# Needed for make -jn to work.
-../IceStorm/Grammar.y: Grammar.h
-
-clean::
-	-rm -f LinkRecord.h LinkRecord.cpp
-	-rm -f LLUMap.h LLUMap.cpp
-	-rm -f SubscriberMap.h SubscriberMap.cpp
-	-rm -f V31FormatDB.h V31FormatDB.cpp
-	-rm -f V32FormatDB.h V32FormatDB.cpp
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
-	$(call installprogram,$(ADMIN),$(DESTDIR)$(install_bindir))
-	$(call installprogram,$(DB),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/icestormadmin.1,$(DESTDIR)$(install_mandir))
-	$(call installprogram,$(MIGRATE),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/icestormmigrate.1,$(DESTDIR)$(install_mandir))
-	$(call installdata,$(top_srcdir)/../man/man1/icestormdb.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak
deleted file mode 100644
index f4dbea90de2..00000000000
--- a/cpp/src/IceStorm/Makefile.mak
+++ /dev/null
@@ -1,195 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME		= $(top_srcdir)\lib\icestormservice$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icestormservice$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-ADMIN		= $(top_srcdir)\bin\icestormadmin.exe
-DB		= $(top_srcdir)\bin\icestormdb.exe
-MIGRATE		= $(top_srcdir)\bin\icestormmigrate.exe
-
-TARGETS		= $(LIBNAME) $(DLLNAME) $(ADMIN) $(MIGRATE) $(DB)
-
-CSLICE_OBJS     = .\Election.obj \
-		  .\IceStormInternal.obj \
-		  .\Instrumentation.obj \
-		  .\LinkRecord.obj \
-		  .\LLURecord.obj \
-		  .\SubscriberRecord.obj \
-		  .\V31Format.obj \
-		  .\V32Format.obj
-
-DSLICE_OBJS     = .\DBTypes.obj
-
-BISON_FLEX_OBJS = .\Grammar.obj \
-                  .\Scanner.obj
-
-LIB_OBJS	= .\Instance.obj \
-		  .\InstrumentationI.obj \
-		  .\LLUMap.obj \
-		  .\NodeI.obj \
-		  .\Observers.obj \
-		  .\Service.obj \
-		  .\Subscriber.obj \
-		  .\SubscriberMap.obj \
-		  .\TopicI.obj \
-		  .\TopicManagerI.obj \
-		  .\TraceLevels.obj \
-		  .\TransientTopicI.obj \
-		  .\TransientTopicManagerI.obj \
-		  .\Util.obj \
-		  .\V31FormatDB.obj \
-		  .\V32FormatDB.obj \
-                  $(CSLICE_OBJS)
-
-AOBJS		= .\Admin.obj \
-		  .\Parser.obj \
-                  $(CSLICE_OBJS) \
-                  $(BISON_FLEX_OBJS)
-
-MOBJS		= .\LLUMap.obj \
-                  .\Migrate.obj \
-                  .\SubscriberMap.obj \
-                  .\V31FormatDB.obj \
-		  .\V32FormatDB.obj \
-                  $(CSLICE_OBJS)
-
-DOBJS		= .\IceStormDB.obj \
-                  .\LLUMap.obj \
-                  .\SubscriberMap.obj \
-                  $(DSLICE_OBJS)
-
-OBJS		= $(LIB_OBJS) \
-		  $(AOBJS) \
-		  $(MOBJS) \
-		  $(DOBJS)
-
-SLICE_OBJS	= $(CSLICE_OBJS) \
-		  $(DSLICE_OBJS)
-
-HDIR		= $(headerdir)\IceStorm
-SDIR		= $(slicedir)\IceStorm
-
-SLICE2FREEZECMD = $(SLICE2FREEZE) -I.. --ice --include-dir IceStorm $(ICECPPFLAGS)
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-ICECPPFLAGS	= $(ICECPPFLAGS) -I..
-SLICE2CPPFLAGS	= --ice --include-dir IceStorm -I. $(SLICE2CPPFLAGS)
-LINKWITH 	= $(LIBS)
-ALINKWITH 	= $(LIBS) 
-MLINKWITH 	= $(LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-APDBFLAGS       = /pdb:$(ADMIN:.exe=.pdb)
-DPDBFLAGS       = /pdb:$(DB:.exe=.pdb)
-MPDBFLAGS       = /pdb:$(MIGRATE:.exe=.pdb)
-!endif
-
-RES_FILE        = IceStormService.res
-ARES_FILE       = IceStormAdmin.res
-DRES_FILE       = IceStormDB.res
-MRES_FILE       = IceStormMigrate.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(LIB_OBJS) $(RES_FILE)
-	$(LINK) $(BASE):0x2C000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(LIB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-$(ADMIN): $(AOBJS) $(ARES_FILE)
-	$(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH) $(ARES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-$(DB): $(DOBJS) $(DRES_FILE)
-	$(LINK) $(LD_EXEFLAGS) $(DPDBFLAGS) $(DOBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(DRES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-$(MIGRATE): $(MOBJS) $(MRES_FILE)
-	$(LINK) $(LD_EXEFLAGS) $(MPDBFLAGS) $(MOBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(MLINKWITH) $(MRES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-# Implicit rule to build the private IceStorm .ice files.
-{..\IceStorm\}.ice{..\IceStorm\}.h:
-	del /q $(*F).h $(*F).cpp
-	"$(SLICE2CPP)" $(SLICE2CPPFLAGS) $(*F).ice
-
-LLUMap.h LLUMap.cpp: ..\IceStorm\LLURecord.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q LLUMap.h LLUMap.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate LLUMap ..\IceStorm\LLURecord.ice
-
-SubscriberMap.h SubscriberMap.cpp: ..\IceStorm\SubscriberRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q SubscriberMap.h SubscriberMap.cpp
-	$(SLICE2FREEZECMD) \
-	--dict IceStorm::SubscriberMap,IceStorm::SubscriberRecordKey,IceStorm::SubscriberRecord,sort \
-	SubscriberMap ..\IceStorm\SubscriberRecord.ice
-
-# Needed for migration.
-V32FormatDB.h V32FormatDB.cpp: V32Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q V32FormatDB.h V32FormatDB.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \
-	V32FormatDB V32Format.ice
-
-V31FormatDB.h V31FormatDB.cpp: V31Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q V31FormatDB.h V31FormatDB.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \
-	V31FormatDB V31Format.ice
-
-clean::
-	-del /q DBTypes.cpp DBTypes.h
-	-del /q LLUMap.h LLUMap.cpp
-	-del /q IceStormInternal.cpp IceStormInternal.h
-	-del /q Instrumentation.cpp Instrumentation.h
-	-del /q LinkRecord.cpp LinkRecord.h
-	-del /q LLUMap.h LLUMap.cpp
-	-del /q LLURecord.cpp LLURecord.h
-	-del /q SubscriberMap.h SubscriberMap.cpp
-	-del /q SubscriberRecord.cpp SubscriberRecord.h
-	-del /q V31Format.cpp V31Format.h
-	-del /q V32Format.cpp V32Format.h
-	-del /q V32FormatDB.cpp V31FormatDB.cpp V32FormatDB.h V31FormatDB.h
-	-del /q $(ADMIN:.exe=.*)
-	-del /q $(MIGRATE:.exe=.*)
-	-del /q $(DB:.exe=.*)
-	-del /q IceStormAdmin.res IceStormMigrate.res IceStormService.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-	copy $(ADMIN) "$(install_bindir)"
-	copy $(DB) "$(install_bindir)"
-	copy $(MIGRATE) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-        copy $(ADMIN:.exe=.pdb) "$(install_bindir)"
-        copy $(DB:.exe=.pdb) "$(install_bindir)"
-        copy $(MIGRATE:.exe=.pdb) "$(install_bindir)"
-        copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/IceStorm/Makefile.mk b/cpp/src/IceStorm/Makefile.mk
new file mode 100644
index 00000000000..cbed5440bb7
--- /dev/null
+++ b/cpp/src/IceStorm/Makefile.mk
@@ -0,0 +1,54 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries 		:= IceStormService
+$(project)_programs		:= icestormadmin icestormdb
+$(project)_sliceflags   	:= -Isrc --include-dir IceStorm
+$(project)_generated_includedir := $(project)/generated/IceStorm
+$(project)_dependencies		:= IceStorm Ice
+
+IceStormService_targetdir	:= $(libdir)
+IceStormService_dependencies 	:= IceGrid Glacier2 IceBox IceDB
+IceStormService_libs		:= lmdb
+IceStormService_sources   	:= $(addprefix $(currentdir)/,Instance.cpp \
+							     InstrumentationI.cpp \
+							     NodeI.cpp \
+							     Observers.cpp \
+							     Service.cpp \
+							     Subscriber.cpp \
+							     TopicI.cpp \
+							     TopicManagerI.cpp \
+							     TraceLevels.cpp \
+							     TransientTopicI.cpp \
+							     TransientTopicManagerI.cpp \
+							     Util.cpp \
+							     Election.ice \
+							     IceStormInternal.ice \
+							     Instrumentation.ice \
+							     LinkRecord.ice \
+							     LLURecord.ice \
+							     SubscriberRecord.ice \
+							     DBTypes.ice)
+
+icestormadmin_targetdir		:= $(bindir)
+icestormadmin_sources	   	:= $(addprefix $(currentdir)/,Admin.cpp \
+							     Grammar.y \
+							     Parser.cpp \
+							     Scanner.l \
+							     LLURecord.ice \
+							     SubscriberRecord.ice \
+							     Election.ice \
+							     IceStormInternal.ice)
+
+icestormdb_targetdir		:= $(bindir)
+icestormdb_dependencies 	:= IcePatch2 IceDB
+icestormdb_libs			:= lmdb
+icestormdb_sources	   	:= $(addprefix $(currentdir)/,IceStormDB.cpp DBTypes.ice)
+
+projects += $(project)
diff --git a/cpp/src/IceStorm/Migrate.cpp b/cpp/src/IceStorm/Migrate.cpp
deleted file mode 100644
index a2c67c5e970..00000000000
--- a/cpp/src/IceStorm/Migrate.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <Freeze/Freeze.h>
-
-#include <IceStorm/IceStormInternal.h>
-
-#include <IceStorm/SubscriberMap.h>
-#include <IceStorm/LLUMap.h>
-#include <IceStorm/V32FormatDB.h>
-#include <IceStorm/V31FormatDB.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceStorm;
-
-class Client : public Application
-{
-public:
-
-    void usage();
-    virtual int run(int, char*[]);
-
-private:
-
-    void v32migrate(const Freeze::ConnectionPtr&, SubscriberMap&);
-    void v31migrate(const Freeze::ConnectionPtr&, SubscriberMap&);
-};
-
-#ifdef _WIN32
-
-int
-wmain(int argc, wchar_t* argv[])
-
-#else
-
-int
-main(int argc, char* argv[])
-
-#endif
-{
-    Client app;
-    int rc = app.main(argc, argv);
-    return rc;
-}
-
-void
-Client::usage()
-{
-    cerr << "Usage: " << appName() << " old-env new-env\n";
-    cerr << "\n";
-    cerr << "This utility upgrades a 3.1 or 3.2 IceStorm database environment\n";
-    cerr << "to a 3.3 or superior IceStorm database environment.\n";
-}
-
-string
-identityToTopicName(const Ice::Identity& id)
-{
-    //
-    // Work out the topic name. If the category is empty then we're in
-    // backwards compatibility mode and the name is just
-    // identity.name. Otherwise identity.name is topic.<topicname>.
-    //
-    if(id.category.empty())
-    {
-        return id.name;
-    }
-
-    assert(id.name.length() > 6 && id.name.compare(0, 6, "topic.") == 0);
-    return id.name.substr(6);
-}
-
-void
-Client::v32migrate(const Freeze::ConnectionPtr& oldCon, SubscriberMap& subscriberMap)
-{
-    // We should not create the old database.
-    V32Format topicMap(oldCon, "topics", false);
-    Freeze::TransactionHolder oldTxn(oldCon);
-
-    for(V32Format::const_iterator p = topicMap.begin(); p != topicMap.end(); ++p)
-    {
-        // First the placeholder record for the topic.
-        SubscriberRecordKey key;
-        key.topic = p->first;
-        SubscriberRecord rec;
-        rec.link = false;
-        rec.cost = 0;
-        subscriberMap.put(SubscriberMap::value_type(key, rec));
-
-        string topicName = identityToTopicName(key.topic);
-
-        // Next each link.
-        for(LinkRecordSeq::const_iterator q = p->second.begin(); q != p->second.end(); ++q)
-        {
-            Ice::Identity id = q->theTopic->ice_getIdentity();
-            key.id = id;
-
-            rec.id = id;
-            rec.obj = q->obj;
-            rec.theTopic = q->theTopic;
-            rec.topicName = topicName;
-            rec.link = true;
-            rec.cost = q->cost;
-
-            subscriberMap.put(SubscriberMap::value_type(key, rec));
-        }
-    }
-
-    oldTxn.rollback();
-}
-
-void
-Client::v31migrate(const Freeze::ConnectionPtr& oldCon, SubscriberMap& subscriberMap)
-{
-
-    // We should not create the old database.
-    V31Format topicMap(oldCon, "topics", false);
-    Freeze::TransactionHolder oldTxn(oldCon);
-
-    for(V31Format::const_iterator p = topicMap.begin(); p != topicMap.end(); ++p)
-    {
-        // First the placeholder record for the topic.
-        SubscriberRecordKey key;
-        key.topic.name = p->first;
-        SubscriberRecord rec;
-        rec.link = false;
-        rec.cost = 0;
-        subscriberMap.put(SubscriberMap::value_type(key, rec));
-
-        string topicName = identityToTopicName(key.topic);
-
-        // Next each link.
-        for(LinkRecordDict::const_iterator q = p->second.begin(); q != p->second.end(); ++q)
-        {
-            Ice::Identity id = q->second.theTopic->ice_getIdentity();
-            key.id = id;
-
-            rec.id = id;
-            rec.obj = q->second.obj;
-            rec.theTopic = q->second.theTopic;
-            rec.topicName = topicName;
-            rec.link = true;
-            rec.cost = q->second.cost;
-
-            subscriberMap.put(SubscriberMap::value_type(key, rec));
-        }
-    }
-
-    oldTxn.rollback();
-}
-
-int
-Client::run(int argc, char* argv[])
-{
-    if(argc != 3)
-    {
-        usage();
-        return EXIT_FAILURE;
-    }
-
-    string oldEnvName = argv[1];
-    string newEnvName = argv[2];
-
-    if(oldEnvName == newEnvName)
-    {
-        cerr << argv[0] << ": The database environment names must be different" << endl;
-        return EXIT_FAILURE;
-    }
-
-    bool migrate31 = false;
-
-    Freeze::ConnectionPtr oldCon = Freeze::createConnection(communicator(), oldEnvName);
-    Freeze::Catalog catalog(oldCon, Freeze::catalogName());
-    if(catalog.size() != 1 || catalog.begin()->first != "topics")
-    {
-        cerr << argv[0] << ": The old database environment does not contain an IceStorm database." << endl;
-        return EXIT_FAILURE;
-    }
-    Freeze::CatalogData data = catalog.begin()->second;
-    if(!data.evictor && data.key == "string" && data.value == "::IceStorm::LinkRecordDict")
-    {
-        migrate31 = true;
-    }
-    else if(!data.evictor && data.key == "::Ice::Identity" && data.value == "::IceStorm::LinkRecordSeq")
-    {
-        migrate31 = false;
-    }
-    else
-    {
-        cerr << argv[0] << ": The old environment contains an unrecognized IceStorm database version." << endl;
-        return EXIT_FAILURE;
-    }
-
-    // Creating the new database is fine.
-    Freeze::ConnectionPtr newCon = Freeze::createConnection(communicator(), newEnvName);
-    SubscriberMap subscriberMap(newCon, "subscribers");
-    LLUMap lluMap(newCon, "llu");
-    Freeze::TransactionHolder newTxn(newCon);
-
-    if(migrate31)
-    {
-        v31migrate(oldCon, subscriberMap);
-    }
-    else
-    {
-        v32migrate(oldCon, subscriberMap);
-    }
-
-    // We need to write a record in the LLU map so that if this
-    // database is used for a migration this database will be picked
-    // as the latest. We use generation 1 since the default is 0.
-    IceStormElection::LogUpdate llu;
-    llu.generation = 1;
-    llu.iteration = 0;
-    lluMap.put(LLUMap::value_type("_manager", llu));
-
-    newTxn.commit();
-
-    return 0;
-}
diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp
index 78d0241e773..fc00848fe65 100644
--- a/cpp/src/IceStorm/Parser.cpp
+++ b/cpp/src/IceStorm/Parser.cpp
@@ -38,21 +38,24 @@ namespace
 class UnknownManagerException : public Exception
 {
 public:
-    
+
     UnknownManagerException(const string& name, const char* file, int line) :
         Exception(file, line),
         name(name)
     {
     }
 
+#ifndef ICE_CPP11_COMPILER
     virtual
     ~UnknownManagerException() throw()
     {
     }
+#endif
+
     virtual string
-    ice_name() const
+    ice_id() const
     {
-        return "UnknownManagerException";
+        return "::UnknownManagerException";
     }
 
     virtual Exception*
@@ -60,7 +63,7 @@ public:
     {
         return new UnknownManagerException(*this);
     }
-    
+
     virtual void
     ice_throw() const
     {
@@ -156,8 +159,8 @@ Parser::link(const list<string>& args)
     }
 
     try
-    {    
-        list<string>::const_iterator p = args.begin(); 
+    {
+        list<string>::const_iterator p = args.begin();
 
         TopicPrx fromTopic = findTopic(*p++);
         TopicPrx toTopic = findTopic(*p++);
@@ -181,7 +184,7 @@ Parser::unlink(const list<string>& args)
     }
 
     try
-    {   
+    {
         list<string>::const_iterator p = args.begin();
 
         TopicPrx fromTopic = findTopic(*p++);
@@ -334,7 +337,7 @@ Parser::replica(const list<string>& args)
             }
             catch(const Exception& ex)
             {
-                cout << p->id << ": " << ex.ice_name() << endl;
+                cout << p->id << ": " << ex.ice_id() << endl;
             }
         }
     }
@@ -404,7 +407,7 @@ Parser::showBanner()
 }
 
 //
-// With older flex version <= 2.5.35 YY_INPUT second 
+// With older flex version <= 2.5.35 YY_INPUT second
 // paramenter is of type int&, in newer versions it
 // changes to size_t&
 //
@@ -492,7 +495,7 @@ Parser::getInput(char* buf, size_t& result, size_t maxSize)
                 break;
             }
         }
-        
+
         result = line.length();
         if(result > maxSize)
         {
diff --git a/cpp/src/IceStorm/Replica.h b/cpp/src/IceStorm/Replica.h
index ea5ec1fab92..cfc0704c103 100644
--- a/cpp/src/IceStorm/Replica.h
+++ b/cpp/src/IceStorm/Replica.h
@@ -34,7 +34,7 @@ struct GroupNodeInfo
     const Ice::ObjectPrx observer;
 };
 
-class Replica : virtual public IceUtil::Shared
+class Replica : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp
index e0df2635d96..de1393e554e 100644
--- a/cpp/src/IceStorm/Service.cpp
+++ b/cpp/src/IceStorm/Service.cpp
@@ -15,6 +15,7 @@
 #include <IceStorm/TopicManagerI.h>
 #include <IceStorm/TransientTopicManagerI.h>
 #include <IceStorm/Instance.h>
+#include <IceStorm/Util.h>
 
 #include <IceStorm/Service.h>
 
@@ -25,8 +26,7 @@
 #include <IceStorm/NodeI.h>
 #include <IceStorm/TransientTopicI.h>
 
-#include <IceGrid/Locator.h>
-#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
 
 using namespace std;
 using namespace Ice;
@@ -61,6 +61,7 @@ public:
 
 private:
 
+    void createDbEnv(const Ice::CommunicatorPtr&);
     void validateProperties(const string&, const PropertiesPtr&, const LoggerPtr&);
 
     TopicManagerImplPtr _manager;
@@ -183,14 +184,16 @@ ServiceI::start(
 
     if(id == -1) // No replication.
     {
-        _instance = new Instance(instanceName, name, communicator, publishAdapter, topicAdapter);
-
         try
         {
-            _manager = new TopicManagerImpl(_instance);
+            PersistentInstancePtr instance =
+                new PersistentInstance(instanceName, name, communicator, publishAdapter, topicAdapter);
+            _instance = instance;
+
+            _manager = new TopicManagerImpl(instance);
             _managerProxy = TopicManagerPrx::uncheckedCast(topicAdapter->add(_manager->getServant(), topicManagerId));
         }
-        catch(const Ice::Exception& ex)
+        catch(const IceUtil::Exception& ex)
         {
             _instance = 0;
 
@@ -336,8 +339,11 @@ ServiceI::start(
 
             Ice::ObjectAdapterPtr nodeAdapter = communicator->createObjectAdapter(name + ".Node");
 
-            _instance = new Instance(instanceName, name, communicator, publishAdapter, topicAdapter,
-                                     nodeAdapter, nodes[id]);
+            PersistentInstancePtr instance =
+                new PersistentInstance(instanceName, name, communicator, publishAdapter, topicAdapter,
+                                       nodeAdapter, nodes[id]);
+            _instance = instance;
+
             _instance->observers()->setMajority(static_cast<unsigned int>(nodes.size())/2);
 
             // Trace replication information.
@@ -366,7 +372,7 @@ ServiceI::start(
                 _managerProxy = TopicManagerPrx::uncheckedCast(topicAdapter->createIndirectProxy(topicManagerId));
             }
 
-            _manager = new TopicManagerImpl(_instance);
+            _manager = new TopicManagerImpl(instance);
             topicAdapter->add(_manager->getServant(), topicManagerId);
 
             ostringstream os; // The node object identity.
@@ -382,7 +388,7 @@ ServiceI::start(
 
             node->start();
         }
-        catch(const Ice::Exception& ex)
+        catch(const IceUtil::Exception& ex)
         {
             _instance = 0;
 
@@ -420,7 +426,7 @@ ServiceI::start(const CommunicatorPtr& communicator,
     // This is for IceGrid only and as such we use a transient
     // implementation of IceStorm.
     string instanceName = communicator->getProperties()->getPropertyWithDefault(name + ".InstanceName", "IceStorm");
-    _instance = new Instance(instanceName, name, communicator, publishAdapter, topicAdapter);
+    _instance = new Instance(instanceName, name, communicator, publishAdapter, topicAdapter, 0);
 
     try
     {
@@ -530,13 +536,8 @@ ServiceI::validateProperties(const string& name, const PropertiesPtr& properties
         "Trace.TopicManager",
         "Send.Timeout",
         "Discard.Interval",
-        "SQL.DatabaseType",
-        "SQL.EncodingVersion",
-        "SQL.HostName",
-        "SQL.Port",
-        "SQL.DatabaseName",
-        "SQL.UserName",
-        "SQL.Password"
+        "LMDB.Path",
+        "LMDB.MapSize"
     };
 
     vector<string> unknownProps;
diff --git a/cpp/src/IceStorm/Service.h b/cpp/src/IceStorm/Service.h
index dce6425a256..38f1c63197b 100644
--- a/cpp/src/IceStorm/Service.h
+++ b/cpp/src/IceStorm/Service.h
@@ -14,28 +14,22 @@
 #include <IceStorm/IceStorm.h>
 
 //
-// Automatically link with IceStormService[D].lib
+// Automatically link with IceStormService[D|++11|++11D].lib
 //
 
 #if !defined(ICE_BUILDING_ICE_STORM_SERVICE) && defined(ICE_STORM_SERVICE_API_EXPORTS)
 #   define ICE_BUILDING_ICE_STORM_SERVICE
 #endif
 
-#ifdef _MSC_VER
-#   if !defined(ICE_BUILDING_ICE_STORM_SERVICE)
-#      if defined(_DEBUG) && !defined(ICE_OS_WINRT)
-#          pragma comment(lib, "IceStormServiceD.lib")
-#      else
-#          pragma comment(lib, "IceStormService.lib")
-#      endif
-#   endif
+#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICE_STORM_SERVICE)
+#   pragma comment(lib, ICE_LIBNAME("IceStormService"))
 #endif
 
 #ifndef ICE_STORM_SERVICE_API
-#   ifdef ICE_STORM_SERVICE_API_EXPORTS
-#       define ICE_STORM_SERVICE_API ICE_DECLSPEC_EXPORT
-#   elif defined(ICE_STATIC_LIBS)
+#   if defined(ICE_STATIC_LIBS)
 #       define ICE_STORM_SERVICE_API /**/
+#   elif defined(ICE_STORM_SERVICE_API_EXPORTS)
+#       define ICE_STORM_SERVICE_API ICE_DECLSPEC_EXPORT
 #   else
 #       define ICE_STORM_SERVICE_API ICE_DECLSPEC_IMPORT
 #   endif
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index 3d9587f9e29..acea59e5c15 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -13,8 +13,6 @@
 #include <IceStorm/TraceLevels.h>
 #include <IceStorm/NodeI.h>
 #include <IceStorm/Observers.h>
-#include <IceStorm/SubscriberMap.h>
-#include <IceStorm/LLUMap.h>
 #include <IceStorm/Util.h>
 #include <Ice/LoggerUtil.h>
 #include <algorithm>
@@ -24,22 +22,14 @@ using namespace IceStorm;
 using namespace IceStormElection;
 using namespace IceStormInternal;
 
-using namespace Freeze;
-
 namespace
 {
 
-const string subscriberDbName = "subscribers";
-
 void
-halt(const Ice::CommunicatorPtr& com, const DatabaseException& ex)
+logError(const Ice::CommunicatorPtr& com, const IceDB::LMDBException& ex)
 {
-    {
-        Ice::Error error(com->getLogger());
-        error << "fatal exception: " << ex << "\n*** Aborting application ***";
-    }
-
-    abort();
+    Ice::Error error(com->getLogger());
+    error << "LMDB error: " << ex;
 }
 
 //
@@ -50,7 +40,7 @@ class PublisherI : public Ice::BlobjectArray
 {
 public:
 
-    PublisherI(const TopicImplPtr& topic, const InstancePtr& instance) :
+    PublisherI(const TopicImplPtr& topic, const PersistentInstancePtr& instance) :
         _topic(topic), _instance(instance)
     {
     }
@@ -80,7 +70,7 @@ public:
 private:
 
     const TopicImplPtr _topic;
-    const InstancePtr _instance;
+    const PersistentInstancePtr _instance;
 };
 
 //
@@ -91,7 +81,7 @@ class TopicLinkI : public TopicLink
 {
 public:
 
-    TopicLinkI(const TopicImplPtr& impl, const InstancePtr& instance) :
+    TopicLinkI(const TopicImplPtr& impl, const PersistentInstancePtr& instance) :
         _impl(impl), _instance(instance)
     {
     }
@@ -106,14 +96,14 @@ public:
 private:
 
     const TopicImplPtr _impl;
-    const InstancePtr _instance;
+    const PersistentInstancePtr _instance;
 };
 
 class TopicI : public TopicInternal
 {
 public:
 
-    TopicI(const TopicImplPtr& impl, const InstancePtr& instance) :
+    TopicI(const TopicImplPtr& impl, const PersistentInstancePtr& instance) :
         _impl(impl), _instance(instance)
     {
     }
@@ -343,26 +333,22 @@ private:
     }
 
     const TopicImplPtr _impl;
-    const InstancePtr _instance;
+    const PersistentInstancePtr _instance;
 };
 
 }
 
-namespace IceStorm
-{
-extern string identityToTopicName(const Ice::Identity& id);
-}
-
 TopicImpl::TopicImpl(
-    const InstancePtr& instance,
+    const PersistentInstancePtr& instance,
     const string& name,
     const Ice::Identity& id,
     const SubscriberRecordSeq& subscribers) :
     _instance(instance),
-    _connection(Freeze::createConnection(instance->communicator(), instance->serviceName())),
     _name(name),
     _id(id),
-    _destroyed(false)
+    _destroyed(false),
+    _lluMap(_instance->lluMap()),
+    _subscriberMap(_instance->subscriberMap())
 {
     try
     {
@@ -496,7 +482,7 @@ TopicImpl::getNonReplicatedPublisher() const
 namespace
 {
 void
-trace(Ice::Trace& out, const InstancePtr& instance, const vector<SubscriberPtr>& s)
+trace(Ice::Trace& out, const PersistentInstancePtr& instance, const vector<SubscriberPtr>& s)
 {
     out << '[';
     for(vector<SubscriberPtr>::const_iterator p = s.begin(); p != s.end(); ++p)
@@ -568,34 +554,24 @@ TopicImpl::subscribeAndGetPublisher(const QoS& qos, const Ice::ObjectPrx& obj)
     LogUpdate llu;
 
     SubscriberPtr subscriber = Subscriber::create(_instance, record);
-    for(;;)
+    try
     {
-        try
-        {
-            TransactionHolder txn(_connection);
+        IceDB::ReadWriteTxn txn(_instance->dbEnv());
 
-            SubscriberRecordKey key;
-            key.topic = _id;
-            key.id = subscriber->id();
+        SubscriberRecordKey key;
+        key.topic = _id;
+        key.id = subscriber->id();
 
-            SubscriberMap subscriberMap(_connection, subscriberDbName);
-            subscriberMap.put(SubscriberMap::value_type(key, record));
+        _subscriberMap.put(txn, key, record);
 
-            llu = getLLU(_connection);
-            llu.iteration++;
-            putLLU(_connection, llu);
+        llu = getIncrementedLLU(txn, _lluMap);
 
-            txn.commit();
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_instance->communicator(), ex);
-        }
+        txn.commit();
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_instance->communicator(), ex);
+        throw; // will become UnknownException in caller
     }
 
     _subscribers.push_back(subscriber);
@@ -680,7 +656,7 @@ TopicImpl::link(const TopicPrx& topic, Ice::Int cost)
     vector<SubscriberPtr>::iterator p = find(_subscribers.begin(), _subscribers.end(), record.id);
     if(p != _subscribers.end())
     {
-        string name = identityToTopicName(id);
+        string name = IceStormInternal::identityToTopicName(id);
         LinkExists ex;
         ex.name = name;
         throw ex;
@@ -690,34 +666,24 @@ TopicImpl::link(const TopicPrx& topic, Ice::Int cost)
 
     SubscriberPtr subscriber = Subscriber::create(_instance, record);
 
-    for(;;)
+    try
     {
-        try
-        {
-            TransactionHolder txn(_connection);
+        IceDB::ReadWriteTxn txn(_instance->dbEnv());
 
-            SubscriberRecordKey key;
-            key.topic = _id;
-            key.id = id;
+        SubscriberRecordKey key;
+        key.topic = _id;
+        key.id = id;
 
-            SubscriberMap subscriberMap(_connection, subscriberDbName);
-            subscriberMap.put(SubscriberMap::value_type(key, record));
+        _subscriberMap.put(txn, key, record);
 
-            llu = getLLU(_connection);
-            llu.iteration++;
-            putLLU(_connection, llu);
+        llu = getIncrementedLLU(txn, _lluMap);
 
-            txn.commit();
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_instance->communicator(), ex);
-        }
+        txn.commit();
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_instance->communicator(), ex);
+        throw; // will become UnknownException in caller
     }
 
     _subscribers.push_back(subscriber);
@@ -739,7 +705,7 @@ TopicImpl::unlink(const TopicPrx& topic)
     vector<SubscriberPtr>::const_iterator p = find(_subscribers.begin(), _subscribers.end(), id);
     if(p == _subscribers.end())
     {
-        string name = identityToTopicName(id);
+        string name = IceStormInternal::identityToTopicName(id);
         TraceLevelsPtr traceLevels = _instance->traceLevels();
         if(traceLevels->topic > 0)
         {
@@ -814,7 +780,7 @@ TopicImpl::getLinkInfoSeq() const
         if(record.link && !(*p)->errored())
         {
             LinkInfo info;
-            info.name = identityToTopicName(record.theTopic->ice_getIdentity());
+            info.name = IceStormInternal::identityToTopicName(record.theTopic->ice_getIdentity());
             info.cost = record.cost;
             info.theTopic = record.theTopic;
             seq.push_back(info);
@@ -974,7 +940,7 @@ class TopicInternalReapCB : public IceUtil::Shared
 {
 public:
 
-    TopicInternalReapCB(const InstancePtr& instance, Ice::Long generation) :
+    TopicInternalReapCB(const PersistentInstancePtr& instance, Ice::Long generation) :
         _instance(instance), _generation(generation)
     {
     }
@@ -992,7 +958,7 @@ public:
 
 private:
 
-    const InstancePtr _instance;
+    const PersistentInstancePtr _instance;
     const Ice::Long _generation;
 };
 
@@ -1112,33 +1078,25 @@ TopicImpl::observerAddSubscriber(const LogUpdate& llu, const SubscriberRecord& r
     }
 
     SubscriberPtr subscriber = Subscriber::create(_instance, record);
-    for(;;)
+    try
     {
-        try
-        {
-            TransactionHolder txn(_connection);
+        IceDB::ReadWriteTxn txn(_instance->dbEnv());
 
-            SubscriberRecordKey key;
-            key.topic = _id;
-            key.id = subscriber->id();
+        SubscriberRecordKey key;
+        key.topic = _id;
+        key.id = subscriber->id();
 
-            SubscriberMap subscriberMap(_connection, subscriberDbName);
-            subscriberMap.put(SubscriberMap::value_type(key, record));
+        _subscriberMap.put(txn, key, record);
 
-            // Update the LLU.
-            putLLU(_connection, llu);
+        // Update the LLU.
+        _lluMap.put(txn, lluDbKey, llu);
 
-            txn.commit();
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_instance->communicator(), ex);
-        }
+        txn.commit();
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_instance->communicator(), ex);
+        throw; // will become UnknownException in caller
     }
 
     _subscribers.push_back(subscriber);
@@ -1165,7 +1123,32 @@ TopicImpl::observerRemoveSubscriber(const LogUpdate& llu, const Ice::IdentitySeq
 
     IceUtil::Mutex::Lock sync(_subscribersMutex);
 
-    // Remove the subscriber from the subscribers list. If the
+
+    // First remove from the database.
+    try
+    {
+        IceDB::ReadWriteTxn txn(_instance->dbEnv());
+
+        for(Ice::IdentitySeq::const_iterator id = ids.begin(); id != ids.end(); ++id)
+        {
+            SubscriberRecordKey key;
+            key.topic = _id;
+            key.id = *id;
+
+            _subscriberMap.del(txn, key);
+        }
+
+        _lluMap.put(txn, lluDbKey, llu);
+
+        txn.commit();
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_instance->communicator(), ex);
+        throw; // will become UnknownException in caller
+    }
+
+    // Then remove the subscriber from the subscribers list. If the
     // subscriber had a local failure and was removed from the
     // subscriber list it could already be gone. That's not a problem.
     for(Ice::IdentitySeq::const_iterator id = ids.begin(); id != ids.end(); ++id)
@@ -1177,36 +1160,6 @@ TopicImpl::observerRemoveSubscriber(const LogUpdate& llu, const Ice::IdentitySeq
             _subscribers.erase(p);
         }
     }
-
-    // Next remove from the database.
-    for(;;)
-    {
-        try
-        {
-            TransactionHolder txn(_connection);
-
-            for(Ice::IdentitySeq::const_iterator id = ids.begin(); id != ids.end(); ++id)
-            {
-                SubscriberRecordKey key;
-                key.topic = _id;
-                key.id = *id;
-
-                SubscriberMap subscriberMap(_connection, subscriberDbName);
-                subscriberMap.erase(key);
-            }
-            putLLU(_connection, llu);
-            txn.commit();
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_instance->communicator(), ex);
-        }
-    }
 }
 
 void
@@ -1259,60 +1212,59 @@ TopicImpl::updateSubscriberObservers()
 LogUpdate
 TopicImpl::destroyInternal(const LogUpdate& origLLU, bool master)
 {
-    _instance->publishAdapter()->remove(_linkPrx->ice_getIdentity());
-    _instance->publishAdapter()->remove(_publisherPrx->ice_getIdentity());
-    _instance->topicReaper()->add(_name);
-
-    // Destroy each of the subscribers.
-    for(vector<SubscriberPtr>::const_iterator p = _subscribers.begin(); p != _subscribers.end(); ++p)
-    {
-        (*p)->destroy();
-    }
-    _subscribers.clear();
 
     // Clear out the database records related to this topic.
     LogUpdate llu;
-    for(;;)
+    try
     {
-        try
-        {
-            TransactionHolder txn(_connection);
+        IceDB::ReadWriteTxn txn(_instance->dbEnv());
 
-            // Erase all subscriber records and the topic record.
-            SubscriberMap subscriberMap(_connection, subscriberDbName);
+        // Erase all subscriber records and the topic record.
+        SubscriberRecordKey key;
+        key.topic = _id;
 
-            IceStorm::SubscriberRecordKey key;
-            key.topic = _id;
-            SubscriberMap::iterator p = subscriberMap.find(key);
-            while(p != subscriberMap.end() && p->first.topic == key.topic)
-            {
-                subscriberMap.erase(p++);
-            }
+        SubscriberMapRWCursor cursor(_subscriberMap, txn);
+        if(cursor.find(key))
+        {
+            _subscriberMap.del(txn, key);
 
-            // Update the LLU.
-            if(master)
+            SubscriberRecordKey k;
+            SubscriberRecord v;
+            while(cursor.get(k, v, MDB_NEXT) && k.topic == key.topic)
             {
-                llu = getLLU(_connection);
-                llu.iteration++;
+                _subscriberMap.del(txn, k);
             }
-            else
-            {
-                llu = origLLU;
-            }
-            putLLU(_connection, llu);
-
-            txn.commit();
-            break;
         }
-        catch(const DeadlockException&)
+
+        // Update the LLU.
+        if(master)
         {
-            continue;
+            llu = getIncrementedLLU(txn, _lluMap);
         }
-        catch(const DatabaseException& ex)
+        else
         {
-            halt(_instance->communicator(), ex);
+            llu = origLLU;
+            _lluMap.put(txn, lluDbKey, llu);
         }
+
+        txn.commit();
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_instance->communicator(), ex);
+        throw; // will become UnknownException in caller
+    }
+
+    _instance->publishAdapter()->remove(_linkPrx->ice_getIdentity());
+    _instance->publishAdapter()->remove(_publisherPrx->ice_getIdentity());
+    _instance->topicReaper()->add(_name);
+
+    // Destroy each of the subscribers.
+    for(vector<SubscriberPtr>::const_iterator p = _subscribers.begin(); p != _subscribers.end(); ++p)
+    {
+        (*p)->destroy();
     }
+    _subscribers.clear();
 
     _instance->topicAdapter()->remove(_id);
 
@@ -1324,66 +1276,60 @@ TopicImpl::destroyInternal(const LogUpdate& origLLU, bool master)
 void
 TopicImpl::removeSubscribers(const Ice::IdentitySeq& ids)
 {
-    Ice::IdentitySeq removed;
-
-    // First remove the subscriber from the subscribers list. Its
-    // possible that some of these subscribers have already been
-    // removed (consider, for example, a concurrent reap call from two
-    // replicas on the same subscriber). To avoid sending unnecessary
-    // observer updates keep track of the observers that are actually
-    // removed.
-    for(Ice::IdentitySeq::const_iterator id = ids.begin(); id != ids.end(); ++id)
-    {
-        vector<SubscriberPtr>::iterator p = find(_subscribers.begin(), _subscribers.end(), *id);
-        if(p != _subscribers.end())
-        {
-            (*p)->destroy();
-            _subscribers.erase(p);
-            removed.push_back(*id);
-        }
-    }
+    // First update the database
 
-    // If there is no further work to do we are done.
-    if(removed.empty())
-    {
-        return;
-    }
-
-    // Next update the database and send the notification to any
-    // slaves.
     LogUpdate llu;
-    for(;;)
+    bool found = false;
+    try
     {
-        try
+        IceDB::ReadWriteTxn txn(_instance->dbEnv());
+
+        for(Ice::IdentitySeq::const_iterator id = ids.begin(); id != ids.end(); ++id)
         {
-            TransactionHolder txn(_connection);
+            SubscriberRecordKey key;
+            key.topic = _id;
+            key.id = *id;
 
-            for(Ice::IdentitySeq::const_iterator id = ids.begin(); id != ids.end(); ++id)
+            if(_subscriberMap.del(txn, key))
             {
-                SubscriberRecordKey key;
-                key.topic = _id;
-                key.id = *id;
-
-                SubscriberMap subscriberMap(_connection, subscriberDbName);
-                subscriberMap.erase(key);
+                found = true;
             }
+        }
 
-            llu = getLLU(_connection);
-            llu.iteration++;
-            putLLU(_connection, llu);
-
+        if(found)
+        {
+            llu = getIncrementedLLU(txn, _lluMap);
             txn.commit();
-            break;
         }
-        catch(const DeadlockException&)
+        else
         {
-            continue;
+            txn.rollback();
         }
-        catch(const DatabaseException& ex)
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_instance->communicator(), ex);
+        throw; // will become UnknownException in caller
+    }
+
+    if(found)
+    {
+        // Then remove the subscriber from the subscribers list. Its
+        // possible that some of these subscribers have already been
+        // removed (consider, for example, a concurrent reap call from two
+        // replicas on the same subscriber). To avoid sending unnecessary
+        // observer updates keep track of the observers that are actually
+        // removed.
+        for(Ice::IdentitySeq::const_iterator id = ids.begin(); id != ids.end(); ++id)
         {
-            halt(_instance->communicator(), ex);
+            vector<SubscriberPtr>::iterator p = find(_subscribers.begin(), _subscribers.end(), *id);
+            if(p != _subscribers.end())
+            {
+                (*p)->destroy();
+                _subscribers.erase(p);
+            }
         }
-    }
 
-    _instance->observers()->removeSubscriber(llu, _name, ids);
+        _instance->observers()->removeSubscriber(llu, _name, ids);
+    }
 }
diff --git a/cpp/src/IceStorm/TopicI.h b/cpp/src/IceStorm/TopicI.h
index 20e6063ca90..78dbf5d937d 100644
--- a/cpp/src/IceStorm/TopicI.h
+++ b/cpp/src/IceStorm/TopicI.h
@@ -13,16 +13,16 @@
 #include <IceStorm/IceStormInternal.h>
 #include <IceStorm/Election.h>
 #include <IceStorm/Instrumentation.h>
+#include <IceStorm/Util.h>
 #include <Ice/ObserverHelper.h>
-#include <Freeze/Freeze.h>
 #include <list>
 
 namespace IceStorm
 {
 
 // Forward declarations
-class Instance;
-typedef IceUtil::Handle<Instance> InstancePtr;
+class PersistentInstance;
+typedef IceUtil::Handle<PersistentInstance> PersistentInstancePtr;
 
 class Subscriber;
 typedef IceUtil::Handle<Subscriber> SubscriberPtr;
@@ -31,7 +31,7 @@ class TopicImpl : public IceUtil::Shared
 {
 public:
 
-    TopicImpl(const InstancePtr&, const std::string&, const Ice::Identity&, const SubscriberRecordSeq&);
+    TopicImpl(const PersistentInstancePtr&, const std::string&, const Ice::Identity&, const SubscriberRecordSeq&);
     ~TopicImpl();
 
     std::string getName() const;
@@ -77,11 +77,9 @@ private:
     // Immutable members.
     //
     const Ice::ObjectPrx _publisherReplicaProxy;
-    const InstancePtr _instance;
-    const Freeze::ConnectionPtr _connection;
+    const PersistentInstancePtr _instance;
     const std::string _name; // The topic name
     const Ice::Identity _id; // The topic identity
-    const std::string _envName;
 
     IceInternal::ObserverHelperT<IceStorm::Instrumentation::TopicObserver> _observer;
 
@@ -103,6 +101,9 @@ private:
     std::vector<SubscriberPtr> _subscribers;
 
     bool _destroyed; // Has this Topic been destroyed?
+
+    LLUMap _lluMap;
+    SubscriberMap _subscriberMap;
 };
 
 typedef IceUtil::Handle<TopicImpl> TopicImplPtr;
diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp
index 9740d8537f9..5c4ad1c6cbc 100644
--- a/cpp/src/IceStorm/TopicManagerI.cpp
+++ b/cpp/src/IceStorm/TopicManagerI.cpp
@@ -14,8 +14,6 @@
 #include <IceStorm/NodeI.h>
 #include <IceStorm/Observers.h>
 #include <IceStorm/Subscriber.h>
-#include <IceStorm/SubscriberMap.h>
-#include <IceStorm/LLUMap.h>
 #include <IceStorm/Util.h>
 #include <Ice/SliceChecksums.h>
 
@@ -26,29 +24,21 @@ using namespace IceStorm;
 using namespace IceStormElection;
 using namespace IceStormInternal;
 
-using namespace Freeze;
-
 namespace
 {
 
-const string subscriberDbName = "subscribers";
-
 void
-halt(const Ice::CommunicatorPtr& com, const DatabaseException& ex)
+logError(const Ice::CommunicatorPtr& com, const IceDB::LMDBException& ex)
 {
-    {
-        Ice::Error error(com->getLogger());
-        error << "fatal exception: " << ex << "\n*** Aborting application ***";
-    }
-
-    abort();
+    Ice::Error error(com->getLogger());
+    error << "LMDB error: " << ex;
 }
 
 class TopicManagerI : public TopicManagerInternal
 {
 public:
 
-    TopicManagerI(const InstancePtr& instance, const TopicManagerImplPtr& impl) :
+    TopicManagerI(const PersistentInstancePtr& instance, const TopicManagerImplPtr& impl) :
         _instance(instance), _impl(impl)
     {
     }
@@ -130,7 +120,7 @@ private:
         }
     }
 
-    const InstancePtr _instance;
+    const PersistentInstancePtr _instance;
     const TopicManagerImplPtr _impl;
 };
 
@@ -138,7 +128,7 @@ class ReplicaObserverI : public ReplicaObserver
 {
 public:
 
-    ReplicaObserverI(const InstancePtr& instance, const TopicManagerImplPtr& impl) :
+    ReplicaObserverI(const PersistentInstancePtr& instance, const TopicManagerImplPtr& impl) :
         _instance(instance),
         _impl(impl)
     {
@@ -228,7 +218,7 @@ public:
 
 private:
 
-    const InstancePtr _instance;
+    const PersistentInstancePtr _instance;
     const TopicManagerImplPtr _impl;
 };
 
@@ -258,42 +248,10 @@ private:
 
 }
 
-namespace IceStorm
-{
-
-string
-identityToTopicName(const Ice::Identity& id)
-{
-    //
-    // Work out the topic name. If the category is empty then we're in
-    // backwards compatibility mode and the name is just
-    // identity.name. Otherwise identity.name is topic.<topicname>.
-    //
-    if(id.category.empty())
-    {
-        return id.name;
-    }
-
-    assert(id.name.length() > 6 && id.name.compare(0, 6, "topic.") == 0);
-    return id.name.substr(6);
-}
-
-Ice::Identity
-nameToIdentity(const InstancePtr& instance, const string& name)
-{
-    // Identity is instanceName>/topic.<topicname>
-    Ice::Identity id;
-    id.category = instance->instanceName();
-    id.name = "topic." + name;
-
-    return id;
-}
-
-}
-
-TopicManagerImpl::TopicManagerImpl(const InstancePtr& instance) :
+TopicManagerImpl::TopicManagerImpl(const PersistentInstancePtr& instance) :
     _instance(instance),
-    _connection(Freeze::createConnection(instance->communicator(), instance->serviceName()))
+    _lluMap(instance->lluMap()),
+    _subscriberMap(instance->subscriberMap())
 {
     try
     {
@@ -309,7 +267,6 @@ TopicManagerImpl::TopicManagerImpl(const InstancePtr& instance) :
         // here.
         _managerImpl = new TopicManagerI(instance, this);
 
-        Ice::PropertiesPtr properties = _instance->communicator()->getProperties();
         // If there is no node adapter we don't need to start the
         // observer, nor sync since we're not replicating.
         if(_instance->nodeAdapter())
@@ -320,35 +277,43 @@ TopicManagerImpl::TopicManagerImpl(const InstancePtr& instance) :
             _sync = _instance->nodeAdapter()->addWithUUID(_syncImpl);
         }
 
-
-
-        // Ensure that the llu counter is present in the log.
-        LogUpdate empty = {0, 0};
-        putLLU(_connection, empty);
-
-        // Recreate each of the topics.
-        SubscriberMap subscriberMap(_connection, subscriberDbName);
-        SubscriberMap::const_iterator p = subscriberMap.begin();
-        while(p != subscriberMap.end())
         {
-            // This record has to be a place holder record, otherwise
-            // there is a database bug.
-            assert(p->first.id.name.empty() && p->first.id.category.empty());
+            IceDB::ReadWriteTxn txn(_instance->dbEnv());
 
-            Ice::Identity topic = p->first.topic;
+            // Ensure that the llu counter is present in the log.
+            LogUpdate empty = {0, 0};
+            _instance->lluMap().put(txn, lluDbKey, empty);
 
-            // Skip the place holder.
-            ++p;
 
-            SubscriberRecordSeq content;
-            while(p != subscriberMap.end() && p->first.topic == topic)
+            // Recreate each of the topics.
+            SubscriberRecordKey k;
+            SubscriberRecord v;
+
+            SubscriberMapRWCursor cursor(_subscriberMap, txn);
+            if(cursor.get(k, v, MDB_FIRST))
             {
-                content.push_back(p->second);
-                ++p;
+                bool moreTopics = false;
+                do
+                {
+                    // This record has to be a place holder record, otherwise
+                    // there is a database bug.
+                    assert(k.id.name.empty() && k.id.category.empty());
+
+                    Ice::Identity topic = k.topic;
+
+                    bool moreTopics;
+                    SubscriberRecordSeq content;
+                    while((moreTopics = cursor.get(k, v, MDB_NEXT)) && k.topic == topic)
+                    {
+                        content.push_back(v);
+                    }
+
+                    string name = identityToTopicName(topic);
+                    installTopic(name, topic, false, content);
+                } while(moreTopics);
             }
 
-            string name = identityToTopicName(topic);
-            installTopic(name, topic, false, content);
+            txn.commit();
         }
     }
     catch(...)
@@ -378,40 +343,30 @@ TopicManagerImpl::create(const string& name)
         throw ex;
     }
 
-    // Identity is instanceName>/topic.<topicname>
+    // Identity is <instanceName>/topic.<topicname>
     Ice::Identity id = nameToIdentity(_instance, name);
-    LogUpdate llu;
 
-    for(;;)
+    LogUpdate llu;
+    try
     {
-        try
-        {
-            TransactionHolder txn(_connection);
+        IceDB::ReadWriteTxn txn(_instance->dbEnv());
 
-            SubscriberRecordKey key;
-            key.topic = id;
-            SubscriberRecord rec;
-            rec.link = false;
-            rec.cost = 0;
+        SubscriberRecordKey key;
+        key.topic = id;
+        SubscriberRecord rec;
+        rec.link = false;
+        rec.cost = 0;
 
-            SubscriberMap subscriberMap(_connection, subscriberDbName);
-            subscriberMap.put(SubscriberMap::value_type(key, rec));
+        _subscriberMap.put(txn, key, rec);
 
-            llu = getLLU(_connection);
-            llu.iteration++;
-            putLLU(_connection, llu);
+        llu = getIncrementedLLU(txn, _lluMap);
 
-            txn.commit();
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_instance->communicator(), ex);
-        }
+        txn.commit();
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_instance->communicator(), ex);
+        throw; // will become UnknownException in caller
     }
 
     _instance->observers()->createTopic(llu, name);
@@ -484,47 +439,39 @@ TopicManagerImpl::observerInit(const LogUpdate& llu, const TopicContentSeq& cont
 
     // First we update the database state, and then we update our
     // internal state.
-    for(;;)
+    try
     {
-        try
-        {
-            TransactionHolder txn(_connection);
+        IceDB::ReadWriteTxn txn(_instance->dbEnv());
+
+        _lluMap.put(txn, lluDbKey, llu);
 
-            putLLU(_connection, llu);
+        _subscriberMap.clear(txn);
 
-            SubscriberMap subscriberMap(_connection, subscriberDbName);
-            subscriberMap.clear();
+        for(TopicContentSeq::const_iterator p = content.begin(); p != content.end(); ++p)
+        {
+            SubscriberRecordKey key;
+            key.topic = p->id;
+            SubscriberRecord rec;
+            rec.link = false;
+            rec.cost = 0;
 
-            for(TopicContentSeq::const_iterator p = content.begin(); p != content.end(); ++p)
+            _subscriberMap.put(txn, key, rec);
+
+            for(SubscriberRecordSeq::const_iterator q = p->records.begin(); q != p->records.end(); ++q)
             {
                 SubscriberRecordKey key;
                 key.topic = p->id;
-                SubscriberRecord rec;
-                rec.link = false;
-                rec.cost = 0;
+                key.id = q->id;
 
-                subscriberMap.put(SubscriberMap::value_type(key, rec));
-
-                for(SubscriberRecordSeq::const_iterator q = p->records.begin(); q != p->records.end(); ++q)
-                {
-                    SubscriberRecordKey key;
-                    key.topic = p->id;
-                    key.id = q->id;
-
-                    subscriberMap.put(SubscriberMap::value_type(key, *q));
-                }
+                _subscriberMap.put(txn, key, *q);
             }
-            txn.commit();
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_instance->communicator(), ex);
         }
+        txn.commit();
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_instance->communicator(), ex);
+        throw; // will become UnknownException in caller
     }
 
     // We do this with two scans. The first runs through the topics
@@ -586,39 +533,32 @@ TopicManagerImpl::observerCreateTopic(const LogUpdate& llu, const string& name)
     Lock sync(*this);
     Ice::Identity id = nameToIdentity(_instance, name);
 
-    for(;;)
+    try
     {
-        try
-        {
-            TransactionHolder txn(_connection);
-
-            SubscriberRecordKey key;
-            key.topic = id;
-            SubscriberRecord rec;
-            rec.link = false;
-            rec.cost = 0;
+        IceDB::ReadWriteTxn txn(_instance->dbEnv());
 
-            SubscriberMap subscriberMap(_connection, subscriberDbName);
-            if(subscriberMap.find(key) != subscriberMap.end())
-            {
-                throw ObserverInconsistencyException("topic exists: " + name);
-            }
-            subscriberMap.put(SubscriberMap::value_type(key, rec));
+        SubscriberRecordKey key;
+        key.topic = id;
+        SubscriberRecord rec;
+        rec.link = false;
+        rec.cost = 0;
 
-            putLLU(_connection, llu);
-
-            txn.commit();
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
+        if(_subscriberMap.find(txn, key))
         {
-            halt(_instance->communicator(), ex);
+            throw ObserverInconsistencyException("topic exists: " + name);
         }
+        _subscriberMap.put(txn, key, rec);
+
+        _lluMap.put(txn, lluDbKey, llu);
+
+        txn.commit();
     }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_instance->communicator(), ex);
+        throw; // will become UnknownException in caller
+    }
+
     installTopic(name, id, true);
 }
 
@@ -681,48 +621,41 @@ TopicManagerImpl::getContent(LogUpdate& llu, TopicContentSeq& content)
         reap();
     }
 
-    for(;;)
+    try
     {
-        try
-        {
-            content.clear();
-            for(map<string, TopicImplPtr>::const_iterator p = _topics.begin(); p != _topics.end(); ++p)
-            {
-                TopicContent rec = p->second->getContent();
-                content.push_back(rec);
-            }
-            llu = getLLU(_connection);
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
+        content.clear();
+        for(map<string, TopicImplPtr>::const_iterator p = _topics.begin(); p != _topics.end(); ++p)
         {
-            halt(_instance->communicator(), ex);
+            TopicContent rec = p->second->getContent();
+            content.push_back(rec);
         }
+
+        IceDB::ReadOnlyTxn txn(_instance->dbEnv());
+        _lluMap.get(txn, lluDbKey, llu);
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_instance->communicator(), ex);
+        throw; // will become UnknownException in caller
     }
 }
 
 LogUpdate
 TopicManagerImpl::getLastLogUpdate() const
 {
-    for(;;)
+    LogUpdate llu;
+    try
     {
-        try
-        {
-            return getLLU(_connection);
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
-        {
-            halt(_instance->communicator(), ex);
-        }
+        IceDB::ReadOnlyTxn txn(_instance->dbEnv());
+        _lluMap.get(txn, lluDbKey, llu);
     }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_instance->communicator(), ex);
+        throw; // will become UnknownException in caller
+    }
+
+    return llu;
 }
 
 void
@@ -757,31 +690,26 @@ TopicManagerImpl::initMaster(const set<GroupNodeInfo>& slaves, const LogUpdate&
     // elected and gets the latest database state it immediately
     // updates the llu stamp.
     //
-    for(;;)
+    try
     {
-        try
-        {
-            content.clear();
+        content.clear();
 
-            TransactionHolder txn(_connection);
+        IceDB::ReadWriteTxn txn(_instance->dbEnv());
 
-            for(map<string, TopicImplPtr>::const_iterator p = _topics.begin(); p != _topics.end(); ++p)
-            {
-                TopicContent rec = p->second->getContent();
-                content.push_back(rec);
-            }
-            putLLU(_connection, llu);
-            txn.commit();
-            break;
-        }
-        catch(const DeadlockException&)
-        {
-            continue;
-        }
-        catch(const DatabaseException& ex)
+        for(map<string, TopicImplPtr>::const_iterator p = _topics.begin(); p != _topics.end(); ++p)
         {
-            halt(_instance->communicator(), ex);
+            TopicContent rec = p->second->getContent();
+            content.push_back(rec);
         }
+
+        _lluMap.put(txn, lluDbKey, llu);
+
+        txn.commit();
+    }
+    catch(const IceDB::LMDBException& ex)
+    {
+        logError(_instance->communicator(), ex);
+        throw; // will become UnknownException in caller
     }
 
     // Now initialize the observers.
diff --git a/cpp/src/IceStorm/TopicManagerI.h b/cpp/src/IceStorm/TopicManagerI.h
index efb77382123..2daa178b92a 100644
--- a/cpp/src/IceStorm/TopicManagerI.h
+++ b/cpp/src/IceStorm/TopicManagerI.h
@@ -15,8 +15,7 @@
 #include <IceStorm/Replica.h>
 #include <IceStorm/Election.h>
 #include <IceStorm/Instrumentation.h>
-
-#include <Freeze/Freeze.h>
+#include <IceStorm/Util.h>
 
 #include <IceUtil/RecMutex.h>
 
@@ -26,8 +25,8 @@ namespace IceStorm
 //
 // Forward declarations.
 //
-class Instance;
-typedef IceUtil::Handle<Instance> InstancePtr;
+class PersistentInstance;
+typedef IceUtil::Handle<PersistentInstance> PersistentInstancePtr;
 
 class TopicImpl;
 typedef IceUtil::Handle<TopicImpl> TopicImplPtr;
@@ -41,7 +40,7 @@ class TopicManagerImpl : public IceStormElection::Replica,
 {
 public:
 
-    TopicManagerImpl(const InstancePtr&);
+    TopicManagerImpl(const PersistentInstancePtr&);
     ~TopicManagerImpl();
 
     // TopicManager methods.
@@ -81,8 +80,7 @@ private:
     TopicPrx installTopic(const std::string&, const Ice::Identity&, bool,
                           const IceStorm::SubscriberRecordSeq& = IceStorm::SubscriberRecordSeq());
 
-    const InstancePtr _instance;
-    const Freeze::ConnectionPtr _connection;
+    const PersistentInstancePtr _instance;
 
     std::map<std::string, TopicImplPtr> _topics;
 
@@ -92,6 +90,8 @@ private:
     Ice::ObjectPtr _syncImpl;
     Ice::ObjectPrx _sync;
 
+    LLUMap _lluMap;
+    SubscriberMap _subscriberMap;
 };
 typedef IceUtil::Handle<TopicManagerImpl> TopicManagerImplPtr;
 
diff --git a/cpp/src/IceStorm/TransientTopicI.cpp b/cpp/src/IceStorm/TransientTopicI.cpp
index 27c654094c8..062db7014fb 100644
--- a/cpp/src/IceStorm/TransientTopicI.cpp
+++ b/cpp/src/IceStorm/TransientTopicI.cpp
@@ -94,11 +94,6 @@ private:
 
 }
 
-namespace IceStorm
-{
-extern string identityToTopicName(const Ice::Identity& id);
-}
-
 TransientTopicImpl::TransientTopicImpl(
     const InstancePtr& instance,
     const string& name,
@@ -398,7 +393,7 @@ TransientTopicImpl::link(const TopicPrx& topic, Ice::Int cost, const Ice::Curren
     vector<SubscriberPtr>::iterator p = find(_subscribers.begin(), _subscribers.end(), record.id);
     if(p != _subscribers.end())
     {
-        string name = identityToTopicName(id);
+        string name = IceStormInternal::identityToTopicName(id);
         LinkExists ex;
         ex.name = name;
         throw ex;
@@ -422,7 +417,7 @@ TransientTopicImpl::unlink(const TopicPrx& topic, const Ice::Current&)
     vector<SubscriberPtr>::iterator p = find(_subscribers.begin(), _subscribers.end(), id);
     if(p == _subscribers.end())
     {
-        string name = identityToTopicName(id);
+        string name = IceStormInternal::identityToTopicName(id);
         TraceLevelsPtr traceLevels = _instance->traceLevels();
         if(traceLevels->topic > 0)
         {
@@ -464,7 +459,7 @@ TransientTopicImpl::getLinkInfoSeq(const Ice::Current&) const
         if(record.link && !(*p)->errored())
         {
             LinkInfo info;
-            info.name = identityToTopicName(record.theTopic->ice_getIdentity());
+            info.name = IceStormInternal::identityToTopicName(record.theTopic->ice_getIdentity());
             info.cost = record.cost;
             info.theTopic = record.theTopic;
             seq.push_back(info);
diff --git a/cpp/src/IceStorm/TransientTopicManagerI.cpp b/cpp/src/IceStorm/TransientTopicManagerI.cpp
index 1509b16c128..8c45a471f19 100644
--- a/cpp/src/IceStorm/TransientTopicManagerI.cpp
+++ b/cpp/src/IceStorm/TransientTopicManagerI.cpp
@@ -22,13 +22,6 @@
 using namespace IceStorm;
 using namespace std;
 
-namespace IceStorm
-{
-
-extern Ice::Identity nameToIdentity(const InstancePtr&, const string&);
-
-}
-
 TransientTopicManagerImpl::TransientTopicManagerImpl(const InstancePtr& instance) :
     _instance(instance)
 {
@@ -52,7 +45,7 @@ TransientTopicManagerImpl::create(const string& name, const Ice::Current&)
         throw ex;
     }
 
-    Ice::Identity id = nameToIdentity(_instance, name);
+    Ice::Identity id = IceStormInternal::nameToIdentity(_instance, name);
 
     //
     // Called by constructor or with 'this' mutex locked.
diff --git a/cpp/src/IceStorm/Util.cpp b/cpp/src/IceStorm/Util.cpp
index 2538368a38c..aa320016112 100644
--- a/cpp/src/IceStorm/Util.cpp
+++ b/cpp/src/IceStorm/Util.cpp
@@ -8,13 +8,45 @@
 // **********************************************************************
 
 #include <IceStorm/Util.h>
-#include <IceStorm/LLUMap.h>
+#include <IceStorm/SubscriberRecord.h>
+#include <IceStorm/Instance.h>
 
-using namespace Freeze;
-using namespace IceStormElection;
 using namespace IceStorm;
 using namespace std;
 
+namespace IceStormInternal
+{
+IceDB::IceContext dbContext;
+}
+
+string
+IceStormInternal::identityToTopicName(const Ice::Identity& id)
+{
+    //
+    // Work out the topic name. If the category is empty then we're in
+    // backwards compatibility mode and the name is just
+    // identity.name. Otherwise identity.name is topic.<topicname>.
+    //
+    if(id.category.empty())
+    {
+        return id.name;
+    }
+
+    assert(id.name.length() > 6 && id.name.compare(0, 6, "topic.") == 0);
+    return id.name.substr(6);
+}
+
+Ice::Identity
+IceStormInternal::nameToIdentity(const InstancePtr& instance, const string& name)
+{
+    // Identity is instanceName>/topic.<topicname>
+    Ice::Identity id;
+    id.category = instance->instanceName();
+    id.name = "topic." + name;
+
+    return id;
+}
+
 string
 IceStormInternal::describeEndpoints(const Ice::ObjectPrx& proxy)
 {
@@ -26,7 +58,7 @@ IceStormInternal::describeEndpoints(const Ice::ObjectPrx& proxy)
         {
             if(i != endpoints.begin())
             {
-                os << ", "; 
+                os << ", ";
             }
             os << "\"" << (*i)->toString() << "\"";
         }
@@ -38,33 +70,32 @@ IceStormInternal::describeEndpoints(const Ice::ObjectPrx& proxy)
     return os.str();
 }
 
-namespace
+int
+IceStormInternal::compareSubscriberRecordKey(const MDB_val* v1, const MDB_val* v2)
 {
-
-const string lluDbName = "llu";
-
-}
-
-void
-IceStormInternal::putLLU(const ConnectionPtr& connection, const LogUpdate& llu)
-{
-    LLUMap llumap(connection, lluDbName);
-    LLUMap::iterator ci = llumap.find("_manager");
-    if(ci == llumap.end())
+    SubscriberRecordKey k1, k2;
+    IceDB::Codec<SubscriberRecordKey, IceDB::IceContext, Ice::OutputStream>::read(k1, *v1, dbContext);
+    IceDB::Codec<SubscriberRecordKey, IceDB::IceContext, Ice::OutputStream>::read(k2, *v2, dbContext);
+    if(k1 < k2)
     {
-        llumap.put(LLUMap::value_type("_manager", llu));
+        return -1;
+    }
+    else if(k1 == k2)
+    {
+        return 0;
     }
     else
     {
-        ci.set(llu);
+        return 1;
     }
 }
 
-LogUpdate
-IceStormInternal::getLLU(const ConnectionPtr& connection)
+IceStormElection::LogUpdate
+IceStormInternal::getIncrementedLLU(const IceDB::ReadWriteTxn& txn, LLUMap& lluMap)
 {
-    LLUMap llumap(connection, lluDbName);
-    LLUMap::iterator ci = llumap.find("_manager");
-    assert(ci != llumap.end());
-    return ci->second;
-}
\ No newline at end of file
+    IceStormElection::LogUpdate llu;
+    lluMap.get(txn, lluDbKey, llu);
+    llu.iteration++;
+    lluMap.put(txn, lluDbKey, llu);
+    return llu;
+}
diff --git a/cpp/src/IceStorm/Util.h b/cpp/src/IceStorm/Util.h
index f84e985fe47..373ed6b9058 100644
--- a/cpp/src/IceStorm/Util.h
+++ b/cpp/src/IceStorm/Util.h
@@ -10,24 +10,46 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-#include <string>
-
 #include <Ice/Ice.h>
-
-#include <Freeze/Freeze.h>
+#include <IceDB/IceDB.h>
 #include <IceStorm/LLURecord.h>
+#include <IceStorm/SubscriberRecord.h>
+
+namespace IceStorm
+{
+
+//
+// Forward declarations.
+//
+class Instance;
+typedef IceUtil::Handle<Instance> InstancePtr;
+
+typedef IceDB::Dbi<IceStorm::SubscriberRecordKey, IceStorm::SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
+        SubscriberMap;
+typedef IceDB::Dbi<std::string, IceStormElection::LogUpdate, IceDB::IceContext, Ice::OutputStream> LLUMap;
+
+const std::string lluDbKey = "_manager";
+
+}
 
 namespace IceStormInternal
 {
 
 std::string
+identityToTopicName(const Ice::Identity&);
+
+Ice::Identity
+nameToIdentity(const IceStorm::InstancePtr&, const std::string&);
+
+std::string
 describeEndpoints(const Ice::ObjectPrx&);
 
-void
-putLLU(const Freeze::ConnectionPtr&, const IceStormElection::LogUpdate&);
+int
+compareSubscriberRecordKey(const MDB_val* v1, const MDB_val* v2);
 
 IceStormElection::LogUpdate
-getLLU(const Freeze::ConnectionPtr&);
+getIncrementedLLU(const IceDB::ReadWriteTxn&, IceStorm::LLUMap&);
 
 }
+
 #endif
diff --git a/cpp/src/IceStorm/V32Format.ice b/cpp/src/IceStorm/V32Format.ice
deleted file mode 100644
index a3b21807b78..00000000000
--- a/cpp/src/IceStorm/V32Format.ice
+++ /dev/null
@@ -1,23 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#pragma once
-
-[["cpp:header-ext:h"]]
-
-#include <IceStorm/LinkRecord.ice>
-
-module IceStorm
-{
-
-/** sequence of link records. */
-sequence<LinkRecord> LinkRecordSeq;
-
-}; // End module IceStorm
-
diff --git a/cpp/src/IceStorm/dummy.ice b/cpp/src/IceStorm/dummy.ice
deleted file mode 100644
index 0169fa0df3a..00000000000
--- a/cpp/src/IceStorm/dummy.ice
+++ /dev/null
@@ -1,3 +0,0 @@
-//
-// This file is necessary to compile StringBoolDict under msdev.
-//
diff --git a/cpp/src/IceStorm/dummy2.ice b/cpp/src/IceStorm/dummy2.ice
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/cpp/src/IceStorm/dummy2.ice
+++ /dev/null
diff --git a/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj b/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj
new file mode 100644
index 00000000000..7f00a89cdae
--- /dev/null
+++ b/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8F1A1F99-DBE0-408D-99F7-D59142BD008C}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories>
+    <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceStorm</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceStorm</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Admin.cpp" />
+    <ClCompile Include="..\..\Grammar.cpp" />
+    <ClCompile Include="..\..\Parser.cpp" />
+    <ClCompile Include="..\..\Scanner.cpp" />
+    <ClCompile Include="Win32\Debug\Election.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceStormInternal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LinkRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LLURecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SubscriberRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Election.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceStormInternal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LinkRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LLURecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SubscriberRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Election.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceStormInternal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LinkRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LLURecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SubscriberRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Election.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceStormInternal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LinkRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LLURecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SubscriberRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\Election.ice" />
+    <IceBuilder Include="..\..\IceStormInternal.ice" />
+    <IceBuilder Include="..\..\Instrumentation.ice" />
+    <IceBuilder Include="..\..\LinkRecord.ice" />
+    <IceBuilder Include="..\..\LLURecord.ice" />
+    <IceBuilder Include="..\..\SubscriberRecord.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Win32\Debug\IceStorm\Election.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\IceStormInternal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\LinkRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\LLURecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\SubscriberRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\Election.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\IceStormInternal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\LinkRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\LLURecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\SubscriberRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\Election.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\IceStormInternal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\LinkRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\LLURecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\SubscriberRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\Election.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\IceStormInternal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\LinkRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\LLURecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\SubscriberRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceStormAdmin.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj.filters b/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj.filters
new file mode 100644
index 00000000000..368d39c0e20
--- /dev/null
+++ b/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj.filters
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{49c4152f-b91e-461a-8bc7-f7ea5bcd3a40}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{7aef176d-d245-4df1-8d34-0a98751ccbe6}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{0aedd64a-fafd-4d6b-8c5d-d8a5ea381dad}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{731e5098-fbca-4a97-b670-f6e2b023f452}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{4deb300f-c2d9-4104-81a2-ba0c988c6733}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{fbb623be-4008-4cdb-a502-2e106e810b31}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{4f837564-ee81-4b4c-8220-a2262927f272}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{70944d04-9e4f-4eed-ab43-e4d2879db289}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{3a0f2487-03c1-4720-8e61-80b42143fddc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{ef7a436d-bfd4-4eed-b60c-3c8b866933da}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{33fe3b5f-cfbd-4b75-8882-c22b5410dc19}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{bff33b89-e73f-4ddf-9e43-a13f8dd357fc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{e373230f-b6d6-477b-8eb5-80a6cf62346b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{05378d0a-44d6-493e-8b33-9ad696d33d7a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{763b26e1-de1a-4958-b4b0-25a08a313238}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{25746a85-76eb-422c-94c2-f8092704e142}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Admin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Grammar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Scanner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Election.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceStormInternal.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Instrumentation.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LinkRecord.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LLURecord.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SubscriberRecord.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Election.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceStormInternal.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Instrumentation.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LinkRecord.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LLURecord.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SubscriberRecord.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Election.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceStormInternal.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Instrumentation.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LinkRecord.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LLURecord.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SubscriberRecord.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Election.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceStormInternal.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Instrumentation.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LinkRecord.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LLURecord.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SubscriberRecord.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\Election.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\IceStormInternal.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\Instrumentation.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\LinkRecord.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\LLURecord.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\SubscriberRecord.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Win32\Debug\IceStorm\Election.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\IceStormInternal.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\Instrumentation.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\LinkRecord.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\LLURecord.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\SubscriberRecord.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\Election.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\IceStormInternal.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\Instrumentation.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\LinkRecord.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\LLURecord.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\SubscriberRecord.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\Election.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\IceStormInternal.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\Instrumentation.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\LinkRecord.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\LLURecord.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\SubscriberRecord.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\Election.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\IceStormInternal.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\Instrumentation.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\LinkRecord.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\LLURecord.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\SubscriberRecord.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceStormAdmin.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj b/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj
new file mode 100644
index 00000000000..3abb5f2b904
--- /dev/null
+++ b/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F0B74B00-F252-4D38-A352-ED379CB196E9}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories>
+    <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceStorm</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceStorm</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceStormDB.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\DBTypes.ice" />
+    <IceBuilder Include="..\..\LLURecord.ice" />
+    <IceBuilder Include="..\..\SubscriberRecord.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\IceStormDB.cpp" />
+    <ClCompile Include="Win32\Debug\DBTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LLURecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SubscriberRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\DBTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LLURecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SubscriberRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\DBTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LLURecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SubscriberRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\DBTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LLURecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SubscriberRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Win32\Debug\IceStorm\DBTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\LLURecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\SubscriberRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\DBTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\LLURecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\SubscriberRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\DBTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\LLURecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\SubscriberRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\DBTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\LLURecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\SubscriberRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj.filters b/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj.filters
new file mode 100644
index 00000000000..fd8c1d098dc
--- /dev/null
+++ b/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj.filters
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{94d044e4-77a0-49d9-b266-ffedc4d8f1ce}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{59375f51-4f41-4f30-b99b-de281f25a101}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{e4397208-5e7a-4b7a-a5a0-3cce9a5fc192}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{d88cfc5f-9b68-467e-ab1d-3b2968dcd365}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{b1d574c5-0ca8-4617-8e8c-94c8e76500b2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{3bc84c22-1d86-4a0f-a015-883af7b41062}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{c238bbc9-0e05-4258-89fd-33e9508d7925}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{47de6968-95ab-45fc-85ed-15e3e2f2efa1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{e05e4c48-3b31-4873-a1b9-65ae17c2fe18}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{99284e55-5f67-4da9-b19b-d733799caad0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{52f067cc-7f1d-4585-8b74-b0dd733a9dd3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{ccdf5244-a608-47d9-8311-3318c9602b15}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{9bc40e48-81b9-45b2-a98c-9fcd42aa43a4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{2cdb87a3-b07b-43c2-a4bd-53bf1af9cad5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{68d6ee31-6b4e-4cb8-8ee9-05f85ba4cd6a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{63fe39ea-2fe7-4bbc-bbb9-bae72cda3bb5}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceStormDB.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\DBTypes.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\LLURecord.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\SubscriberRecord.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\IceStormDB.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\DBTypes.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LLURecord.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SubscriberRecord.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\DBTypes.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LLURecord.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SubscriberRecord.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\DBTypes.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LLURecord.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SubscriberRecord.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\DBTypes.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LLURecord.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SubscriberRecord.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Win32\Debug\IceStorm\DBTypes.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\LLURecord.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\SubscriberRecord.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\DBTypes.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\LLURecord.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\SubscriberRecord.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\DBTypes.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\LLURecord.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\SubscriberRecord.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\DBTypes.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\LLURecord.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\SubscriberRecord.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceStorm/msbuild/icestormdb/packages.config b/cpp/src/IceStorm/msbuild/icestormdb/packages.config
new file mode 100644
index 00000000000..3f680df025a
--- /dev/null
+++ b/cpp/src/IceStorm/msbuild/icestormdb/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="lmdb.v120" version="0.9.18.0" targetFramework="native" />
+  <package id="lmdb.v140" version="0.9.18.0" targetFramework="native" />
+</packages>
diff --git a/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj b/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj
new file mode 100644
index 00000000000..cfdf18bd15a
--- /dev/null
+++ b/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj
@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9E13C4B5-5DA9-43C1-9304-AEAC035E854D}</ProjectGuid>
+    <RootNamespace>IceStorm</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceStorm\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceStorm</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\Election.ice" />
+    <IceBuilder Include="..\..\IceStormInternal.ice" />
+    <IceBuilder Include="..\..\Instrumentation.ice" />
+    <IceBuilder Include="..\..\LinkRecord.ice" />
+    <IceBuilder Include="..\..\LLURecord.ice" />
+    <IceBuilder Include="..\..\SubscriberRecord.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Instance.cpp" />
+    <ClCompile Include="..\..\InstrumentationI.cpp" />
+    <ClCompile Include="..\..\NodeI.cpp" />
+    <ClCompile Include="..\..\Observers.cpp" />
+    <ClCompile Include="..\..\Service.cpp" />
+    <ClCompile Include="..\..\Subscriber.cpp" />
+    <ClCompile Include="..\..\TopicI.cpp" />
+    <ClCompile Include="..\..\TopicManagerI.cpp" />
+    <ClCompile Include="..\..\TraceLevels.cpp" />
+    <ClCompile Include="..\..\TransientTopicI.cpp" />
+    <ClCompile Include="..\..\TransientTopicManagerI.cpp" />
+    <ClCompile Include="..\..\Util.cpp" />
+    <ClCompile Include="Win32\Debug\Election.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceStormInternal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LinkRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LLURecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SubscriberRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Election.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceStormInternal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LinkRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LLURecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SubscriberRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Election.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceStormInternal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LinkRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LLURecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SubscriberRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Election.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceStormInternal.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Instrumentation.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LinkRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LLURecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SubscriberRecord.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Instance.h" />
+    <ClInclude Include="..\..\InstrumentationI.h" />
+    <ClInclude Include="..\..\NodeI.h" />
+    <ClInclude Include="..\..\Observers.h" />
+    <ClInclude Include="..\..\Replica.h" />
+    <ClInclude Include="..\..\Service.h" />
+    <ClInclude Include="..\..\Subscriber.h" />
+    <ClInclude Include="..\..\TopicI.h" />
+    <ClInclude Include="..\..\TopicManagerI.h" />
+    <ClInclude Include="..\..\TraceLevels.h" />
+    <ClInclude Include="..\..\TransientTopicI.h" />
+    <ClInclude Include="..\..\TransientTopicManagerI.h" />
+    <ClInclude Include="..\..\Util.h" />
+    <ClInclude Include="Win32\Debug\IceStorm\Election.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\IceStormInternal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\LinkRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\LLURecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\SubscriberRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\Election.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\IceStormInternal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\LinkRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\LLURecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\SubscriberRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\Election.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\IceStormInternal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\LinkRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\LLURecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\SubscriberRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\Election.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\IceStormInternal.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\Instrumentation.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\LinkRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\LLURecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\SubscriberRecord.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceStormService.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" />
+    <Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj.filters b/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj.filters
new file mode 100644
index 00000000000..b2a401ef398
--- /dev/null
+++ b/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj.filters
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{7ada74b9-39da-4b6b-9cf9-09ff045a9bdf}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{e1846544-b5a3-49b1-b821-620a028e6321}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{a12c45e4-c4a1-4d96-a074-990084f0f6ba}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{0b60bff5-1c53-449b-9490-25752dff9954}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{a98d2fe4-4d6c-409a-a0c8-02cab3bceaf3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{fa3142ec-283e-4aea-8a66-2fa3a756f823}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{ef209539-7299-44d2-8cbf-39e94f53a8c9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{a43125aa-4dc8-4a29-9dc0-ac2e6f925aed}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{5c8326b6-66c4-44a5-ab54-f97478a77972}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{908711aa-d7f4-4668-92b3-6f6326d87cc1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{030e1f72-161d-4105-8a79-3abbdfddbaf4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{a5524a6d-461a-4370-aa1c-39fbc0f6af9c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{150f22f2-9632-4e35-bef7-1b7f7852e03b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{e0e6e88c-c225-48d5-8522-8cb7285a9593}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{165baddb-fe60-4a70-9230-6da745138a5b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{0a0f72cc-bff5-4c88-90b1-a18e873017fe}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\Election.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\IceStormInternal.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\Instrumentation.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\LinkRecord.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\LLURecord.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\SubscriberRecord.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Instance.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\InstrumentationI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NodeI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Observers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Service.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Subscriber.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TopicI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TopicManagerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TraceLevels.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TransientTopicI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\TransientTopicManagerI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Election.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceStormInternal.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Instrumentation.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LinkRecord.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\LLURecord.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\SubscriberRecord.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Election.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceStormInternal.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Instrumentation.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LinkRecord.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\LLURecord.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\SubscriberRecord.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Election.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceStormInternal.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Instrumentation.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LinkRecord.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\LLURecord.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\SubscriberRecord.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Election.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceStormInternal.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Instrumentation.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LinkRecord.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\LLURecord.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\SubscriberRecord.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Instance.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\InstrumentationI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\NodeI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Observers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Replica.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Service.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Subscriber.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\TopicI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\TopicManagerI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\TraceLevels.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\TransientTopicI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\TransientTopicManagerI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\Election.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\IceStormInternal.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\Instrumentation.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\LinkRecord.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\LLURecord.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceStorm\SubscriberRecord.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\Election.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\IceStormInternal.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\Instrumentation.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\LinkRecord.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\LLURecord.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceStorm\SubscriberRecord.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\Election.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\IceStormInternal.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\Instrumentation.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\LinkRecord.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\LLURecord.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceStorm\SubscriberRecord.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\Election.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\IceStormInternal.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\Instrumentation.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\LinkRecord.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\LLURecord.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceStorm\SubscriberRecord.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceStormService.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceStorm/msbuild/icestormservice/packages.config b/cpp/src/IceStorm/msbuild/icestormservice/packages.config
new file mode 100644
index 00000000000..3f680df025a
--- /dev/null
+++ b/cpp/src/IceStorm/msbuild/icestormservice/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="lmdb.v120" version="0.9.18.0" targetFramework="native" />
+  <package id="lmdb.v140" version="0.9.18.0" targetFramework="native" />
+</packages>
diff --git a/cpp/src/IceStormLib/.depend.mak b/cpp/src/IceStormLib/.depend.mak
deleted file mode 100755
index 90076091925..00000000000
--- a/cpp/src/IceStormLib/.depend.mak
+++ /dev/null
@@ -1,182 +0,0 @@
-
-IceStorm.h: \
-    "$(slicedir)\IceStorm\IceStorm.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/IceStorm/Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-Metrics.h: \
-    "$(slicedir)\IceStorm\Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-IceStorm.obj: \
-	IceStorm.cpp \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-
-Metrics.obj: \
-	Metrics.cpp \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
diff --git a/cpp/src/IceStormLib/.gitignore b/cpp/src/IceStormLib/.gitignore
deleted file mode 100644
index 798077a2149..00000000000
--- a/cpp/src/IceStormLib/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
-IceStorm.cpp
-Metrics.cpp
-IceStorm.h
-Metrics.h
diff --git a/cpp/src/IceStormLib/IceStorm.rc b/cpp/src/IceStormLib/IceStorm.rc
index 9405ecb0ca9..710b371a996 100644
--- a/cpp/src/IceStormLib/IceStorm.rc
+++ b/cpp/src/IceStormLib/IceStorm.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestorm36d\0"
- #define ORIGINALFILENAME "icestorm36d.dll\0"
+ #define INTERNALNAME "icestorm37a2d\0"
+ #define ORIGINALFILENAME "icestorm37a2d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icestorm36\0"
- #define ORIGINALFILENAME "icestorm36.dll\0"
+ #define INTERNALNAME "icestorm37a2\0"
+ #define ORIGINALFILENAME "icestorm37a2.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm C++ Client Library\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStormLib/Makefile b/cpp/src/IceStormLib/Makefile
deleted file mode 100644
index 32e63d9e28f..00000000000
--- a/cpp/src/IceStormLib/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME	= $(call mklibfilename,IceStorm,$(VERSION))
-SONAME 		= $(call mksoname,IceStorm,$(SOVERSION))
-LIBNAME		= $(call mklibname,IceStorm)
-
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-
-SLICE_OBJS	= IceStorm.o \
-		  Metrics.o
-
-OBJS		= $(SLICE_OBJS)
-
-HDIR		= $(headerdir)/IceStorm
-SDIR		= $(slicedir)/IceStorm
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= $(CPPFLAGS) -I..
-ICECPPFLAGS	:= $(ICECPPFLAGS) -I..
-SLICE2CPPFLAGS	:= --ice --include-dir IceStorm --checksum --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS)
-LINKWITH	:= $(BZIP2_RPATH_LINK) -lIce -lIceUtil
-
-$(libdir)/$(LIBFILENAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	@mkdir -p $(libdir)$(cpp11libdirsuffix)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/IceStormLib/Makefile.mak b/cpp/src/IceStormLib/Makefile.mak
deleted file mode 100644
index ba6ab059fc6..00000000000
--- a/cpp/src/IceStormLib/Makefile.mak
+++ /dev/null
@@ -1,64 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME		= $(top_srcdir)\lib\icestorm$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icestorm$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-TARGETS 	= $(LIBNAME) $(DLLNAME)
-
-SLICE_OBJS	= .\IceStorm.obj \
-		  .\Metrics.obj
-
-OBJS		= $(SLICE_OBJS)
-
-HDIR		= $(headerdir)\IceStorm
-SDIR		= $(slicedir)\IceStorm
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-ICECPPFLAGS	= $(ICECPPFLAGS) -I..
-SLICE2CPPFLAGS	= --ice --include-dir IceStorm --checksum --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS)
-LINKWITH 	= $(LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = IceStorm.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceStorm.res
-	$(LINK) $(BASE):0x2A000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	-del /q IceStorm.cpp $(HDIR)\IceStorm.h
-	-del /q Metrics.cpp $(HDIR)\Metrics.h
-	-del /q IceStorm.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/IceStormLib/Makefile.mk b/cpp/src/IceStormLib/Makefile.mk
new file mode 100644
index 00000000000..b00e2e3a72a
--- /dev/null
+++ b/cpp/src/IceStormLib/Makefile.mk
@@ -0,0 +1,16 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries	:= IceStorm
+
+IceStorm_targetdir	:= $(libdir)
+IceStorm_dependencies	:= Ice
+IceStorm_sliceflags	:= --include-dir IceStorm --dll-export ICE_STORM_LIB_API
+
+projects += $(project)
diff --git a/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj b/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj
new file mode 100644
index 00000000000..cd8879e9d2b
--- /dev/null
+++ b/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A28E5839-97F3-4874-BB77-E425787CF2ED}</ProjectGuid>
+    <RootNamespace>IceStorm</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceStorm\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceStorm</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderDLLExport>ICE_STORM_LIB_API</IceBuilderDLLExport>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceStorm\IceStorm.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceStorm\Metrics.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceStorm.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Win32\Debug\IceStorm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceStorm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceStorm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceStorm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceStorm\IceStorm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceStorm\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceStorm\IceStorm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceStorm\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceStorm\IceStorm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceStorm\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceStorm\IceStorm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceStorm\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj.filters b/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj.filters
new file mode 100644
index 00000000000..10f861f12ec
--- /dev/null
+++ b/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj.filters
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{b8b35839-3d95-4a6e-874b-3b82ec9258cf}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{31a74e25-ed70-4dde-b2d0-ef4315b96442}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{763f2143-e02e-4e23-90f4-213609844681}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{e7126bd6-6e50-47f2-99cc-2b84b7a85087}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{a1d22df0-4627-4dcb-aa49-f74b2df0d00a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{7e49ea6d-98c7-4b44-9f41-91320a38609e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{17e2d958-fa13-49c1-a0d1-17393c87f057}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{f62a6b5a-3839-4539-858e-dba4aebf3d26}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{a19fe40b-b9f9-4226-ae74-5e0243617338}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{4f4d67cb-65c1-49a5-b1d7-e09d6d7eac2e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{ae037344-ac35-4a20-9892-ce30ac676749}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{ed9d252f-7d9c-425a-8e0c-11a323b60bf6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{6fef6341-b091-424b-9dce-dd721938b9eb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{19f1ac5f-f082-4e81-bbba-bfe97dec134c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{29170abc-3eed-42ea-883a-f498d947772a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{9ead4e15-9721-408a-923a-6dc8c56f71cf}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceStorm\IceStorm.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceStorm\Metrics.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceStorm.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Win32\Debug\IceStorm.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceStorm.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceStorm.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceStorm.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceStorm\IceStorm.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceStorm\Metrics.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceStorm\IceStorm.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\IceStorm\Metrics.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceStorm\IceStorm.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\IceStorm\Metrics.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceStorm\IceStorm.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceStorm\Metrics.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj
new file mode 100644
index 00000000000..c1013ec34d5
--- /dev/null
+++ b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E6864F0D-B2ED-406A-B98C-F3668A680005}</ProjectGuid>
+    <RootNamespace>IceStorm</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceStorm\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceStorm</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderDLLExport>ICE_STORM_LIB_API</IceBuilderDLLExport>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceStorm\IceStorm.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceStorm\Metrics.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceStorm.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Win32\Debug\IceStorm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceStorm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceStorm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceStorm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceStorm\IceStorm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceStorm\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceStorm\IceStorm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceStorm\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceStorm\IceStorm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceStorm\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceStorm\IceStorm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceStorm\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj.filters b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj.filters
new file mode 100644
index 00000000000..2cd55085afa
--- /dev/null
+++ b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj.filters
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{546d190e-9382-4a96-afdd-c3b18650c193}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{61465159-8dbc-4f2a-b905-f1846be79dd0}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{426228cc-c6f8-4ab7-a582-a0145ecf8a1d}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{6c30ef81-3dde-49cf-bda9-700da65c35b6}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{92e7c80f-ee18-4c67-b202-cd64858736bd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{fa9c4838-4759-480c-9ff9-06ee55a8232d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{eec269a8-5cb2-420a-bd18-169f4062912f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{2b462b4f-b2bb-487f-923e-59ceaa741ba8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{1420588b-a1ad-427d-ae37-8062d6198ac5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{42d98102-1413-498d-a231-2ac48017cd4c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{8afcaa82-72d8-466f-b615-0976c8fcf155}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{de37c3a5-bc99-4e6d-9305-6bf9756e3672}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{411689de-db8e-4731-b8a0-672a4cfc2431}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{9897c082-aa66-4b89-a168-7e33cc0115bd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{f99cea43-b752-4448-9b1b-c30972d63460}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{e40f65e5-7310-4591-92da-bb75b04f047e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceStorm\IceStorm.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceStorm\Metrics.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceStorm.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Win32\Debug\IceStorm.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceStorm.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceStorm.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceStorm.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceStorm\IceStorm.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceStorm\Metrics.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceStorm\IceStorm.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\IceStorm\Metrics.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceStorm\IceStorm.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\IceStorm\Metrics.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceStorm\IceStorm.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceStorm\Metrics.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj b/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj
new file mode 100644
index 00000000000..a6ad8ec6525
--- /dev/null
+++ b/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{85997BFC-9FCF-4201-B158-8AA3227BECFC}</ProjectGuid>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <WindowsAppContainer>true</WindowsAppContainer>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceStorm\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceStorm</IceBuilderBaseDirectoryForGeneratedInclude>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_STORM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_STORM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_STORM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_STORM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_STORM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICE_STORM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceStorm\IceStorm.ice" />
+    <IceBuilder Include="..\..\..\..\..\slice\IceStorm\Metrics.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ARM\Debug\IceStorm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\IceStorm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\IceStorm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceStorm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceStorm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceStorm.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceStorm\IceStorm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceStorm\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceStorm\IceStorm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceStorm\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceStorm\IceStorm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceStorm\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceStorm\IceStorm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceStorm\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceStorm\IceStorm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceStorm\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceStorm\IceStorm.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceStorm\Metrics.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj.filters b/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj.filters
new file mode 100644
index 00000000000..a8e509dbb2e
--- /dev/null
+++ b/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj.filters
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{9a88f9b8-4db2-4778-828e-618c6932048b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bcd80eef-922a-4a78-a047-5c7876344bef}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{6a84300d-d36d-4efb-ba7c-7ea19975d0fe}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{c02f30dd-0a68-4c62-a83e-1051e6afa3ad}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{28f29b51-0e64-4ae0-82fa-6d329003ae49}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{2772594d-7194-41b2-b850-c6731883a404}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{b017ce15-c677-4624-8a82-386023f132a5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM">
+      <UniqueIdentifier>{947583df-7fe0-4dab-9f12-f57167819267}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Debug">
+      <UniqueIdentifier>{f497a402-a39f-42ed-99ba-dc7265eb9f64}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM">
+      <UniqueIdentifier>{bf21d7c4-b634-49ad-b300-7423b2d1ce09}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Debug">
+      <UniqueIdentifier>{60b3d1c0-027b-4f99-9e53-4f973e9ee701}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{a5bb9053-95e0-4053-8fc4-0104115de3f9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{0270e1dd-db3c-43c8-aeb0-cd7af69d9971}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{01d4d9e6-841f-46d7-9689-aaabd0b517f2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{3013ed22-0446-4e3e-9094-3db4ff9eaf38}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{6d7e4efd-cbc7-4355-97b0-a9bbbfb3995e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{9b316b55-561a-4808-877f-4f2992064c0b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ARM\Release">
+      <UniqueIdentifier>{921ec441-744d-4492-8823-33c5a2a96066}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\ARM\Release">
+      <UniqueIdentifier>{1c2b9a04-7c5e-4cd2-8cdf-45bc8a2f176d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{37d3bf13-a6e7-4d36-8695-aa3301eecc2c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{2cb95f7d-d24a-4f79-ae98-595467121bcc}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\..\slice\IceStorm\IceStorm.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\..\slice\IceStorm\Metrics.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Win32\Debug\IceStorm.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Metrics.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\IceStorm.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Debug\Metrics.cpp">
+      <Filter>Source Files\ARM\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\IceStorm.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Metrics.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\IceStorm.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Metrics.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\IceStorm.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="ARM\Release\Metrics.cpp">
+      <Filter>Source Files\ARM\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\IceStorm.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Metrics.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceStorm\IceStorm.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\IceStorm\Metrics.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceStorm\IceStorm.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\IceStorm\Metrics.h">
+      <Filter>Header Files\ARM\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceStorm\IceStorm.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\IceStorm\Metrics.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceStorm\IceStorm.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\IceStorm\Metrics.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceStorm\IceStorm.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\IceStorm\Metrics.h">
+      <Filter>Header Files\ARM\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceStorm\IceStorm.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\IceStorm\Metrics.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceStormLib/winrt/.depend.mak b/cpp/src/IceStormLib/winrt/.depend.mak
deleted file mode 100755
index bd72b8dd4ff..00000000000
--- a/cpp/src/IceStormLib/winrt/.depend.mak
+++ /dev/null
@@ -1,182 +0,0 @@
-
-..\IceStorm.h: \
-    "$(slicedir)\IceStorm\IceStorm.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/IceStorm/Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-..\Metrics.h: \
-    "$(slicedir)\IceStorm\Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-$(ARCH)\$(CONFIG)\IceStorm.obj: \
-	..\IceStorm.cpp \
-    "$(includedir)\IceStorm\IceStorm.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-
-$(ARCH)\$(CONFIG)\Metrics.obj: \
-	..\Metrics.cpp \
-    "$(includedir)\IceStorm\Metrics.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\IceStorm\Config.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
diff --git a/cpp/src/IceStormLib/winrt/Makefile.mak b/cpp/src/IceStormLib/winrt/Makefile.mak
deleted file mode 100644
index f59ebc94cf5..00000000000
--- a/cpp/src/IceStormLib/winrt/Makefile.mak
+++ /dev/null
@@ -1,49 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir		= ..\..\..
-LIBNAME		= $(SDK_LIBRARY_PATH)\icestorm.lib
-TARGETS		= $(LIBNAME)
-SOURCE_DIR	= ..
-
-TARGETS         = $(LIBNAME)
-
-OBJS		= $(ARCH)\$(CONFIG)\IceStorm.obj \
-		  $(ARCH)\$(CONFIG)\Metrics.obj
-
-SLICE_SRCS	= IceStorm\IceStorm.ice \
-		  IceStorm\Metrics.ice
-
-SRCS		= $(OBJS:.obj=.cpp)
-SRCS		= $(SRCS:x86\=)
-SRCS		= $(SRCS:x64\=)
-SRCS		= $(SRCS:arm\=)
-SRCS		= $(SRCS:Retail\=..\)
-SRCS		= $(SRCS:Debug\=..\)
-
-HDIR		= $(headerdir)\IceStorm
-SDIR		= $(slicedir)\IceStorm
-
-PDBNAME		= $(LIBNAME:.lib=.pdb)
-CPPFLAGS	= /Fd$(PDBNAME) -I..\.. -DICE_BUILDING_ICESTORM -DWIN32_LEAN_AND_MEAN
-ICECPPFLAGS	= -I..
-SLICE2CPPFLAGS	= --ice --include-dir IceStorm --checksum
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-$(LIBNAME): $(OBJS) sdks
-	$(AR) $(ARFLAGS) $(OBJS) /out:$(LIBNAME)
-
-clean::
-	-del /q $(SOURCE_DIR)\IceStorm.cpp $(HDIR)\IceStorm.h
-	-del /q $(SOURCE_DIR)\Metrics.cpp $(HDIR)\Metrics.h
-	-del /q $(ARCH)\$(CONFIG)\*.obj
-	-del /q $(PDBNAME)
-
-install:: all
diff --git a/cpp/src/IceUtil/.depend.mak b/cpp/src/IceUtil/.depend.mak
deleted file mode 100755
index 0887fbf7c0e..00000000000
--- a/cpp/src/IceUtil/.depend.mak
+++ /dev/null
@@ -1,233 +0,0 @@
-
-ArgVector.obj: \
-	ArgVector.cpp \
-    "ArgVector.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-Cond.obj: \
-	Cond.cpp \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-
-ConvertUTF.obj: \
-	ConvertUTF.cpp \
-    "ConvertUTF.h" \
-    "Unicode.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-
-CountDownLatch.obj: \
-	CountDownLatch.cpp \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-
-CtrlCHandler.obj: \
-	CtrlCHandler.cpp \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-
-Exception.obj: \
-	Exception.cpp \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-
-FileUtil.obj: \
-	FileUtil.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "FileUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-
-InputUtil.obj: \
-	InputUtil.cpp \
-    "$(includedir)\IceUtil\InputUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-MutexProtocol.obj: \
-	MutexProtocol.cpp \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-Options.obj: \
-	Options.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-OutputUtil.obj: \
-	OutputUtil.cpp \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "FileUtil.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-
-Random.obj: \
-	Random.cpp \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-
-RecMutex.obj: \
-	RecMutex.cpp \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-
-SHA1.obj: \
-	SHA1.cpp \
-    "$(includedir)\IceUtil\SHA1.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-
-Shared.obj: \
-	Shared.cpp \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-
-StringConverter.obj: \
-	StringConverter.cpp \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "Unicode.h" \
-
-StringUtil.obj: \
-	StringUtil.cpp \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-
-Thread.obj: \
-	Thread.cpp \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-
-ThreadException.obj: \
-	ThreadException.cpp \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Time.h" \
-
-Time.obj: \
-	Time.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Time.h" \
-
-Timer.obj: \
-	Timer.cpp \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-
-Unicode.obj: \
-	Unicode.cpp \
-    "Unicode.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "ConvertUTF.h" \
-
-UUID.obj: \
-	UUID.cpp \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\Exception.h" \
diff --git a/cpp/src/IceUtil/.gitignore b/cpp/src/IceUtil/.gitignore
deleted file mode 100644
index 720f44c7047..00000000000
--- a/cpp/src/IceUtil/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
diff --git a/cpp/src/IceUtil/ArgVector.h b/cpp/src/IceUtil/ArgVector.h
index fa8fe1592fa..634dec94e63 100644
--- a/cpp/src/IceUtil/ArgVector.h
+++ b/cpp/src/IceUtil/ArgVector.h
@@ -17,7 +17,7 @@
 namespace IceUtilInternal
 {
 
-class ICE_UTIL_API ArgVector
+class ICE_API ArgVector
 {
 public:
 
diff --git a/cpp/src/IceUtil/ConvertUTF.cpp b/cpp/src/IceUtil/ConvertUTF.cpp
index 2a28c78e5e1..5e0b110542c 100644
--- a/cpp/src/IceUtil/ConvertUTF.cpp
+++ b/cpp/src/IceUtil/ConvertUTF.cpp
@@ -47,9 +47,15 @@
 
 ------------------------------------------------------------------------ */
 
+#include <IceUtil/Config.h>
+
+#ifndef ICE_HAS_CODECVT_UTF8
+//
+// It's better to exclude the file from the build, but it's not always
+// easy to do.
+//
 
 #include <IceUtil/ConvertUTF.h>
-#include <IceUtil/StringConverter.h>
 
 #ifdef CVTUTF_DEBUG
 #include <stdio.h>
@@ -439,12 +445,7 @@ ConversionResult ConvertUTF8toUTF32 (
     similarly unrolled loops.
 
    --------------------------------------------------------------------- */
-}
 
-namespace IceUtil
-{
-
-using namespace IceUtilInternal;
 
 /* --------------------------------------------------------------------- */
 
@@ -473,5 +474,6 @@ Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) {
         }
     }
 }
-
 }
+
+#endif
diff --git a/cpp/src/IceUtil/ConvertUTF.h b/cpp/src/IceUtil/ConvertUTF.h
index a761ef455b8..b7285b4e0f4 100644
--- a/cpp/src/IceUtil/ConvertUTF.h
+++ b/cpp/src/IceUtil/ConvertUTF.h
@@ -32,9 +32,6 @@
 #ifndef ICE_UTIL_CONVERT_UTF_H
 #define ICE_UTIL_CONVERT_UTF_H
 
-#include <IceUtil/Unicode.h>
-
-
 /* ---------------------------------------------------------------------
 
     Conversions between UTF32, UTF-16, and UTF-8.  Header file.
@@ -94,6 +91,25 @@
 
 ------------------------------------------------------------------------ */
 
+
+namespace IceUtilInternal
+{
+
+enum ConversionFlags
+{
+    strictConversion = 0,
+    lenientConversion
+};
+
+enum ConversionResult
+{
+        conversionOK,           /* conversion successful */
+        sourceExhausted,        /* partial character in source, but hit end */
+        targetExhausted,        /* insuff. room in target for conversion */
+        sourceIllegal           /* source sequence is illegal/malformed */
+};
+
+
 /* ---------------------------------------------------------------------
     The following 4 definitions are compiler-specific.
     The C standard does not guarantee that wchar_t has at least
@@ -102,9 +118,6 @@
     bit mask & shift operations.
 ------------------------------------------------------------------------ */
 
-namespace IceUtilInternal
-{
-
 typedef unsigned int    UTF32;  /* at least 32 bits */
 typedef unsigned short  UTF16;  /* at least 16 bits */
 typedef unsigned char   UTF8;   /* typically 8 bits */
@@ -120,23 +133,21 @@ typedef bool            Boolean; /* 0 or 1 */
 
 ConversionResult ConvertUTF8toUTF16(
     const UTF8** sourceStart, const UTF8* sourceEnd, 
-    UTF16** targetStart, UTF16* targetEnd, IceUtil::ConversionFlags flags);
+    UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
 
 ConversionResult ConvertUTF16toUTF8 (
     const UTF16** sourceStart, const UTF16* sourceEnd, 
-    UTF8** targetStart, UTF8* targetEnd, IceUtil::ConversionFlags flags);
+    UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
                 
 ConversionResult ConvertUTF8toUTF32(
     const UTF8** sourceStart, const UTF8* sourceEnd, 
-    UTF32** targetStart, UTF32* targetEnd, IceUtil::ConversionFlags flags);
+    UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
 
 ConversionResult ConvertUTF32toUTF8(
     const UTF32** sourceStart, const UTF32* sourceEnd, 
-    UTF8** targetStart, UTF8* targetEnd, IceUtil::ConversionFlags flags);
+    UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
 
-//
-// isLegalUTFSequence is declared in IceUtil/StringConverter.h
-//
+bool isLegalUTF8Sequence(const UTF8* source, const UTF8* end);
 
 /* --------------------------------------------------------------------- */
 
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index 1105c4c9f25..6eac2e7e05a 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -55,24 +55,19 @@ CtrlCHandlerException::CtrlCHandlerException(const char* file, int line) :
 {
 }
 
-namespace
-{
-
-const char* ctrlCHandlerName = "IceUtil::CtrlCHandlerException";
-
-}
-
 string
-CtrlCHandlerException::ice_name() const
+CtrlCHandlerException::ice_id() const
 {
-    return ctrlCHandlerName;
+    return "::IceUtil::CtrlCHandlerException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 CtrlCHandlerException*
 CtrlCHandlerException::ice_clone() const
 {
     return new CtrlCHandlerException(*this);
 }
+#endif
 
 void
 CtrlCHandlerException::ice_throw() const
diff --git a/cpp/src/IceUtil/FileUtil.h b/cpp/src/IceUtil/FileUtil.h
deleted file mode 100644
index 7d5c478834d..00000000000
--- a/cpp/src/IceUtil/FileUtil.h
+++ /dev/null
@@ -1,172 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef ICE_FILE_UTIL_H
-#define ICE_FILE_UTIL_H
-
-#include <IceUtil/Config.h>
-#include <IceUtil/Shared.h>
-#include <IceUtil/Handle.h>
-
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <fstream>
-
-namespace IceUtilInternal
-{
-
-extern const ICE_UTIL_API std::string pathsep;
-extern const ICE_UTIL_API std::string separator;
-
-//
-// Detemine if path is an absolute path.
-//
-ICE_UTIL_API bool isAbsolutePath(const std::string&);
-
-//
-// Determine if a file exists.
-//
-ICE_UTIL_API bool fileExists(const std::string&);
-
-//
-// Determine if a directory exists.
-//
-ICE_UTIL_API bool directoryExists(const std::string&);
-
-//
-// Determine if a directory exists and is empty.
-//
-ICE_UTIL_API bool isEmptyDirectory(const std::string&);
-
-#ifdef _WIN32
-
-#if defined(__MINGW32__)
-typedef struct _stat structstat;
-#else
-typedef struct _stat64i32 structstat;
-#endif
-
-#ifdef _MSC_VER
-#   define O_RDONLY _O_RDONLY
-#   define O_BINARY _O_BINARY
-
-#   define S_ISDIR(mode) ((mode) & _S_IFDIR)
-#   define S_ISREG(mode) ((mode) & _S_IFREG)
-#endif
-
-#else
-
-typedef struct stat structstat;
-#   define O_BINARY 0
-
-#endif
-
-//
-// OS stat
-//
-ICE_UTIL_API int stat(const std::string&, structstat*);
-ICE_UTIL_API int remove(const std::string&);
-ICE_UTIL_API int rename(const std::string&, const std::string&);
-ICE_UTIL_API int rmdir(const std::string&);
-
-ICE_UTIL_API int mkdir(const std::string&, int);
-ICE_UTIL_API FILE* fopen(const std::string&, const std::string&);
-ICE_UTIL_API FILE* freopen(const std::string&, const std::string&, FILE*);
-ICE_UTIL_API int open(const std::string&, int);
-
-#ifndef ICE_OS_WINRT
-ICE_UTIL_API int getcwd(std::string&);
-#endif
-
-ICE_UTIL_API int unlink(const std::string&);
-ICE_UTIL_API int close(int);
-
-//
-// This class is used to implement process file locking. This class
-// is not intended to do file locking within the same process.
-//
-class ICE_UTIL_API FileLock : public IceUtil::Shared, public IceUtil::noncopyable
-{
-public:
-    //
-    // The constructor opens the given file (eventually creating it)
-    // and acquires a lock on the file or throws FileLockException if
-    // the file couldn't be locked.
-    //
-    // If the lock can be acquired, the process pid is written to the
-    // file.
-    //
-    FileLock(const std::string&);
-    
-    //
-    // The destructor releases the lock and removes the file.
-    //
-    virtual ~FileLock();
-    
-private:
-    
-#ifdef _WIN32
-    HANDLE _fd;
-#else
-    int _fd;
-#endif
-    std::string _path;
-};
-
-typedef IceUtil::Handle<FileLock> FileLockPtr;
-
-class ICE_UTIL_API ifstream : public std::ifstream
-{
-public:
-
-    ifstream();
-    ifstream(const std::string&, std::ios_base::openmode mode = std::ios_base::in);
-    void open(const std::string&, std::ios_base::openmode mode = std::ios_base::in);
-
-#ifdef __SUNPRO_CC
-    using std::ifstream::open;
-#endif
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1900)
-    ifstream(const ifstream&) = delete;
-#endif 
-
-private:
-
-    // Hide const char* definitions since they shouldn't be used.
-    ifstream(const char*);
-    void open(const char*, std::ios_base::openmode mode = std::ios_base::in);
-};
-
-class ICE_UTIL_API ofstream : public std::ofstream
-{
-public:
-
-    ofstream();
-    ofstream(const std::string&, std::ios_base::openmode mode = std::ios_base::out);
-    void open(const std::string&, std::ios_base::openmode mode = std::ios_base::out);
-
-#ifdef __SUNPRO_CC
-    using std::ofstream::open;
-#endif
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1900)
-    ofstream(const ofstream&) = delete;
-#endif 
-
-private:
-
-    // Hide const char* definitions since they shouldn't be used.
-    ofstream(const char*);
-    void open(const char*, std::ios_base::openmode mode = std::ios_base::out);
-};
-
-}
-#endif
diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc
deleted file mode 100644
index d9dc5f2bb40..00000000000
--- a/cpp/src/IceUtil/IceUtil.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "iceutil36d\0"
- #define ORIGINALFILENAME "iceutil36d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "iceutil36\0"
- #define ORIGINALFILENAME "iceutil36.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "Ice C++ Utility Library\0"
-            VALUE "FileVersion", "3.6.3\0"
-            VALUE "InternalName", INTERNALNAME
-            VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
-            VALUE "OriginalFilename", ORIGINALFILENAME
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile
deleted file mode 100644
index b14150f19bf..00000000000
--- a/cpp/src/IceUtil/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME	= $(call mklibfilename,IceUtil,$(VERSION))
-SONAME		= $(call mksoname,IceUtil,$(SOVERSION))
-LIBNAME		= $(call mklibname,IceUtil)
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-
-OBJS		= ArgVector.o \
-		  Cond.o \
-		  ConvertUTF.o \
-		  CountDownLatch.o \
-		  CtrlCHandler.o \
-		  Exception.o \
-		  FileUtil.o \
-		  InputUtil.o \
-		  MutexProtocol.o \
-		  Options.o \
-		  OutputUtil.o \
-		  Random.o \
-		  RecMutex.o \
-		  SHA1.o \
-		  Shared.o \
-		  StringConverter.o \
-		  StringUtil.o \
-		  Thread.o \
-		  ThreadException.o \
-		  Time.o \
-		  Timer.o \
-		  Unicode.o \
-		  UUID.o
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS        := $(CPPFLAGS) $(ICEUTIL_FLAGS) $(OPENSSL_FLAGS) -DICE_UTIL_API_EXPORTS -I..
-LINKWITH        := $(ICEUTIL_OS_LIBS)
-
-ifeq ($(STATICLIBS),yes)
-$(libdir)/$(LIBNAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mklib,$@,$(OBJS))
-else
-$(libdir)/$(LIBFILENAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	@mkdir -p $(libdir)$(cpp11libdirsuffix)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-endif
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/IceUtil/Makefile.mak b/cpp/src/IceUtil/Makefile.mak
deleted file mode 100644
index ae49a10a37d..00000000000
--- a/cpp/src/IceUtil/Makefile.mak
+++ /dev/null
@@ -1,87 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME		= $(top_srcdir)\lib\iceutil$(LIBSUFFIX).lib
-DLLNAME 	= $(top_srcdir)\bin\iceutil$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-OBJS		= .\ArgVector.obj \
-		  .\Cond.obj \
-		  .\ConvertUTF.obj \
-		  .\CountDownLatch.obj \
-		  .\CtrlCHandler.obj \
-		  .\Exception.obj \
-		  .\FileUtil.obj \
-		  .\InputUtil.obj \
-		  .\MutexProtocol.obj \
-		  .\Options.obj \
-		  .\OutputUtil.obj \
-		  .\Random.obj \
-		  .\RecMutex.obj \
-		  .\SHA1.obj \
-		  .\Shared.obj \
-		  .\StringConverter.obj \
-		  .\StringUtil.obj \
-		  .\Thread.obj \
-		  .\ThreadException.obj \
-		  .\Time.obj \
-		  .\Timer.obj \
-		  .\Unicode.obj \
-		  .\UUID.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= $(CPPFLAGS) -DICE_UTIL_API_EXPORTS -I.. -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS	= /pdb:$(DLLNAME:.dll=.pdb)
-
-!endif
-
-RES_FILE	= IceUtil.res
-
-!if "$(STATICLIBS)" == "yes"
-
-$(DLLNAME):
-
-$(LIBNAME): $(OBJS)
-	$(AR) $(ARFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ DbgHelp.lib
-
-!else
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceUtil.res
-	$(LINK) $(BASE):0x20000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS) $(ICEUTIL_OS_LIBS) \
-		$(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-		$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-!endif
-
-clean::
-	-del /q IceUtil.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/IceUtil/Makefile.mk b/cpp/src/IceUtil/Makefile.mk
new file mode 100644
index 00000000000..870c6c115c8
--- /dev/null
+++ b/cpp/src/IceUtil/Makefile.mk
@@ -0,0 +1,24 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries 	= IceUtil
+
+IceUtil_targetdir	:= $(libdir)
+IceUtil_cppflags 	:= $(if $(filter yes,$(libbacktrace)),-DICE_LIBBACKTRACE)
+
+ifeq ($(os),Darwin)
+IceUtil_excludes        = src/IceUtil/ConvertUTF.cpp src/IceUtil/Unicode.cpp
+endif
+
+# Always enable the static configuration for the IceUtil library and never
+# install it.
+IceUtil_always_enable_configs 	:= static
+IceUtil_install_configs		:= none
+
+projects += $(project)
diff --git a/cpp/src/IceUtil/Options.cpp b/cpp/src/IceUtil/Options.cpp
index 8f2457732d8..55615665a11 100644
--- a/cpp/src/IceUtil/Options.cpp
+++ b/cpp/src/IceUtil/Options.cpp
@@ -20,16 +20,16 @@ IceUtilInternal::APIException::APIException(const char* file, int line, const st
 {
 }
 
+#ifndef ICE_CPP11_COMPILER
 IceUtilInternal::APIException::~APIException() throw()
 {
 }
-
-const char* IceUtilInternal::APIException::_name = "IceUtilInternal::APIException";
+#endif
 
 string
-IceUtilInternal::APIException::ice_name() const
+IceUtilInternal::APIException::ice_id() const
 {
-    return _name;
+    return "::IceUtilInternal::APIException";
 }
 
 void
@@ -42,11 +42,13 @@ IceUtilInternal::APIException::ice_print(ostream& out) const
     }
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtilInternal::APIException*
 IceUtilInternal::APIException::ice_clone() const
 {
     return new APIException(*this);
 }
+#endif
 
 void
 IceUtilInternal::APIException::ice_throw() const
@@ -66,16 +68,16 @@ IceUtilInternal::BadOptException::BadOptException(const char* file, int line, co
 {
 }
 
+#ifndef ICE_CPP11_COMPILER
 IceUtilInternal::BadOptException::~BadOptException() throw()
 {
 }
-
-const char* IceUtilInternal::BadOptException::_name = "IceUtilInternal::BadOptException";
+#endif
 
 string
-IceUtilInternal::BadOptException::ice_name() const
+IceUtilInternal::BadOptException::ice_id() const
 {
-    return _name;
+    return "::IceUtilInternal::BadOptException";
 }
 
 void
@@ -88,11 +90,13 @@ IceUtilInternal::BadOptException::ice_print(ostream& out) const
     }
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtilInternal::BadOptException*
 IceUtilInternal::BadOptException::ice_clone() const
 {
     return new BadOptException(*this);
 }
+#endif
 
 void
 IceUtilInternal::BadOptException::ice_throw() const
@@ -174,7 +178,7 @@ void
 IceUtilInternal::Options::addOpt(const string& shortOpt, const string& longOpt, ArgType at, string dflt, RepeatType rt)
 {
     RecMutex::Lock sync(_m);
-    
+
     if(parseCalled)
     {
         throw APIException(__FILE__, __LINE__, "cannot add options after parse() was called");
@@ -465,7 +469,7 @@ IceUtilInternal::Options::split(const string& line)
 
                                 Int64 ull = 0;
                                 string::size_type j;
-                                for(j = i + 1; j < i + 3 && j < l.size() && 
+                                for(j = i + 1; j < i + 3 && j < l.size() &&
                                     isxdigit(static_cast<unsigned char>(c = l[j])); ++j)
                                 {
                                     ull *= 16;
diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp
index 755e80d2c4b..3e21011e511 100644
--- a/cpp/src/IceUtil/OutputUtil.cpp
+++ b/cpp/src/IceUtil/OutputUtil.cpp
@@ -23,6 +23,8 @@ StartBlock sb;
 EndBlock eb;
 StartPar spar;
 EndPar epar;
+StartAbrk sabrk;
+EndAbrk eabrk;
 Separator sp;
 EndElement ee;
 StartEscapes startEscapes;
@@ -302,17 +304,17 @@ IceUtilInternal::Output::eb()
 }
 
 void
-IceUtilInternal::Output::spar()
+IceUtilInternal::Output::spar(char c)
 {
-    _out << '(';
+    _out << c;
     _par = 0;
 }
 
 void
-IceUtilInternal::Output::epar()
+IceUtilInternal::Output::epar(char c)
 {
     _par = -1;
-    _out << ')';
+    _out << c;
 }
 
 Output&
diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp
index 983b0d0c1f0..f2f973d1f02 100644
--- a/cpp/src/IceUtil/RecMutex.cpp
+++ b/cpp/src/IceUtil/RecMutex.cpp
@@ -10,12 +10,6 @@
 #include <IceUtil/RecMutex.h>
 #include <IceUtil/Exception.h>
 
-//
-// AbstractMutex isn't used anywhere in IceUtil, we include it here
-// to give the compiler a chance to export the class symbols.
-//
-#include <IceUtil/AbstractMutex.h>
-
 using namespace std;
 
 IceUtil::RecMutex::RecMutex() :
diff --git a/cpp/src/IceUtil/Shared.cpp b/cpp/src/IceUtil/Shared.cpp
index 4012f58e169..75b43462398 100644
--- a/cpp/src/IceUtil/Shared.cpp
+++ b/cpp/src/IceUtil/Shared.cpp
@@ -29,6 +29,11 @@ IceUtil::SimpleShared::SimpleShared(const SimpleShared&) :
 {
 }
 
+IceUtil::SimpleShared::~SimpleShared()
+{
+    // Out of line to avoid weak vtable
+}
+
 IceUtil::Shared::Shared() :
     _ref(0),
     _flags(0)
@@ -41,14 +46,14 @@ IceUtil::Shared::Shared(const Shared&) :
 {
 }
 
-void 
+void
 IceUtil::Shared::__incRef()
 {
     assert(_ref >= 0);
     ++_ref;
 }
 
-void 
+void
 IceUtil::Shared::__decRef()
 {
     assert(_ref > 0);
diff --git a/cpp/src/IceUtil/StringConverter.cpp b/cpp/src/IceUtil/StringConverter.cpp
index 46c590c42f3..f122084eb68 100644
--- a/cpp/src/IceUtil/StringConverter.cpp
+++ b/cpp/src/IceUtil/StringConverter.cpp
@@ -10,9 +10,14 @@
 #include <IceUtil/StringConverter.h>
 #include <IceUtil/MutexPtrLock.h>
 #include <IceUtil/Mutex.h>
-#include <IceUtil/ScopedArray.h>
 #include <IceUtil/StringUtil.h>
+
+#ifdef ICE_HAS_CODECVT_UTF8
+#include <codecvt>
+#include <locale>
+#else
 #include <IceUtil/Unicode.h>
+#endif
 
 using namespace IceUtil;
 using namespace IceUtilInternal;
@@ -25,162 +30,299 @@ IceUtil::Mutex* processStringConverterMutex = 0;
 IceUtil::StringConverterPtr processStringConverter;
 IceUtil::WstringConverterPtr processWstringConverter;
 
-class Init
+#ifndef ICE_HAS_THREAD_SAFE_LOCAL_STATIC
+IceUtil::WstringConverterPtr unicodeWstringConverter;
+#endif
+
+#ifdef ICE_HAS_CODECVT_UTF8
+
+template<size_t wcharSize>
+struct SelectCodeCvt;
+
+template<>
+struct SelectCodeCvt<2>
+{
+    typedef std::codecvt_utf8_utf16<wchar_t> Type;
+};
+
+template<>
+struct SelectCodeCvt<4>
+{
+    typedef std::codecvt_utf8<wchar_t> Type;
+};
+
+class UnicodeWstringConverter : public WstringConverter
 {
 public:
 
-    Init()
+#if defined(_MSC_VER) && (_MSC_VER <= 1800)
+    //
+    // VS 2013 needs a default ctor
+    //
+    UnicodeWstringConverter()
     {
-        processStringConverterMutex = new IceUtil::Mutex;
     }
+#endif
 
-    ~Init()
+    virtual Byte* toUTF8(const wchar_t* sourceStart, const wchar_t* sourceEnd, UTF8Buffer& buffer) const
     {
-        delete processStringConverterMutex;
-        processStringConverterMutex = 0;
+        //
+        // Max bytes for a character encoding in UTF-8 is 4,
+        // however MSVC returns 6
+        //
+#ifdef _MSC_VER
+        assert(_codecvt.max_length() == 4 || _codecvt.max_length() == 6);
+#else
+        assert(_codecvt.max_length() == 4);
+#endif
+        if(sourceStart == sourceEnd)
+        {
+            return buffer.getMoreBytes(1, 0);
+        }
+
+        char* targetStart = 0;
+        char* targetEnd = 0;
+        char* targetNext = 0;
+
+        mbstate_t state = mbstate_t(); // must be initialized!
+        const wchar_t* sourceNext = sourceStart;
+
+        bool more = false;
+
+        //
+        // The number of bytes we request from buffer for each remaining source character
+        //
+        size_t factor = 2;
+
+        do
+        {
+            assert(factor <= 4);
+            const size_t chunkSize = std::max<size_t>((sourceEnd - sourceStart) * factor, 4);
+            ++factor; // at the next round, we'll allocate more bytes per remaining source character
+
+            targetStart = reinterpret_cast<char*>(buffer.getMoreBytes(chunkSize, reinterpret_cast<Byte*>(targetNext)));
+            targetEnd = targetStart + chunkSize;
+            targetNext = targetStart;
+
+            codecvt_base::result result =
+                _codecvt.out(state, sourceStart, sourceEnd, sourceNext, targetStart, targetEnd, targetNext);
+
+            switch(result)
+            {
+                case codecvt_base::ok:
+                    //
+                    // MSVC returns ok when target is exhausted
+                    //
+                    more = sourceNext < sourceEnd;
+                    break;
+
+                case codecvt_base::partial:
+                    //
+                    // clang/libc++ and g++5 return partial when target is exhausted
+                    //
+                    more = true;
+                    assert(sourceNext < sourceEnd);
+                    break;
+
+                case codecvt_base::noconv:
+                    //
+                    // Unexpected
+                    //
+                    assert(0);
+                    throw IllegalConversionException(__FILE__, __LINE__, "codecvt.out noconv");
+
+                default:
+                    throw IllegalConversionException(__FILE__, __LINE__, "codecvt.out error");
+            }
+
+            if(targetStart == targetNext)
+            {
+                // We didn't convert a single character
+                throw IllegalConversionException(__FILE__, __LINE__,
+                                                 "no character converted by codecvt.out");
+            }
+
+            sourceStart = sourceNext;
+        } while (more);
+
+        return reinterpret_cast<Byte*>(targetNext);
     }
-};
 
-Init init;
+    virtual void fromUTF8(const Byte* sourceStart, const Byte* sourceEnd, wstring& target) const
+    {
+        const size_t sourceSize = sourceEnd - sourceStart;
 
-}
+        if(sourceSize == 0)
+        {
+            target = L"";
+        }
+        else
+        {
+            target.resize(sourceSize);
+            wchar_t* targetStart = const_cast<wchar_t*>(target.data());
+            wchar_t* targetEnd = targetStart + sourceSize;
+            wchar_t* targetNext = targetStart;
 
-namespace
-{
+            const char* sourceNext = reinterpret_cast<const char*>(sourceStart);
 
-class UTF8BufferI : public UTF8Buffer
+            mbstate_t state = mbstate_t();
+
+            codecvt_base::result result = _codecvt.in(state,
+                                                      reinterpret_cast<const char*>(sourceStart),
+                                                      reinterpret_cast<const char*>(sourceEnd),
+                                                      sourceNext,
+                                                      targetStart, targetEnd, targetNext);
+
+            if(result != codecvt_base::ok)
+            {
+                throw IllegalConversionException(__FILE__, __LINE__, "codecvt.in failure");
+            }
+
+            target.resize(targetNext - targetStart);
+        }
+    }
+
+private:
+
+    typedef SelectCodeCvt<sizeof(wchar_t)>::Type CodeCvt;
+    const CodeCvt _codecvt;
+};
+
+#else
+
+class UnicodeWstringConverter : public WstringConverter
 {
 public:
 
-    UTF8BufferI() :
-        _buffer(0),
-        _offset(0)
+    virtual Byte* toUTF8(const wchar_t* sourceStart, const wchar_t* sourceEnd, UTF8Buffer& buffer) const
     {
-    }
+        if(sourceStart == sourceEnd)
+        {
+            return buffer.getMoreBytes(1, 0);
+        }
 
-    ~UTF8BufferI()
-    {
-        free(_buffer);
+        Byte* targetStart = 0;
+        Byte* targetEnd = 0;
+
+        //
+        // The number of bytes we request from buffer for each remaining source character
+        //
+        size_t factor = 2;
+
+        do
+        {
+            assert(factor <= 4);
+            const size_t chunkSize = std::max<size_t>((sourceEnd - sourceStart) * factor, 4);
+            ++factor; // at the next round, we'll allocate more bytes per remaining source character
+
+            targetStart = buffer.getMoreBytes(chunkSize, targetStart);
+            targetEnd = targetStart + chunkSize;
+        }
+        while(convertUTFWstringToUTF8(sourceStart, sourceEnd, targetStart, targetEnd) == false);
+
+        return targetStart;
     }
 
-    Byte* getMoreBytes(size_t howMany, Byte* firstUnused)
+    virtual void fromUTF8(const Byte* sourceStart, const Byte* sourceEnd, wstring& target) const
     {
-        if(_buffer == 0)
+        if(sourceStart == sourceEnd)
         {
-            _buffer = static_cast<Byte*>(malloc(howMany));
+            target = L"";
         }
         else
         {
-            assert(firstUnused != 0);
-            _offset = firstUnused - _buffer;
-            _buffer = static_cast<Byte*>(realloc(_buffer, _offset + howMany));
+            convertUTF8ToUTFWstring(sourceStart, sourceEnd, target);
         }
-        
-        if(!_buffer)
-        {
-            throw std::bad_alloc();
-        }
-        return _buffer + _offset;
     }
+};
+
+#endif
+
+#ifdef _WIN32
+
+//
+// Converts to/from UTF-8 using MultiByteToWideChar and WideCharToMultiByte
+//
+class WindowsStringConverter : public StringConverter
+{
+public:
+
+    explicit WindowsStringConverter(unsigned int);
+
+    virtual Byte* toUTF8(const char*, const char*, UTF8Buffer&) const;
+
+    virtual void fromUTF8(const Byte*, const Byte*, string& target) const;
+
+private:
+    unsigned int _cp;
+};
+#endif
+
+
+class Init
+{
+public:
 
-    Byte* getBuffer()
+    Init()
     {
-        return _buffer;
+        processStringConverterMutex = new IceUtil::Mutex;
+#ifndef ICE_HAS_THREAD_SAFE_LOCAL_STATIC
+        unicodeWstringConverter = ICE_MAKE_SHARED(UnicodeWstringConverter);
+#endif
     }
 
-    void reset()
+    ~Init()
     {
-        free(_buffer);
-        _buffer = 0;
-        _offset = 0;
+        delete processStringConverterMutex;
+        processStringConverterMutex = 0;
     }
-    
-private:
-
-    IceUtil::Byte* _buffer;
-    size_t _offset;
 };
 
-}
-
+Init init;
 
 
-UnicodeWstringConverter::UnicodeWstringConverter(ConversionFlags flags) :
-    _conversionFlags(flags)
+const WstringConverterPtr&
+getUnicodeWstringConverter()
 {
+#ifdef ICE_HAS_THREAD_SAFE_LOCAL_STATIC
+    static const WstringConverterPtr unicodeWstringConverter = ICE_MAKE_SHARED(UnicodeWstringConverter);
+#endif
+    return unicodeWstringConverter;
 }
 
-Byte* 
-UnicodeWstringConverter::toUTF8(const wchar_t* sourceStart, 
-                                const wchar_t* sourceEnd,
-                                UTF8Buffer& buffer) const
+class UTF8BufferI : public UTF8Buffer
 {
+public:
+
     //
-    // The "chunk size" is the maximum of the number of characters in the
-    // source and 6 (== max bytes necessary to encode one Unicode character).
+    // Returns the first unused byte in the resized buffer
     //
-    size_t chunkSize = std::max<size_t>(static_cast<size_t>(sourceEnd - sourceStart), 6);
-
-    Byte* targetStart = buffer.getMoreBytes(chunkSize, 0);
-    Byte* targetEnd = targetStart + chunkSize;
-
-    ConversionResult result;
-
-    while((result =
-          convertUTFWstringToUTF8(sourceStart, sourceEnd, 
-                                  targetStart, targetEnd, _conversionFlags))
-          == targetExhausted)
-    {
-        targetStart = buffer.getMoreBytes(chunkSize, targetStart);
-        targetEnd = targetStart + chunkSize;
-    }
-    
-    switch(result)
+    Byte* getMoreBytes(size_t howMany, Byte* firstUnused)
     {
-        case conversionOK:
-            break;
-        case sourceExhausted:
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "wide string source exhausted");
-        case sourceIllegal:
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "wide string source illegal");
-        default:
+        size_t bytesUsed = 0;
+        if(firstUnused != 0)
         {
-            assert(0);
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
+            bytesUsed = firstUnused - reinterpret_cast<const Byte*>(_buffer.data());
         }
-    }
-    return targetStart;
-}
 
+        if(_buffer.size() < howMany + bytesUsed)
+        {
+            _buffer.resize(bytesUsed + howMany);
+        }
 
-void 
-UnicodeWstringConverter::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd,
-                                  wstring& target) const
-{
-    if(sourceStart == sourceEnd)
-    {
-        target = L"";
-        return;
+        return const_cast<Byte*>(reinterpret_cast<const Byte*>(_buffer.data())) + bytesUsed;
     }
 
-    ConversionResult result = 
-        convertUTF8ToUTFWstring(sourceStart, sourceEnd, target, _conversionFlags);
-
-    switch(result)
+    void swap(string& other, const Byte* tail)
     {
-        case conversionOK:
-            break;
-        case sourceExhausted:
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "UTF-8 string source exhausted");
-        case sourceIllegal:
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "UTF-8 string source illegal");
-        default:
-        {
-            assert(0);
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
-        }
+        assert(tail >= reinterpret_cast<const Byte*>(_buffer.data()));
+        _buffer.resize(tail - reinterpret_cast<const Byte*>(_buffer.data()));
+        other.swap(_buffer);
     }
-}
+
+private:
+    string _buffer;
+};
 
 #ifdef _WIN32
 WindowsStringConverter::WindowsStringConverter(unsigned int cp) :
@@ -189,9 +331,7 @@ WindowsStringConverter::WindowsStringConverter(unsigned int cp) :
 }
 
 Byte*
-WindowsStringConverter::toUTF8(const char* sourceStart,
-                               const char* sourceEnd,
-                               UTF8Buffer& buffer) const
+WindowsStringConverter::toUTF8(const char* sourceStart, const char* sourceEnd, UTF8Buffer& buffer) const
 {
     //
     // First convert to UTF-16
@@ -202,26 +342,23 @@ WindowsStringConverter::toUTF8(const char* sourceStart,
         return buffer.getMoreBytes(1, 0);
     }
 
-    int size = 0;
     int writtenWchar = 0;
-    ScopedArray<wchar_t> wbuffer;
-    
+    wstring wbuffer;
+
     //
     // The following code pages doesn't support MB_ERR_INVALID_CHARS flag
     // see http://msdn.microsoft.com/en-us/library/windows/desktop/dd319072(v=vs.85).aspx
     //
     DWORD flags =
         (_cp == 50220 || _cp == 50221 || _cp == 50222 ||
-         _cp == 50225 || _cp == 50227 || _cp == 50229 || 
+         _cp == 50225 || _cp == 50227 || _cp == 50229 ||
          _cp == 65000 || _cp == 42 || (_cp >= 57002 && _cp <= 57011)) ? 0 : MB_ERR_INVALID_CHARS;
-    
+
     do
     {
-        size = size == 0 ? sourceSize + 2 : 2 * size;
-        wbuffer.reset(new wchar_t[size]);
-
-        writtenWchar = MultiByteToWideChar(_cp, flags, sourceStart,
-                                           sourceSize, wbuffer.get(), size);
+        wbuffer.resize(wbuffer.size() == 0 ? sourceSize + 2 : 2 * wbuffer.size());
+        writtenWchar = MultiByteToWideChar(_cp, flags, sourceStart, sourceSize,
+                                           const_cast<wchar_t*>(wbuffer.data()), static_cast<int>(wbuffer.size()));
     } while(writtenWchar == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER);
 
     if(writtenWchar == 0)
@@ -229,15 +366,16 @@ WindowsStringConverter::toUTF8(const char* sourceStart,
         throw IllegalConversionException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
     }
 
+    wbuffer.resize(static_cast<size_t>(writtenWchar));
+
     //
     // Then convert this UTF-16 wbuffer into UTF-8
     //
-    return _unicodeWstringConverter.toUTF8(wbuffer.get(), wbuffer.get() + writtenWchar, buffer);
+    return getUnicodeWstringConverter()->toUTF8(wbuffer.data(), wbuffer.data() + wbuffer.size(), buffer);
 }
 
 void
-WindowsStringConverter::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd,
-                                 string& target) const
+WindowsStringConverter::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd, string& target) const
 {
     if(sourceStart == sourceEnd)
     {
@@ -256,25 +394,27 @@ WindowsStringConverter::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd,
     // First convert to wstring (UTF-16)
     //
     wstring wtarget;
-    _unicodeWstringConverter.fromUTF8(sourceStart, sourceEnd, wtarget);
+    getUnicodeWstringConverter()->fromUTF8(sourceStart, sourceEnd, wtarget);
 
     //
     // WC_ERR_INVALID_CHARS conversion flag is only supported with 65001 (UTF-8) and
     // 54936 (GB18030 Simplified Chinese)
     //
     DWORD flags = (_cp == 65001 || _cp == 54936) ? WC_ERR_INVALID_CHARS : 0;
+
     //
     // And then to a multi-byte narrow string
     //
-    int size = 0;
-    int writtenChar = 0;
-    ScopedArray<char> buffer;
+    int writtenChar = -1;
     do
     {
-        size = size == 0 ? static_cast<int>(sourceEnd - sourceStart) + 2 : 2 * size;
-        buffer.reset(new char[size]);
+        target.resize(writtenChar == -1 ?
+                      std::max<size_t>(sourceEnd - sourceStart + 2, target.size()) :
+                      2 * target.size());
+
         writtenChar = WideCharToMultiByte(_cp, flags, wtarget.data(), static_cast<int>(wtarget.size()),
-                                          buffer.get(), size, 0, 0);
+                                          const_cast<char*>(target.data()), static_cast<int>(target.size()),
+                                          0, 0);
     } while(writtenChar == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER);
 
     if(writtenChar == 0)
@@ -282,9 +422,29 @@ WindowsStringConverter::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd,
         throw IllegalConversionException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
     }
 
-    target.assign(buffer.get(), writtenChar);
+    target.resize(static_cast<size_t>(writtenChar));
+}
+#endif
+
+}
+
+IceUtil::UTF8Buffer::~UTF8Buffer()
+{
+    // Out of line to avoid weak vtable
+}
+
+WstringConverterPtr
+IceUtil::createUnicodeWstringConverter()
+{
+    return getUnicodeWstringConverter();
 }
 
+#ifdef _WIN32
+StringConverterPtr
+IceUtil::createWindowsStringConverter(unsigned int cp)
+{
+    return ICE_MAKE_SHARED(WindowsStringConverter, cp);
+}
 #endif
 
 
@@ -298,8 +458,8 @@ IceUtil::getProcessStringConverter()
 void
 IceUtil::setProcessStringConverter(const StringConverterPtr& converter)
 {
-   IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(processStringConverterMutex);
-   processStringConverter = converter;
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(processStringConverterMutex);
+    processStringConverter = converter;
 }
 
 WstringConverterPtr
@@ -312,61 +472,33 @@ IceUtil::getProcessWstringConverter()
 void
 IceUtil::setProcessWstringConverter(const WstringConverterPtr& converter)
 {
-   IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(processStringConverterMutex);
-   processWstringConverter = converter;
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(processStringConverterMutex);
+    processWstringConverter = converter;
 }
 
 string
-IceUtil::wstringToString(const wstring& v, const StringConverterPtr& converter, const WstringConverterPtr& wConverter,
-                         IceUtil::ConversionFlags flags)
+IceUtil::wstringToString(const wstring& v, const StringConverterPtr& converter, const WstringConverterPtr& wConverter)
 {
     string target;
     if(!v.empty())
     {
+        const WstringConverterPtr& wConverterWithDefault = wConverter ? wConverter : getUnicodeWstringConverter();
+
         //
-        // First convert to UTF8 narrow string.
+        // First convert to UTF-8 narrow string.
         //
-        if(wConverter)
-        {
-            UTF8BufferI buffer;
-            Byte* last = wConverter->toUTF8(v.data(), v.data() + v.size(), buffer);
-            target = string(reinterpret_cast<const char*>(buffer.getBuffer()), last - buffer.getBuffer());
-        }
-        else
-        {
-            size_t size = v.size() * 4 * sizeof(char);
-
-            Byte* outBuf = new Byte[size];
-            Byte* targetStart = outBuf; 
-            Byte* targetEnd = outBuf + size;
-
-            const wchar_t* sourceStart = v.data();
-  
-            ConversionResult cr = 
-                convertUTFWstringToUTF8(
-                    sourceStart, sourceStart + v.size(), 
-                    targetStart, targetEnd, flags);
-                
-            if(cr != conversionOK)
-            {
-                delete[] outBuf;
-                assert(cr == sourceExhausted || cr == sourceIllegal);
-                throw IllegalConversionException(__FILE__, __LINE__, 
-                                                 cr == sourceExhausted ? "partial character" : "bad encoding");
-            }
-            
-            target = string(reinterpret_cast<char*>(outBuf), static_cast<size_t>(targetStart - outBuf));
-            delete[] outBuf;
-        }
+        UTF8BufferI buffer;
+        Byte* last = wConverterWithDefault->toUTF8(v.data(), v.data() + v.size(), buffer);
+        buffer.swap(target, last);
 
         //
-        // If narrow string converter is present convert to the native narrow string encoding, otherwise 
+        // If narrow string converter is present convert to the native narrow string encoding, otherwise
         // native narrow string encoding is UTF8 and we are done.
         //
         if(converter)
         {
             string tmp;
-            converter->fromUTF8(reinterpret_cast<const Byte*>(target.data()), 
+            converter->fromUTF8(reinterpret_cast<const Byte*>(target.data()),
                                 reinterpret_cast<const Byte*>(target.data() + target.size()), tmp);
             tmp.swap(target);
         }
@@ -375,8 +507,7 @@ IceUtil::wstringToString(const wstring& v, const StringConverterPtr& converter,
 }
 
 wstring
-IceUtil::stringToWstring(const string& v, const StringConverterPtr& converter, 
-                         const WstringConverterPtr& wConverter, IceUtil::ConversionFlags flags)
+IceUtil::stringToWstring(const string& v, const StringConverterPtr& converter, const WstringConverterPtr& wConverter)
 {
     wstring target;
     if(!v.empty())
@@ -390,36 +521,21 @@ IceUtil::stringToWstring(const string& v, const StringConverterPtr& converter,
         {
             UTF8BufferI buffer;
             Byte* last = converter->toUTF8(v.data(), v.data() + v.size(), buffer);
-            tmp = string(reinterpret_cast<const char*>(buffer.getBuffer()), last - buffer.getBuffer());
+            buffer.swap(tmp, last);
         }
         else
         {
             tmp = v;
         }
 
+        const WstringConverterPtr& wConverterWithDefault = wConverter ? wConverter : getUnicodeWstringConverter();
+
         //
-        // If there is a wide string converter use fromUTF8 to convert to the wide string native encoding.
+        // Convert from UTF-8 to the wide string encoding
         //
-        if(wConverter)
-        {
-            wConverter->fromUTF8(reinterpret_cast<const Byte*>(tmp.data()), 
-                                 reinterpret_cast<const Byte*>(tmp.data() + tmp.size()), target);
-        }
-        else
-        {
-            const Byte* sourceStart = reinterpret_cast<const Byte*>(tmp.data());
-            
-            ConversionResult cr = 
-                convertUTF8ToUTFWstring(sourceStart, sourceStart + tmp.size(), target, flags);
-
-            if(cr != conversionOK)
-            {
-                assert(cr == sourceExhausted || cr == sourceIllegal);
+        wConverterWithDefault->fromUTF8(reinterpret_cast<const Byte*>(tmp.data()),
+                                        reinterpret_cast<const Byte*>(tmp.data() + tmp.size()), target);
 
-                throw IllegalConversionException(__FILE__, __LINE__,
-                                                 cr == sourceExhausted ? "partial character" : "bad encoding");
-            }
-        }
     }
     return target;
 }
@@ -430,10 +546,12 @@ IceUtil::nativeToUTF8(const string& str, const IceUtil::StringConverterPtr& conv
     if(!converter || str.empty())
     {
         return str;
-    }    
+    }
     UTF8BufferI buffer;
     Byte* last = converter->toUTF8(str.data(), str.data() + str.size(), buffer);
-    return string(reinterpret_cast<const char*>(buffer.getBuffer()), last - buffer.getBuffer());
+    string result;
+    buffer.swap(result, last);
+    return result;
 }
 
 string
@@ -448,3 +566,121 @@ IceUtil::UTF8ToNative(const string& str, const IceUtil::StringConverterPtr& conv
                         reinterpret_cast<const Byte*>(str.data() + str.size()), tmp);
     return tmp;
 }
+
+#ifdef ICE_HAS_CODECVT_UTF8
+
+#if defined(_MSC_VER) && (_MSC_VER == 1900)
+//
+// Workaround for compiler bug - see http://stackoverflow.com/questions/32055357
+//
+typedef unsigned short Char16T;
+typedef unsigned int Char32T;
+
+#else
+typedef char16_t Char16T;
+typedef char32_t Char32T;
+#endif
+
+#endif
+
+
+vector<unsigned short>
+IceUtilInternal::toUTF16(const vector<Byte>& source)
+{
+    vector<unsigned short> result;
+    if(!source.empty())
+    {
+
+#ifdef ICE_HAS_CODECVT_UTF8
+    assert(sizeof(Char16T) == sizeof(unsigned short));
+
+    typedef wstring_convert<codecvt_utf8_utf16<Char16T>, Char16T> Convert;
+
+    Convert convert;
+
+    try
+    {
+        Convert::wide_string ws = convert.from_bytes(reinterpret_cast<const char*>(&source.front()),
+                                                     reinterpret_cast<const char*>(&source.front() + source.size()));
+
+        result = vector<unsigned short>(reinterpret_cast<const unsigned short*>(ws.data()),
+                                        reinterpret_cast<const unsigned short*>(ws.data()) + ws.length());
+    }
+    catch(const std::range_error& ex)
+    {
+        throw IllegalConversionException(__FILE__, __LINE__, ex.what());
+    }
+
+#else
+    convertUTF8ToUTF16(source, result);
+#endif
+    }
+    return result;
+}
+
+vector<unsigned int>
+IceUtilInternal::toUTF32(const vector<Byte>& source)
+{
+    vector<unsigned int> result;
+    if(!source.empty())
+    {
+
+#ifdef ICE_HAS_CODECVT_UTF8
+    assert(sizeof(Char32T) == sizeof(unsigned int));
+
+    typedef wstring_convert<codecvt_utf8<Char32T>, Char32T> Convert;
+    Convert convert;
+
+    try
+    {
+        Convert::wide_string ws = convert.from_bytes(reinterpret_cast<const char*>(&source.front()),
+                                                     reinterpret_cast<const char*>(&source.front() + source.size()));
+
+        result = vector<unsigned int>(reinterpret_cast<const unsigned int*>(ws.data()),
+                                      reinterpret_cast<const unsigned int*>(ws.data()) + ws.length());
+    }
+    catch(const std::range_error& ex)
+    {
+        throw IllegalConversionException(__FILE__, __LINE__, ex.what());
+    }
+
+#else
+    convertUTF8ToUTF32(source, result);
+#endif
+    }
+    return result;
+}
+
+
+vector<Byte>
+IceUtilInternal::fromUTF32(const vector<unsigned int>& source)
+{
+    vector<Byte> result;
+    if(!source.empty())
+    {
+
+#ifdef ICE_HAS_CODECVT_UTF8
+    assert(sizeof(Char32T) == sizeof(unsigned int));
+
+    typedef wstring_convert<codecvt_utf8<Char32T>, Char32T> Convert;
+    Convert convert;
+
+    try
+    {
+        Convert::byte_string bs = convert.to_bytes(reinterpret_cast<const Char32T*>(&source.front()),
+                                                   reinterpret_cast<const Char32T*>(&source.front() + source.size()));
+
+        result = vector<Byte>(reinterpret_cast<const Byte*>(bs.data()),
+                              reinterpret_cast<const Byte*>(bs.data()) + bs.length());
+        }
+    catch(const std::range_error& ex)
+    {
+        throw IllegalConversionException(__FILE__, __LINE__, ex.what());
+    }
+
+#else
+    convertUTF32ToUTF8(source, result);
+#endif
+    }
+    return result;
+}
diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp
index 1f7b1ea8407..ec33cf8c587 100644
--- a/cpp/src/IceUtil/StringUtil.cpp
+++ b/cpp/src/IceUtil/StringUtil.cpp
@@ -11,10 +11,6 @@
 #include <IceUtil/StringConverter.h>
 #include <cstring>
 
-#ifdef ICE_OS_WINRT
-#  include <IceUtil/ScopedArray.h>
-#endif
-
 using namespace std;
 using namespace IceUtil;
 
@@ -502,9 +498,7 @@ IceUtilInternal::errorToString(int error, LPCVOID source)
     {
 #ifdef ICE_OS_WINRT
 
-        int size = 256;
-        IceUtil::ScopedArray<wchar_t> lpMsgBuf(new wchar_t[size]);
-
+        wstring lpMsgBuf(256, wchar_t());
         DWORD stored = 0;
         
         while(stored == 0)
@@ -516,8 +510,8 @@ IceUtilInternal::errorToString(int error, LPCVOID source)
                 source,
                 error,
                 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-                lpMsgBuf.get(),
-                size,
+                const_cast<wchar_t*>(lpMsgBuf.data()),
+                static_cast<int>(lpMsgBuf.size()),
                 NULL);
 
             if(stored == 0)
@@ -525,15 +519,13 @@ IceUtilInternal::errorToString(int error, LPCVOID source)
                 DWORD err = GetLastError();
                 if(err == ERROR_INSUFFICIENT_BUFFER)
                 {
-                    if(size == 65536)
+                    if(lpMsgBuf.size() >= 65536)
                     {
                         break; // already at the max size
                     }
                     else
                     {
-                        size *= 4;
-                        size = max(size, 65536);
-                        lpMsgBuf.reset(new wchar_t[size]);
+                        lpMsgBuf.resize(min<size_t>(lpMsgBuf.size() * 4, 65536));
                     }
                 }
                 else
@@ -543,7 +535,7 @@ IceUtilInternal::errorToString(int error, LPCVOID source)
             }
         }
 
-        LPWSTR msg = lpMsgBuf.get();
+        LPWSTR msg = const_cast<wchar_t*>(lpMsgBuf.data());
 
 #else
         LPWSTR msg = 0;
@@ -579,12 +571,6 @@ IceUtilInternal::errorToString(int error, LPCVOID source)
         }
         else
         {
-#ifndef ICE_OS_WINRT
-            if(msg)
-            {
-                LocalFree(msg);
-            }
-#endif
             ostringstream os;
             os << "unknown error: " << error;
             return os.str();
diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp
index 8b354517d99..c41106820ce 100644
--- a/cpp/src/IceUtil/ThreadException.cpp
+++ b/cpp/src/IceUtil/ThreadException.cpp
@@ -15,20 +15,20 @@ IceUtil::ThreadSyscallException::ThreadSyscallException(const char* file, int li
     SyscallException(file, line, err)
 {
 }
-    
-const char* IceUtil::ThreadSyscallException::_name = "IceUtil::ThreadSyscallException";
 
 string
-IceUtil::ThreadSyscallException::ice_name() const
+IceUtil::ThreadSyscallException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::ThreadSyscallException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::ThreadSyscallException*
 IceUtil::ThreadSyscallException::ice_clone() const
 {
     return new ThreadSyscallException(*this);
 }
+#endif
 
 void
 IceUtil::ThreadSyscallException::ice_throw() const
@@ -41,19 +41,19 @@ IceUtil::ThreadLockedException::ThreadLockedException(const char* file, int line
 {
 }
 
-const char* IceUtil::ThreadLockedException::_name = "IceUtil::ThreadLockedException";
-
 string
-IceUtil::ThreadLockedException::ice_name() const
+IceUtil::ThreadLockedException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::ThreadLockedException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::ThreadLockedException*
 IceUtil::ThreadLockedException::ice_clone() const
 {
     return new ThreadLockedException(*this);
 }
+#endif
 
 void
 IceUtil::ThreadLockedException::ice_throw() const
@@ -66,19 +66,19 @@ IceUtil::ThreadStartedException::ThreadStartedException(const char* file, int li
 {
 }
 
-const char* IceUtil::ThreadStartedException::_name = "IceUtil::ThreadStartedException";
-
 string
-IceUtil::ThreadStartedException::ice_name() const
+IceUtil::ThreadStartedException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::ThreadStartedException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::ThreadStartedException*
 IceUtil::ThreadStartedException::ice_clone() const
 {
     return new ThreadStartedException(*this);
 }
+#endif
 
 void
 IceUtil::ThreadStartedException::ice_throw() const
@@ -91,19 +91,19 @@ IceUtil::ThreadNotStartedException::ThreadNotStartedException(const char* file,
 {
 }
 
-const char* IceUtil::ThreadNotStartedException::_name = "IceUtil::ThreadNotStartedException";
-
 string
-IceUtil::ThreadNotStartedException::ice_name() const
+IceUtil::ThreadNotStartedException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::ThreadNotStartedException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::ThreadNotStartedException*
 IceUtil::ThreadNotStartedException::ice_clone() const
 {
     return new ThreadNotStartedException(*this);
 }
+#endif
 
 void
 IceUtil::ThreadNotStartedException::ice_throw() const
@@ -117,19 +117,19 @@ IceUtil::BadThreadControlException::BadThreadControlException(const char* file,
 {
 }
 
-const char* IceUtil::BadThreadControlException::_name = "IceUtil::BadThreadControlException";
-
 string
-IceUtil::BadThreadControlException::ice_name() const
+IceUtil::BadThreadControlException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::BadThreadControlException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::BadThreadControlException*
 IceUtil::BadThreadControlException::ice_clone() const
 {
     return new BadThreadControlException(*this);
 }
+#endif
 
 void
 IceUtil::BadThreadControlException::ice_throw() const
@@ -143,13 +143,11 @@ IceUtil::InvalidTimeoutException::InvalidTimeoutException(const char* file, int
     _timeout(timeout)
 {
 }
-    
-const char* IceUtil::InvalidTimeoutException::_name = "IceUtil::InvalidTimeoutException";
 
 string
-IceUtil::InvalidTimeoutException::ice_name() const
+IceUtil::InvalidTimeoutException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::InvalidTimeoutException";
 }
 
 void
@@ -159,11 +157,13 @@ IceUtil::InvalidTimeoutException::ice_print(ostream& os) const
     os << ":\ninvalid timeout: " << _timeout << " seconds";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::InvalidTimeoutException*
 IceUtil::InvalidTimeoutException::ice_clone() const
 {
     return new InvalidTimeoutException(*this);
 }
+#endif
 
 void
 IceUtil::InvalidTimeoutException::ice_throw() const
diff --git a/cpp/src/IceUtil/Unicode.cpp b/cpp/src/IceUtil/Unicode.cpp
index ca36a912b47..4db36d29e9d 100644
--- a/cpp/src/IceUtil/Unicode.cpp
+++ b/cpp/src/IceUtil/Unicode.cpp
@@ -7,7 +7,17 @@
 //
 // **********************************************************************
 
+#include <IceUtil/Config.h>
+
+#ifndef ICE_HAS_CODECVT_UTF8
+//
+// It's better to exclude the file from the build, but it's not always
+// easy to do.
+//
+
 #include <IceUtil/Unicode.h>
+#include <IceUtil/Exception.h>
+
 #include <IceUtil/ConvertUTF.h>
 
 using namespace std;
@@ -20,39 +30,30 @@ namespace
 // Helper class, base never defined
 // Usage: WstringHelper<sizeof(wchar_t)>::toUTF8 and fromUTF8.
 //
-template<size_t wcharSize> 
-struct WstringHelper
-{
-    static ConversionResult toUTF8(
-        const wchar_t*& sourceStart, const wchar_t* sourceEnd, 
-        Byte*& targetStart, Byte* targetEnd, ConversionFlags flags);
+template<size_t wcharSize> struct WstringHelper;
 
-    static ConversionResult fromUTF8(
-        const Byte*& sourceStart, const Byte* sourceEnd, 
-        wchar_t*& targetStart, wchar_t* targetEnd, ConversionFlags flags);
-};
 
 template<>
 struct WstringHelper<2>
 {
     static ConversionResult toUTF8(
-        const wchar_t*& sourceStart, const wchar_t* sourceEnd, 
-        Byte*& targetStart, Byte* targetEnd, ConversionFlags flags)
+        const wchar_t*& sourceStart, const wchar_t* sourceEnd,
+        Byte*& targetStart, Byte* targetEnd)
     {
         return ConvertUTF16toUTF8(
             reinterpret_cast<const UTF16**>(&sourceStart),
             reinterpret_cast<const UTF16*>(sourceEnd),
-            &targetStart, targetEnd, flags);
+            &targetStart, targetEnd, lenientConversion);
     }
-    
+
     static ConversionResult fromUTF8(
-        const Byte*& sourceStart, const Byte* sourceEnd, 
-        wchar_t*& targetStart, wchar_t* targetEnd, ConversionFlags flags)
+        const Byte*& sourceStart, const Byte* sourceEnd,
+        wchar_t*& targetStart, wchar_t* targetEnd)
     {
         return ConvertUTF8toUTF16(
             &sourceStart, sourceEnd,
             reinterpret_cast<UTF16**>(&targetStart),
-            reinterpret_cast<UTF16*>(targetEnd), flags);
+            reinterpret_cast<UTF16*>(targetEnd), lenientConversion);
     }
 };
 
@@ -60,128 +61,129 @@ template<>
 struct WstringHelper<4>
 {
     static ConversionResult toUTF8(
-        const wchar_t*& sourceStart, const wchar_t* sourceEnd, 
-        Byte*& targetStart, Byte* targetEnd, ConversionFlags flags)
+        const wchar_t*& sourceStart, const wchar_t* sourceEnd,
+        Byte*& targetStart, Byte* targetEnd)
     {
         return ConvertUTF32toUTF8(
             reinterpret_cast<const UTF32**>(&sourceStart),
             reinterpret_cast<const UTF32*>(sourceEnd),
-            &targetStart, targetEnd, flags);
+            &targetStart, targetEnd, lenientConversion);
     }
-    
+
     static ConversionResult fromUTF8(
-        const Byte*& sourceStart, const Byte* sourceEnd, 
-        wchar_t*& targetStart, wchar_t* targetEnd, ConversionFlags flags)
+        const Byte*& sourceStart, const Byte* sourceEnd,
+        wchar_t*& targetStart, wchar_t* targetEnd)
     {
         return ConvertUTF8toUTF32(
             &sourceStart, sourceEnd,
             reinterpret_cast<UTF32**>(&targetStart),
-            reinterpret_cast<UTF32*>(targetEnd), flags);
+            reinterpret_cast<UTF32*>(targetEnd), lenientConversion);
     }
 };
+
+void checkResult(ConversionResult result)
+{
+    switch (result)
+    {
+        case conversionOK:
+            break;
+        case sourceExhausted:
+            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "source exhausted");
+        case sourceIllegal:
+            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "source illegal");
+        case targetExhausted:
+            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "source illegal");
+        default:
+        {
+            assert(0);
+            throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
+        }
+    }
+}
 }
 
 //
 // convertXXX functions
 //
 
-ConversionResult 
-IceUtilInternal::convertUTFWstringToUTF8(
-    const wchar_t*& sourceStart, const wchar_t* sourceEnd, 
-    Byte*& targetStart, Byte* targetEnd, ConversionFlags flags)
+bool
+IceUtilInternal::convertUTFWstringToUTF8(const wchar_t*& sourceStart, const wchar_t* sourceEnd,
+                                         Byte*& targetStart, Byte* targetEnd)
 {
-    return WstringHelper<sizeof(wchar_t)>::toUTF8(
-        sourceStart, sourceEnd, targetStart, targetEnd, flags);
-}
+    ConversionResult result = WstringHelper<sizeof(wchar_t)>::toUTF8(
+        sourceStart, sourceEnd, targetStart, targetEnd);
 
-ConversionResult
-IceUtilInternal::convertUTF8ToUTFWstring(
-    const Byte*& sourceStart, const Byte* sourceEnd, 
-    wchar_t*& targetStart, wchar_t* targetEnd, ConversionFlags flags)
-{
-    return WstringHelper<sizeof(wchar_t)>::fromUTF8(
-        sourceStart, sourceEnd, targetStart, targetEnd, flags);
+    if(result == targetExhausted)
+    {
+        return false;
+    }
+    else
+    {
+        checkResult(result);
+        return true;
+    }
 }
 
-ConversionResult 
-IceUtilInternal::convertUTF8ToUTFWstring(const Byte*& sourceStart, const Byte* sourceEnd, 
-                                 std::wstring& target, ConversionFlags flags)
+void
+IceUtilInternal::convertUTF8ToUTFWstring(const Byte*& sourceStart, const Byte* sourceEnd, std::wstring& target)
 {
-    //
-    // Could be reimplemented without this temporary wchar_t buffer
-    //
-    size_t size = static_cast<size_t>(sourceEnd - sourceStart);
-    wchar_t* outBuf = new wchar_t[size];
-    wchar_t* targetStart = outBuf; 
-    wchar_t* targetEnd = targetStart + size;
-
-    ConversionResult result =  
-        convertUTF8ToUTFWstring(sourceStart, sourceEnd, targetStart,
-                                targetEnd, flags);
-
-    if(result == conversionOK)
-    {
-        std::wstring s(outBuf, static_cast<size_t>(targetStart - outBuf));
-        s.swap(target);
-    }
-    delete[] outBuf;
-    return result;
+    size_t sourceSize = static_cast<size_t>(sourceEnd - sourceStart);
+
+    target.resize(sourceSize);
+    wchar_t* targetStart = const_cast<wchar_t*>(target.data());
+    wchar_t* targetEnd = targetStart + sourceSize;
+
+    ConversionResult result = WstringHelper<sizeof(wchar_t)>::fromUTF8(sourceStart, sourceEnd,
+                                                                       targetStart, targetEnd);
+
+    checkResult(result);
+    target.resize(targetStart - target.data());
 }
 
-ConversionResult
-IceUtilInternal::convertUTF8ToUTF16(const vector<unsigned char>& source, vector<unsigned short>& target, ConversionFlags flags)
+void
+IceUtilInternal::convertUTF8ToUTF16(const vector<unsigned char>& source, vector<unsigned short>& target)
 {
     target.resize(source.size());
     const unsigned char* sourceStart = &source[0];
     const unsigned char* sourceEnd = &source[0] + source.size();
-    
-    unsigned short* targetStart = &target[0]; 
+
+    unsigned short* targetStart = &target[0];
     unsigned short* targetEnd = &target[0] + target.size();
-    ConversionResult result = ConvertUTF8toUTF16(&sourceStart, sourceEnd, &targetStart, targetEnd, flags);
-    
-    if(result == conversionOK)
-    {
-        target.resize(targetStart - &target[0]);
-    }
-    return result;
+    ConversionResult result = ConvertUTF8toUTF16(&sourceStart, sourceEnd, &targetStart, targetEnd, lenientConversion);
+
+    checkResult(result);
+    target.resize(targetStart - &target[0]);
 }
 
-ConversionResult
-IceUtilInternal::convertUTF8ToUTF32(const vector<unsigned char>& source, vector<unsigned int>& target, ConversionFlags flags)
+void
+IceUtilInternal::convertUTF8ToUTF32(const vector<unsigned char>& source, vector<unsigned int>& target)
 {
     target.resize(source.size());
     const unsigned char* sourceStart = &source[0];
     const unsigned char* sourceEnd = &source[0] + source.size();
-    
-    unsigned int* targetStart = &target[0]; 
+
+    unsigned int* targetStart = &target[0];
     unsigned int* targetEnd = &target[0] + target.size();
-    ConversionResult result = ConvertUTF8toUTF32(&sourceStart, sourceEnd, &targetStart, targetEnd, flags);
-    
-    if(result == conversionOK)
-    {
-        target.resize(targetStart - &target[0]);
-    }
-    return result;
+    ConversionResult result = ConvertUTF8toUTF32(&sourceStart, sourceEnd, &targetStart, targetEnd, lenientConversion);
+
+    checkResult(result);
+    target.resize(targetStart - &target[0]);
 }
 
-ConversionResult
-IceUtilInternal::convertUTF32ToUTF8(const vector<unsigned int>& source, vector<unsigned char>& target, ConversionFlags flags)
+void
+IceUtilInternal::convertUTF32ToUTF8(const vector<unsigned int>& source, vector<unsigned char>& target)
 {
     target.resize(source.size() * 4);
 
     const unsigned int* sourceStart = &source[0];
     const unsigned int* sourceEnd = &source[0] + source.size();
-    
-    unsigned char* targetStart = &target[0]; 
-    unsigned char* targetEnd = &target[0] + target.size();
-    ConversionResult result = ConvertUTF32toUTF8(&sourceStart, sourceEnd, &targetStart, targetEnd, flags);
-    
-    if(result == conversionOK)
-    {
-        target.resize(targetStart - &target[0]);
-    }
-    return result;
-}
 
+    unsigned char* targetStart = &target[0];
+    unsigned char* targetEnd = &target[0] + target.size();
+    ConversionResult result = ConvertUTF32toUTF8(&sourceStart, sourceEnd, &targetStart, targetEnd, lenientConversion);
 
+    checkResult(result);
+    target.resize(targetStart - &target[0]);
+}
 
+#endif
diff --git a/cpp/src/IceUtil/Unicode.h b/cpp/src/IceUtil/Unicode.h
index d5c3b235ddb..24f97424a52 100644
--- a/cpp/src/IceUtil/Unicode.h
+++ b/cpp/src/IceUtil/Unicode.h
@@ -11,51 +11,38 @@
 #define ICE_UTIL_UNICODE_H
 
 #include <IceUtil/Config.h>
-#include <IceUtil/StringConverter.h>
+#include <vector>
 
 namespace IceUtilInternal
 {
 
 //
-// Converts UTF-8 byte-sequences to and from UTF-16 or UTF-32 (with native
-// endianness) depending on sizeof(wchar_t).
+// Convert UTF-8 byte-sequences to and from UTF-16 or UTF-32 (with native endianness)
 //
-// These are thin wrappers over the UTF8/16/32 converters provided by 
-// unicode.org
-//
-
-enum ConversionResult
-{
-        conversionOK,           /* conversion successful */
-        sourceExhausted,        /* partial character in source, but hit end */
-        targetExhausted,        /* insuff. room in target for conversion */
-        sourceIllegal           /* source sequence is illegal/malformed */
-};
+// These are wrappers for Unicode's ConvertUTF.h/cpp.
 
-ConversionResult 
+//
+// Convert wstring encoded with UTF-16 or UTF-32 to UTF-8.
+// Returns false if needs for space and true upon success.
+// Throws IllegalConversionException to report error
+//
+bool
 convertUTFWstringToUTF8(const wchar_t*& sourceStart, const wchar_t* sourceEnd, 
-                        IceUtil::Byte*& targetStart, IceUtil::Byte* targetEnd, IceUtil::ConversionFlags flags);
+                        IceUtil::Byte*& targetStart, IceUtil::Byte* targetEnd);
 
-ConversionResult
-convertUTF8ToUTFWstring(const IceUtil::Byte*& sourceStart, const IceUtil::Byte* sourceEnd, 
-                        wchar_t*& targetStart, wchar_t* targetEnd, IceUtil::ConversionFlags flags);
 
-ConversionResult 
+void
 convertUTF8ToUTFWstring(const IceUtil::Byte*& sourceStart, const IceUtil::Byte* sourceEnd, 
-                        std::wstring& target, IceUtil::ConversionFlags flags);
-
+                        std::wstring& target);
 
-ICE_UTIL_API ConversionResult
-convertUTF8ToUTF16(const std::vector<unsigned char>&, std::vector<unsigned short>&,
-                   IceUtil::ConversionFlags);
+void
+convertUTF8ToUTF16(const std::vector<unsigned char>&, std::vector<unsigned short>&);
 
-ICE_UTIL_API ConversionResult
-convertUTF8ToUTF32(const std::vector<unsigned char>&, std::vector<unsigned int>&,
-                   IceUtil::ConversionFlags);
+void
+convertUTF8ToUTF32(const std::vector<unsigned char>&, std::vector<unsigned int>&);
 
-ICE_UTIL_API ConversionResult
-convertUTF32ToUTF8(const std::vector<unsigned int>&, std::vector<unsigned char>&,
-                   IceUtil::ConversionFlags);
+void
+convertUTF32ToUTF8(const std::vector<unsigned int>&, std::vector<unsigned char>&);
 
 }
 
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/UtilException.cpp
index 2966ed42eda..734ae013e9d 100644
--- a/cpp/src/IceUtil/Exception.cpp
+++ b/cpp/src/IceUtil/UtilException.cpp
@@ -20,6 +20,13 @@
 #  endif
 #endif
 
+//
+// For UINTPTR_MAX on Ubuntu Precise
+//
+#ifndef __STDC_LIMIT_MACROS
+#   define __STDC_LIMIT_MACROS
+#endif
+
 #include <IceUtil/Exception.h>
 #include <IceUtil/MutexPtrLock.h>
 #include <IceUtil/Mutex.h>
@@ -28,26 +35,38 @@
 #include <iomanip>
 #include <cstdlib>
 
-
-#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && \
-    !defined(ICE_STATIC_LIBS)
-#  include <execinfo.h>
-#  include <cxxabi.h>
-#  define ICE_GCC_STACK_TRACES
+#ifdef __GNUC__
+#   if defined(ICE_LIBBACKTRACE)
+#       include <backtrace.h>
+#       include <backtrace-supported.h>
+#       if BACKTRACE_SUPPORTED && BACKTRACE_SUPPORTS_THREADS
+#           include <algorithm>
+#           include <cxxabi.h>
+#       else
+            // It's available but we cant' use it - shouldn't happen
+#           undef ICE_LIBBACKTRACE
+#       endif
+#   endif
+
+#   if !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && !defined(ICE_STATIC_LIBS)
+#       include <execinfo.h>
+#       include <cxxabi.h>
+#       include <stdint.h>
+#       define ICE_BACKTRACE
+#   endif
 #endif
 
 #if defined(_WIN32) && !defined(ICE_OS_WINRT) && !defined(__MINGW32__)
-#  define ICE_WIN32_STACK_TRACES
-#  if defined(_MSC_VER) && _MSC_VER >= 1700
-#    define DBGHELP_TRANSLATE_TCHAR
-#    include <IceUtil/StringConverter.h>
-#    if _MSC_VER >= 1900
-#       // VS 2015 RC issues this warning for code in DbgHelp.h
-#       pragma warning(disable:4091)
-#    endif
-#  endif
-#  include <DbgHelp.h>
-#  include <tchar.h>
+#   define ICE_DBGHELP
+#   if defined(_MSC_VER) && (_MSC_VER >= 1700)
+#       define DBGHELP_TRANSLATE_TCHAR
+#       include <IceUtil/StringConverter.h>
+#       if _MSC_VER >= 1900
+#           pragma warning(disable:4091) // VS 2015 RC issues this warning for code in DbgHelp.h
+#       endif
+#   endif
+#   include <DbgHelp.h>
+#   include <tchar.h>
 #endif
 
 using namespace std;
@@ -55,9 +74,31 @@ using namespace std;
 namespace IceUtilInternal
 {
 
-bool ICE_UTIL_API printStackTraces = false;
-bool ICE_UTIL_API nullHandleAbort = false;
+#ifdef NDEBUG
+bool ICE_API printStackTraces = false;
+#else
+bool ICE_API printStackTraces = true;
+#endif
+
+bool ICE_API nullHandleAbort = false;
 
+StackTraceImpl
+stackTraceImpl()
+{
+#if defined(ICE_DBGHELP)
+    return STDbghelp;
+#elif defined(ICE_LIBBACKTRACE)
+#   if defined(ICE_BACKTRACE)
+    return STLibbacktracePlus;
+#   else
+    return STLibbacktrace;
+#   endif
+#elif defined(ICE_BACKTRACE)
+    return STBacktrace;
+#else
+    return STNone;
+#endif
+}
 }
 
 namespace
@@ -65,10 +106,21 @@ namespace
 
 IceUtil::Mutex* globalMutex = 0;
 
-#ifdef ICE_WIN32_STACK_TRACES
+#ifdef ICE_DBGHELP
 HANDLE process = 0;
 #endif
 
+#ifdef ICE_LIBBACKTRACE
+backtrace_state* bstate = 0;
+
+void
+ignoreErrorCallback(void*, const char* msg, int errnum)
+{
+    // cerr << "Error callback: " << msg << ", errnum = " << errnum << endl;
+}
+
+#endif
+
 class Init
 {
 public:
@@ -76,13 +128,18 @@ public:
     Init()
     {
         globalMutex = new IceUtil::Mutex;
+#ifdef ICE_LIBBACKTRACE
+        // Leaked, as libbacktrace does not provide an API to free
+        // this state
+        bstate = backtrace_create_state(0, 1, ignoreErrorCallback, 0);
+#endif
     }
 
     ~Init()
     {
         delete globalMutex;
         globalMutex = 0;
-#ifdef ICE_WIN32_STACK_TRACES
+#ifdef ICE_DBGHELP
         if(process != 0)
         {
             SymCleanup(process);
@@ -94,6 +151,168 @@ public:
 
 Init init;
 
+#if defined(ICE_LIBBACKTRACE) || defined (ICE_BACKTRACE)
+
+struct FrameInfo
+{
+    FrameInfo(int i, uintptr_t p) :
+        index(i),
+        pc(p),
+        fallback(0),
+        setByErrorCb(false)
+    {
+    }
+
+    int index;
+    uintptr_t pc;
+    const char* fallback;
+    bool setByErrorCb;
+    string output;
+};
+
+void
+decode(const string& line, string& function, string& filename)
+{
+    string::size_type openParen = line.find_first_of('(');
+    if(openParen != string::npos)
+    {
+        //
+        // Format: "/opt/Ice/lib/libIceUtil.so.33(_ZN7IceUtil9ExceptionC2EPKci+0x51) [0x73b267]"
+        //
+        string::size_type closeParen = line.find_first_of(')', openParen);
+        if(closeParen != string::npos)
+        {
+            string tmp = line.substr(openParen + 1, closeParen - openParen - 1);
+            string::size_type plus = tmp.find_last_of('+');
+            if(plus != string::npos)
+            {
+                function = tmp.substr(0 , plus);
+                filename = line.substr(0, openParen);
+            }
+        }
+    }
+    else
+    {
+        //
+        // Format: "1    libIce.3.3.1.dylib   0x000933a1 _ZN7IceUtil9ExceptionC2EPKci + 71"
+        //
+        string::size_type plus = line.find_last_of('+');
+        if(plus != string::npos)
+        {
+            string tmp = line.substr(0, plus - 1);
+            string::size_type space = tmp.find_last_of(" \t");
+            if(space != string::npos)
+            {
+                tmp = tmp.substr(space + 1, tmp.size() - space);
+
+                string::size_type start = line.find_first_not_of(" \t", 3);
+                if(start != string::npos)
+                {
+                    string::size_type finish = line.find_first_of(" \t", start);
+                    if(finish != string::npos)
+                    {
+                        function = tmp;
+                        filename = line.substr(start, finish - start);
+                    }
+                }
+            }
+        }
+    }
+}
+
+int
+printFrame(void* data, uintptr_t pc, const char* filename, int lineno, const char* function)
+{
+    FrameInfo& frameInfo = *reinterpret_cast<FrameInfo*>(data);
+
+    ostringstream os;
+    os << setw(3) << frameInfo.index << " ";
+
+    string functionHolder, filenameHolder;
+
+    if(!function && frameInfo.fallback)
+    {
+        // Extract function and filename from fallback
+        decode(frameInfo.fallback, functionHolder, filenameHolder);
+        if(!functionHolder.empty())
+        {
+            function = functionHolder.c_str();
+        }
+        if(!filename && !filenameHolder.empty())
+        {
+            filename = filenameHolder.c_str();
+        }
+    }
+
+    int ret = 0;
+
+    if(function)
+    {
+        char* demangledFunction = abi::__cxa_demangle(function, 0, 0, 0);
+        if(demangledFunction)
+        {
+            os << demangledFunction;
+            free(demangledFunction);
+        }
+        else
+        {
+            os << function;
+        }
+
+        if(filename && lineno > 0)
+        {
+            os << " at " << filename << ":" << lineno;
+        }
+        else if(filename)
+        {
+            os << " in " << filename;
+        }
+    }
+    else if(frameInfo.fallback)
+    {
+        // decode was not able to parse this string
+        os << frameInfo.fallback;
+        ret = 1;
+    }
+    else
+    {
+        os << hex << setw(sizeof(uintptr_t) * 2) << setfill('0') << pc;
+        ret = 2;
+    }
+    os << "\n";
+    frameInfo.output = os.str();
+    return ret;
+}
+#endif
+
+#ifdef ICE_LIBBACKTRACE
+
+void
+handlePcInfoError(void* data, const char* msg, int errnum)
+{
+    // cerr << "pcinfo error callback: " << msg << ", " << errnum << endl;
+
+    FrameInfo& frameInfo = *reinterpret_cast<FrameInfo*>(data);
+    printFrame(&frameInfo, frameInfo.pc, 0, 0, 0);
+    frameInfo.setByErrorCb = true;
+}
+
+
+int
+addFrame(void* sf, uintptr_t pc)
+{
+    if(pc != UINTPTR_MAX)
+    {
+        vector<void*>* stackFrames = reinterpret_cast<vector<void*>*>(sf);
+        stackFrames->push_back(reinterpret_cast<void*>(pc));
+        return 0;
+    }
+    else
+    {
+        return 1;
+    }
+}
+#endif
 
 vector<void*>
 getStackFrames()
@@ -105,7 +324,7 @@ getStackFrames()
         return stackFrames;
     }
 
-#  if defined(ICE_WIN32_STACK_TRACES)
+#if defined(ICE_DBGHELP)
 
     stackFrames.resize(61);
     //
@@ -116,13 +335,20 @@ getStackFrames()
 
     stackFrames.resize(frameCount);
 
-#  elif defined(ICE_GCC_STACK_TRACES)
-    
+#elif defined(ICE_LIBBACKTRACE)
+
+    backtrace_simple(bstate, 1, addFrame, ignoreErrorCallback, &stackFrames);
+
+#elif defined(ICE_BACKTRACE)
+
     stackFrames.resize(100);
     size_t stackDepth = backtrace(&stackFrames.front(), stackFrames.size());
     stackFrames.resize(stackDepth);
-
-#  endif
+    if(!stackFrames.empty())
+    {
+        stackFrames.erase(stackFrames.begin()); // drop the first frame
+    }
+#endif
 
     return stackFrames;
 }
@@ -138,7 +364,7 @@ getStackTrace(const vector<void*>& stackFrames)
 
     string stackTrace;
 
-#  if defined(ICE_WIN32_STACK_TRACES)
+#if defined(ICE_DBGHELP)
 
     //
     // Note: the Sym functions are not thread-safe
@@ -216,38 +442,33 @@ getStackTrace(const vector<void*>& stackFrames)
     static_assert(sizeof(TCHAR) == sizeof(wchar_t), "Bad TCHAR - should be wchar_t");
 #   else
     static_assert(sizeof(TCHAR) == sizeof(char), "Bad TCHAR - should be char");
-#  endif
+#   endif
 #endif
 
     char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)];
-    
+
     SYMBOL_INFO* symbol = reinterpret_cast<SYMBOL_INFO*>(buffer);
     symbol->SizeOfStruct = sizeof(SYMBOL_INFO);
     symbol->MaxNameLen = MAX_SYM_NAME;
-    
+
     IMAGEHLP_LINE64 line = {};
     line.SizeOfStruct = sizeof(IMAGEHLP_LINE64);
     DWORD displacement = 0;
-    
+
     lock.acquire();
-    
+
     // TODO: call SymRefreshModuleList here? (not available on XP)
-    
+
 #ifdef DBGHELP_TRANSLATE_TCHAR
     const IceUtil::StringConverterPtr converter = IceUtil::getProcessStringConverter();
 #endif
     for(size_t i = 0; i < stackFrames.size(); i++)
     {
-        if(!stackTrace.empty())
-        {
-            stackTrace += "\n";
-        }
-        
-        stringstream s;
+        ostringstream s;
         s << setw(3) << i << " ";
-        
+
         DWORD64 address = reinterpret_cast<DWORD64>(stackFrames[i]);
-        
+
         BOOL ok = SymFromAddr(process, address, 0, symbol);
         if(ok)
         {
@@ -259,165 +480,109 @@ getStackTrace(const vector<void*>& stackFrames)
             ok = SymGetLineFromAddr64(process, address, &displacement, &line);
             if(ok)
             {
-                s << " at line " << line.LineNumber << " in "
+                s << " at "
 #ifdef DBGHELP_TRANSLATE_TCHAR
-                  << IceUtil::wstringToString(line.FileName, converter);
+                  << IceUtil::wstringToString(line.FileName, converter)
 #else
-                  << line.FileName;
+                  << line.FileName
 #endif
+                  << ":" << line.LineNumber;
             }
         }
         else
         {
-            s << hex << "0x" << address;
+            s << hex << setw(sizeof(DWORD64) * 2) << setfill('0') << address;
         }
+        s << "\n";
         stackTrace += s.str();
     }
     lock.release();
 
-#  elif defined(ICE_GCC_STACK_TRACES)
+#elif defined(ICE_LIBBACKTRACE) || defined (ICE_BACKTRACE)
+
+    vector<void*>::const_iterator p = stackFrames.begin();
+    int frameIndex = 0;
+    int offset = 0;
+    char** backtraceStrings = 0;
 
-    // With some compilers/toolchains this can fail so we must check that
-    // stackStrings is not null.
-    
-    char** stackStrings = backtrace_symbols(&stackFrames.front(), stackFrames.size());
-    if(stackStrings != 0)
+#   if defined(ICE_LIBBACKTRACE) && defined(ICE_BACKTRACE)
+    bool backtraceStringsInitialized = false;
+#   endif
+#   if !defined(ICE_LIBBACKTRACE)
+    // Initialize backtraceStrings immediately
+    if(p != stackFrames.end())
     {
-        //
-        // Start at 1 to skip the top frame (== call to this function)
-        //
-        for(size_t i = 1; i < stackFrames.size(); i++)
-        {
-            string line(stackStrings[i]);
+        backtraceStrings = backtrace_symbols(&*p, stackFrames.size());
+    }
+#   endif
 
-            if(i > 1)
-            {
-                stackTrace += "\n";
-            }
+    do
+    {
+        FrameInfo frameInfo(frameIndex, reinterpret_cast<uintptr_t>(*p));
+        bool retry = false;
 
-            stringstream s;
-            s << setw(3) << i - 1 << " ";
-
-            //
-            // For each line attempt to parse the mangled function name as well
-            // as the source library/executable.
-            //
-            string mangled;
-            string source;
-            string::size_type openParen = line.find_first_of('(');
-            if(openParen != string::npos)
-            {
-                //
-                // Format: "/opt/Ice/lib/libIceUtil.so.33(_ZN7IceUtil9ExceptionC2EPKci+0x51) [0x73b267]"
-                //
-                string::size_type closeParen = line.find_first_of(')', openParen);
-                if(closeParen != string::npos)
-                {
-                    string tmp = line.substr(openParen + 1, closeParen - openParen - 1);
-                    string::size_type plus = tmp.find_last_of('+');
-                    if(plus != string::npos)
-                    {
-                        mangled = tmp.substr(0 , plus);
+        if(backtraceStrings)
+        {
+            frameInfo.fallback = backtraceStrings[frameIndex - offset];
+        }
 
-                        source = line.substr(0, openParen);
-                    }
-                }
-            }
-            else
-            {
-                //
-                // Format: "1    libIce.3.3.1.dylib   0x000933a1 _ZN7IceUtil9ExceptionC2EPKci + 71"
-                //
-                string::size_type plus = line.find_last_of('+');
-                if(plus != string::npos)
-                {
-                    string tmp = line.substr(0, plus - 1);
-                    string::size_type space = tmp.find_last_of(" \t");
-                    if(space != string::npos)
-                    {
-                        tmp = tmp.substr(space + 1, tmp.size() - space);
-
-                        string::size_type start = line.find_first_not_of(" \t", 3);
-                        if(start != string::npos)
-                        {
-                            string::size_type finish = line.find_first_of(" \t", start);
-                            if(finish != string::npos)
-                            {
-                                mangled = tmp;
-
-                                source = line.substr(start, finish - start);
-                            }
-                        }
-                    }
-                }
-            }
-            if(mangled.size() != 0)
-            {
-                //
-                // Unmangle the function name
-                //
-                int status;
-                char* unmangled = abi::__cxa_demangle(mangled.c_str(), 0, 0, &status);
-                if(unmangled)
-                {
-                    s << unmangled;
-                    free(unmangled);
-                }
-                else
-                {
-                    s << mangled << "()";
-                }
+#   if defined(ICE_LIBBACKTRACE)
+        bool ok = backtrace_pcinfo(bstate, frameInfo.pc, printFrame, handlePcInfoError, &frameInfo) == 0;
 
-                if(!source.empty())
-                {
-                    s << " in " << source;
-                }
-            }
-            else
+        // When error callback is called, pcinfo returns 0
+        if(!ok || frameInfo.setByErrorCb)
+        {
+#       if defined(ICE_BACKTRACE)
+            if(!backtraceStringsInitialized)
             {
-                s << line;
+                offset = frameIndex;
+                // Initialize backtraceStrings as fallback
+                backtraceStrings = backtrace_symbols(&*p, stackFrames.size() - offset);
+                backtraceStringsInitialized = true;
+                retry = true;
             }
-
-            stackTrace += s.str();
+#       endif
         }
-        free(stackStrings);
-    }
-    else
+#   else // not using libbacktrace:
+        printFrame(&frameInfo, frameInfo.pc, 0, 0, 0);
+#   endif
+        if(!retry)
+        {
+            stackTrace += frameInfo.output;
+            ++p;
+            ++frameIndex;
+        }
+    } while(p != stackFrames.end());
+
+    if(backtraceStrings)
     {
-        stackTrace = "<stack trace unavailable>";
+        free(backtraceStrings);
     }
 
-#  endif
-
+#endif
     return stackTrace;
 }
 }
 
 IceUtil::Exception::Exception() :
     _file(0),
-    _line(0), 
+    _line(0),
     _stackFrames(getStackFrames())
 {
 }
 
 IceUtil::Exception::Exception(const char* file, int line) :
     _file(file),
-    _line(line), 
+    _line(line),
     _stackFrames(getStackFrames())
 {
 }
 
+#ifndef ICE_CPP11_COMPILER
 IceUtil::Exception::~Exception() throw()
 {
 }
-
-const char* IceUtil::Exception::_name = "IceUtil::Exception";
-
-string
-IceUtil::Exception::ice_name() const
-{
-    return _name;
-}
+#endif
 
 void
 IceUtil::Exception::ice_print(ostream& out) const
@@ -426,11 +591,11 @@ IceUtil::Exception::ice_print(ostream& out) const
     {
         out << _file << ':' << _line << ": ";
     }
-    out << ice_name();
+    out << ice_id();
 }
 
 const char*
-IceUtil::Exception::what() const throw()
+IceUtil::Exception::what() const ICE_NOEXCEPT
 {
     try
     {
@@ -451,17 +616,29 @@ IceUtil::Exception::what() const throw()
     return "";
 }
 
-IceUtil::Exception*
+#ifdef ICE_CPP11_MAPPING
+exception_ptr
 IceUtil::Exception::ice_clone() const
 {
-    return new Exception(*this);
+    try
+    {
+        ice_throw();
+    }
+    catch(...)
+    {
+        return current_exception();
+    }
+    assert(false);
+    return nullptr; // Make compilers happy
 }
+#else
 
-void
-IceUtil::Exception::ice_throw() const
+string
+IceUtil::Exception::ice_name() const
 {
-    throw *this;
+    return ice_id().substr(2);
 }
+#endif
 
 const char*
 IceUtil::Exception::ice_file() const
@@ -497,23 +674,25 @@ IceUtil::NullHandleException::NullHandleException(const char* file, int line) :
     }
 }
 
+#ifndef ICE_CPP11_COMPILER
 IceUtil::NullHandleException::~NullHandleException() throw()
 {
 }
-
-const char* IceUtil::NullHandleException::_name = "IceUtil::NullHandleException";
+#endif
 
 string
-IceUtil::NullHandleException::ice_name() const
+IceUtil::NullHandleException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::NullHandleException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::NullHandleException*
 IceUtil::NullHandleException::ice_clone() const
 {
     return new NullHandleException(*this);
 }
+#endif
 
 void
 IceUtil::NullHandleException::ice_throw() const
@@ -532,17 +711,11 @@ IceUtil::IllegalArgumentException::IllegalArgumentException(const char* file, in
 {
 }
 
+#ifndef ICE_CPP11_COMPILER
 IceUtil::IllegalArgumentException::~IllegalArgumentException() throw()
 {
 }
-
-const char* IceUtil::IllegalArgumentException::_name = "IceUtil::IllegalArgumentException";
-
-string
-IceUtil::IllegalArgumentException::ice_name() const
-{
-    return _name;
-}
+#endif
 
 void
 IceUtil::IllegalArgumentException::ice_print(ostream& out) const
@@ -551,11 +724,19 @@ IceUtil::IllegalArgumentException::ice_print(ostream& out) const
     out << ": " << _reason;
 }
 
+string
+IceUtil::IllegalArgumentException::ice_id() const
+{
+    return "::IceUtil::IllegalArgumentException";
+}
+
+#ifndef ICE_CPP11_MAPPING
 IceUtil::IllegalArgumentException*
 IceUtil::IllegalArgumentException::ice_clone() const
 {
     return new IllegalArgumentException(*this);
 }
+#endif
 
 void
 IceUtil::IllegalArgumentException::ice_throw() const
@@ -572,9 +753,6 @@ IceUtil::IllegalArgumentException::reason() const
 //
 // IllegalConversionException
 //
-
-const char* IceUtil::IllegalConversionException::_name = "IceUtil::IllegalConversionException";
-
 IceUtil::IllegalConversionException::IllegalConversionException(const char* file, int line):
     Exception(file, line)
 {}
@@ -585,14 +763,11 @@ IceUtil::IllegalConversionException::IllegalConversionException(const char* file
     _reason(reason)
 {}
 
+#ifndef ICE_CPP11_COMPILER
 IceUtil::IllegalConversionException::~IllegalConversionException() throw()
-{}
-
-string
-IceUtil::IllegalConversionException::ice_name() const
 {
-    return _name;
 }
+#endif
 
 void
 IceUtil::IllegalConversionException::ice_print(ostream& out) const
@@ -602,11 +777,19 @@ IceUtil::IllegalConversionException::ice_print(ostream& out) const
 
 }
 
+string
+IceUtil::IllegalConversionException::ice_id() const
+{
+    return "::IceUtil::IllegalConversionException";
+}
+
+#ifndef ICE_CPP11_MAPPING
 IceUtil::IllegalConversionException*
 IceUtil::IllegalConversionException::ice_clone() const
 {
     return new IllegalConversionException(*this);
 }
+#endif
 
 void
 IceUtil::IllegalConversionException::ice_throw() const
@@ -628,14 +811,6 @@ IceUtil::SyscallException::SyscallException(const char* file, int line, int err
 {
 }
 
-const char* IceUtil::SyscallException::_name = "IceUtil::SyscallException";
-
-string
-IceUtil::SyscallException::ice_name() const
-{
-    return _name;
-}
-
 void
 IceUtil::SyscallException::ice_print(ostream& os) const
 {
@@ -646,11 +821,19 @@ IceUtil::SyscallException::ice_print(ostream& os) const
     }
 }
 
+string
+IceUtil::SyscallException::ice_id() const
+{
+    return "::IceUtil::SyscallException";
+}
+
+#ifndef ICE_CPP11_MAPPING
 IceUtil::SyscallException*
 IceUtil::SyscallException::ice_clone() const
 {
     return new SyscallException(*this);
 }
+#endif
 
 void
 IceUtil::SyscallException::ice_throw() const
@@ -672,17 +855,11 @@ IceUtil::FileLockException::FileLockException(const char* file, int line, int er
 {
 }
 
+#ifndef ICE_CPP11_COMPILER
 IceUtil::FileLockException::~FileLockException() throw()
 {
 }
-
-const char* IceUtil::FileLockException::_name = "IceUtil::FileLockedException";
-
-string
-IceUtil::FileLockException::ice_name() const
-{
-    return _name;
-}
+#endif
 
 void
 IceUtil::FileLockException::ice_print(ostream& os) const
@@ -695,11 +872,19 @@ IceUtil::FileLockException::ice_print(ostream& os) const
     }
 }
 
+string
+IceUtil::FileLockException::ice_id() const
+{
+    return "::IceUtil::FileLockException";
+}
+
+#ifndef ICE_CPP11_MAPPING
 IceUtil::FileLockException*
 IceUtil::FileLockException::ice_clone() const
 {
     return new FileLockException(*this);
 }
+#endif
 
 void
 IceUtil::FileLockException::ice_throw() const
@@ -722,23 +907,25 @@ IceUtil::OptionalNotSetException::OptionalNotSetException(const char* file, int
     }
 }
 
+#ifndef ICE_CPP11_COMPILER
 IceUtil::OptionalNotSetException::~OptionalNotSetException() throw()
 {
 }
-
-const char* IceUtil::OptionalNotSetException::_name = "IceUtil::OptionalNotSetException";
+#endif
 
 string
-IceUtil::OptionalNotSetException::ice_name() const
+IceUtil::OptionalNotSetException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::OptionalNotSetException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::OptionalNotSetException*
 IceUtil::OptionalNotSetException::ice_clone() const
 {
     return new OptionalNotSetException(*this);
 }
+#endif
 
 void
 IceUtil::OptionalNotSetException::ice_throw() const
@@ -753,17 +940,11 @@ IceUtil::IconvInitializationException::IconvInitializationException(const char*
 {
 }
 
+#ifndef ICE_CPP11_COMPILER
 IceUtil::IconvInitializationException::~IconvInitializationException() throw()
 {
 }
-
-const char* IceUtil::IconvInitializationException::_name = "IceUtil::IconvInitializationException";
-
-string
-IceUtil::IconvInitializationException::ice_name() const
-{
-    return _name;
-}
+#endif
 
 void
 IceUtil::IconvInitializationException::ice_print(ostream& out) const
@@ -772,11 +953,19 @@ IceUtil::IconvInitializationException::ice_print(ostream& out) const
     out << ": " << _reason;
 }
 
+string
+IceUtil::IconvInitializationException::ice_id() const
+{
+    return "::IceUtil::IconvInitializationException";
+}
+
+#ifndef ICE_CPP11_MAPPING
 IceUtil::IconvInitializationException*
 IceUtil::IconvInitializationException::ice_clone() const
 {
     return new IconvInitializationException(*this);
 }
+#endif
 
 void
 IceUtil::IconvInitializationException::ice_throw() const
diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
new file mode 100644
index 00000000000..320b34b7f10
--- /dev/null
+++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4D1A5110-3176-44BA-8BBB-57BF56519B9F}</ProjectGuid>
+    <RootNamespace>IceUtil</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\CtrlCHandler.cpp" />
+    <ClCompile Include="..\..\OutputUtil.cpp" />
+    <ClCompile Include="..\..\RecMutex.cpp" />
+    <ClCompile Include="..\..\StringConverter.cpp" />
+    <ClCompile Include="..\..\ThreadException.cpp" />
+    <ClCompile Include="..\..\Time.cpp" />
+    <ClCompile Include="..\..\UtilException.cpp" />
+    <ClCompile Include="..\..\FileUtil.cpp" />
+    <ClCompile Include="..\..\InputUtil.cpp" />
+    <ClCompile Include="..\..\Options.cpp" />
+    <ClCompile Include="..\..\Random.cpp" />
+    <ClCompile Include="..\..\Shared.cpp" />
+    <ClCompile Include="..\..\StringUtil.cpp" />
+    <ClCompile Include="..\..\UUID.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Config.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Options.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Random.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Time.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h" />
+    <ClInclude Include="..\..\ArgVector.h" />
+    <ClInclude Include="..\..\StopWatch.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters
new file mode 100644
index 00000000000..553d622f4d9
--- /dev/null
+++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{ED03E3E4-C50D-4FE0-9F5A-53834B8A5FBE}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{B8DEA2A2-85A6-4081-9E3D-3636F2BDEAE8}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{FA20320F-747C-4806-8AE9-35F73C2C002D}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\CtrlCHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UtilException.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FileUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\InputUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Options.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Random.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Shared.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\StringUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UUID.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\OutputUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RecMutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThreadException.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\StringConverter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Options.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Random.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ArgVector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\StopWatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
diff --git a/cpp/src/IceUtil/winrt/.depend.mak b/cpp/src/IceUtil/winrt/.depend.mak
deleted file mode 100755
index c128cb16238..00000000000
--- a/cpp/src/IceUtil/winrt/.depend.mak
+++ /dev/null
@@ -1,217 +0,0 @@
-
-$(ARCH)\$(CONFIG)\ArgVector.obj: \
-	..\ArgVector.cpp \
-    "..\..\..\src\IceUtil\ArgVector.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-$(ARCH)\$(CONFIG)\Cond.obj: \
-	..\Cond.cpp \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-
-$(ARCH)\$(CONFIG)\ConvertUTF.obj: \
-	..\ConvertUTF.cpp \
-    "..\..\..\src\IceUtil\ConvertUTF.h" \
-    "..\..\..\src\IceUtil\Unicode.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-
-$(ARCH)\$(CONFIG)\CountDownLatch.obj: \
-	..\CountDownLatch.cpp \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-
-$(ARCH)\$(CONFIG)\Exception.obj: \
-	..\Exception.cpp \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\FileUtil.obj: \
-	..\FileUtil.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "..\..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-
-$(ARCH)\$(CONFIG)\InputUtil.obj: \
-	..\InputUtil.cpp \
-    "$(includedir)\IceUtil\InputUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-$(ARCH)\$(CONFIG)\MutexProtocol.obj: \
-	..\MutexProtocol.cpp \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-$(ARCH)\$(CONFIG)\Options.obj: \
-	..\Options.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\OutputUtil.obj: \
-	..\OutputUtil.cpp \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "..\..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-
-$(ARCH)\$(CONFIG)\Random.obj: \
-	..\Random.cpp \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-
-$(ARCH)\$(CONFIG)\RecMutex.obj: \
-	..\RecMutex.cpp \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-
-$(ARCH)\$(CONFIG)\SHA1.obj: \
-	..\SHA1.cpp \
-    "$(includedir)\IceUtil\SHA1.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-
-$(ARCH)\$(CONFIG)\Shared.obj: \
-	..\Shared.cpp \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-
-$(ARCH)\$(CONFIG)\StringConverter.obj: \
-	..\StringConverter.cpp \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\..\src\IceUtil\Unicode.h" \
-
-$(ARCH)\$(CONFIG)\StringUtil.obj: \
-	..\StringUtil.cpp \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-
-$(ARCH)\$(CONFIG)\Thread.obj: \
-	..\Thread.cpp \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-
-$(ARCH)\$(CONFIG)\ThreadException.obj: \
-	..\ThreadException.cpp \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Time.h" \
-
-$(ARCH)\$(CONFIG)\Time.obj: \
-	..\Time.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Time.h" \
-
-$(ARCH)\$(CONFIG)\Timer.obj: \
-	..\Timer.cpp \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-
-$(ARCH)\$(CONFIG)\Unicode.obj: \
-	..\Unicode.cpp \
-    "..\..\..\src\IceUtil\Unicode.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "..\..\..\src\IceUtil\ConvertUTF.h" \
-
-$(ARCH)\$(CONFIG)\UUID.obj: \
-	..\UUID.cpp \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\Exception.h" \
diff --git a/cpp/src/IceUtil/winrt/Makefile.mak b/cpp/src/IceUtil/winrt/Makefile.mak
deleted file mode 100644
index 066424188e3..00000000000
--- a/cpp/src/IceUtil/winrt/Makefile.mak
+++ /dev/null
@@ -1,61 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-LIBNAME		= $(SDK_LIBRARY_PATH)\iceutil.lib
-TARGETS		= $(LIBNAME)
-SOURCE_DIR	= ..
-
-TARGETS		= $(LIBNAME)
-
-OBJS		= $(ARCH)\$(CONFIG)\ArgVector.obj \
-		  $(ARCH)\$(CONFIG)\Cond.obj \
-		  $(ARCH)\$(CONFIG)\ConvertUTF.obj \
-		  $(ARCH)\$(CONFIG)\CountDownLatch.obj \
-		  $(ARCH)\$(CONFIG)\Exception.obj \
-		  $(ARCH)\$(CONFIG)\FileUtil.obj \
-		  $(ARCH)\$(CONFIG)\InputUtil.obj \
-		  $(ARCH)\$(CONFIG)\MutexProtocol.obj \
-		  $(ARCH)\$(CONFIG)\Options.obj \
-		  $(ARCH)\$(CONFIG)\OutputUtil.obj \
-		  $(ARCH)\$(CONFIG)\Random.obj \
-		  $(ARCH)\$(CONFIG)\RecMutex.obj \
-		  $(ARCH)\$(CONFIG)\SHA1.obj \
-		  $(ARCH)\$(CONFIG)\Shared.obj \
-		  $(ARCH)\$(CONFIG)\StringConverter.obj \
-		  $(ARCH)\$(CONFIG)\StringUtil.obj \
-		  $(ARCH)\$(CONFIG)\Thread.obj \
-		  $(ARCH)\$(CONFIG)\ThreadException.obj \
-		  $(ARCH)\$(CONFIG)\Time.obj \
-		  $(ARCH)\$(CONFIG)\Timer.obj \
-		  $(ARCH)\$(CONFIG)\Unicode.obj \
-		  $(ARCH)\$(CONFIG)\UUID.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-SRCS		= $(SRCS:x86\=)
-SRCS		= $(SRCS:x64\=)
-SRCS		= $(SRCS:arm\=)
-SRCS		= $(SRCS:Retail\=..\)
-SRCS		= $(SRCS:Debug\=..\)
-
-PDBNAME		= $(LIBNAME:.lib=.pdb)
-CPPFLAGS        = /Fd$(PDBNAME) $(CPPFLAGS) -I..\..\ -DICE_BUILDING_ICEUTIL -DWIN32_LEAN_AND_MEAN
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-
-$(LIBNAME): $(OBJS) sdks
-	$(AR) $(ARFLAGS) $(OBJS) /out:$(LIBNAME)
-
-clean::
-	-del /q $(ARCH)\$(CONFIG)\*.obj
-	-del /q $(PDBNAME)
-
-install:: all
-
diff --git a/cpp/src/IceXML/.depend.mak b/cpp/src/IceXML/.depend.mak
deleted file mode 100755
index 3d66f0fd053..00000000000
--- a/cpp/src/IceXML/.depend.mak
+++ /dev/null
@@ -1,10 +0,0 @@
-
-Parser.obj: \
-	Parser.cpp \
-    "Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
diff --git a/cpp/src/IceXML/.gitignore b/cpp/src/IceXML/.gitignore
deleted file mode 100644
index 720f44c7047..00000000000
--- a/cpp/src/IceXML/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
diff --git a/cpp/src/IceXML/IceXML.rc b/cpp/src/IceXML/IceXML.rc
index 644c1df9e73..20b79898db4 100644
--- a/cpp/src/IceXML/IceXML.rc
+++ b/cpp/src/IceXML/IceXML.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icexml36d\0"
- #define ORIGINALFILENAME "icexml36d.dll\0"
+ #define INTERNALNAME "icexml37a2d\0"
+ #define ORIGINALFILENAME "icexml37a2d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icexml36\0"
- #define ORIGINALFILENAME "icexml36.dll\0"
+ #define INTERNALNAME "icexml37a2\0"
+ #define ORIGINALFILENAME "icexml37a2.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceXML C++ Library\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceXML/Makefile b/cpp/src/IceXML/Makefile
deleted file mode 100644
index 6378e47c360..00000000000
--- a/cpp/src/IceXML/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME     = $(call mklibfilename,IceXML,$(VERSION))
-SONAME          = $(call mksoname,IceXML,$(SOVERSION))
-LIBNAME		= $(call mklibname,IceXML)
-
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-
-OBJS		= Parser.o
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I.. $(CPPFLAGS) -DICE_XML_API_EXPORTS $(EXPAT_FLAGS)
-
-LINKWITH        := -lIceUtil $(EXPAT_LIBS)
-
-$(libdir)/$(LIBFILENAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	@mkdir -p $(libdir)$(cpp11libdirsuffix)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak
deleted file mode 100644
index af4e4167b2d..00000000000
--- a/cpp/src/IceXML/Makefile.mak
+++ /dev/null
@@ -1,59 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME		= $(top_srcdir)\lib\icexml$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icexml$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-OBJS		= .\Parser.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-$(OBJS)		: $(EXPAT_NUPKG)
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DICE_XML_API_EXPORTS -DWIN32_LEAN_AND_MEAN $(EXPAT_CPPFLAGS)
-
-LINKWITH        = $(EXPAT_LIBS) $(BASELIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = IceXML.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceXML.res
-	$(LINK) $(BASE):0x23000000 $(LD_DLLFLAGS) $(EXPAT_LDFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	-del /q IceXML.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/IceXML/Makefile.mk b/cpp/src/IceXML/Makefile.mk
new file mode 100644
index 00000000000..9ae2b289624
--- /dev/null
+++ b/cpp/src/IceXML/Makefile.mk
@@ -0,0 +1,17 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries	:= IceXML
+
+IceXML_targetdir	:= $(libdir)
+IceXML_dependencies	:= Ice
+IceXML_cppflags  	:= -DICE_XML_API_EXPORTS
+IceXML_libs 		:= expat
+
+projects += $(project)
diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp
index 0097ed0a352..5cae7178956 100644
--- a/cpp/src/IceXML/Parser.cpp
+++ b/cpp/src/IceXML/Parser.cpp
@@ -28,16 +28,16 @@ IceXML::ParserException::ParserException(const char* file, int line, const strin
 {
 }
 
+#ifndef ICE_CPP11_COMPILER
 IceXML::ParserException::~ParserException() throw()
 {
 }
-
-const char* IceXML::ParserException::_name = "IceXML::ParserException";
+#endif
 
 string
-IceXML::ParserException::ice_name() const
+IceXML::ParserException::ice_id() const
 {
-    return _name;
+    return "::IceXML::ParserException";
 }
 
 void
@@ -54,11 +54,13 @@ IceXML::ParserException::ice_print(std::ostream& out) const
     }
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceXML::ParserException*
 IceXML::ParserException::ice_clone() const
 {
     return new ParserException(*this);
 }
+#endif
 
 void
 IceXML::ParserException::ice_throw() const
@@ -126,6 +128,12 @@ IceXML::Node::addChild(const NodePtr&)
     return false;
 }
 
+void
+IceXML::Node::destroy()
+{
+    _parent = 0;
+}
+
 int
 IceXML::Node::getLine() const
 {
@@ -181,6 +189,16 @@ IceXML::Element::addChild(const NodePtr& child)
     return true;
 }
 
+void
+IceXML::Element::destroy()
+{
+    Node::destroy();
+    for(NodeList::iterator p = _children.begin(); p != _children.end(); ++p)
+    {
+        (*p)->destroy();
+    }
+}
+
 //
 // Text
 //
@@ -218,6 +236,16 @@ IceXML::Document::addChild(const NodePtr& child)
     return true;
 }
 
+void
+IceXML::Document::destroy()
+{
+    Node::destroy();
+    for(NodeList::iterator p = _children.begin(); p != _children.end(); ++p)
+    {
+        (*p)->destroy();
+    }
+}
+
 //
 // Handler
 //
@@ -242,6 +270,7 @@ namespace IceXML
 class DocumentBuilder : public Handler
 {
 public:
+
     DocumentBuilder();
 
     virtual void startElement(const string&, const Attributes&, int, int);
@@ -251,6 +280,7 @@ public:
     DocumentPtr getDocument() const;
 
 private:
+
     list<NodePtr> _nodeStack;
     DocumentPtr _document;
 };
@@ -405,7 +435,7 @@ IceXML::Parser::parse(istream& in, Handler& handler)
             }
             if(XML_Parse(parser, buff, static_cast<int>(in.gcount()), isFinal) != 1)
             {
-                handler.error(XML_ErrorString(XML_GetErrorCode(parser)), 
+                handler.error(XML_ErrorString(XML_GetErrorCode(parser)),
                               static_cast<int>(XML_GetCurrentLineNumber(parser)),
                               static_cast<int>(XML_GetCurrentColumnNumber(parser)));
                 return;
diff --git a/cpp/src/IceXML/Parser.h b/cpp/src/IceXML/Parser.h
index b944e60c2b2..b44b3cac897 100644
--- a/cpp/src/IceXML/Parser.h
+++ b/cpp/src/IceXML/Parser.h
@@ -18,31 +18,25 @@
 #include <map>
 
 #ifndef ICE_XML_API
-#   ifdef ICE_XML_API_EXPORTS
-#       define ICE_XML_API ICE_DECLSPEC_EXPORT
-#    elif defined(ICE_STATIC_LIBS)
+#    if defined(ICE_STATIC_LIBS)
 #       define ICE_XML_API /**/
+#    elif defined(ICE_XML_API_EXPORTS)
+#       define ICE_XML_API ICE_DECLSPEC_EXPORT
 #    else
 #       define ICE_XML_API ICE_DECLSPEC_IMPORT
 #    endif
 #endif
 
 //
-// Automatically link IceXML[D].lib with Visual C++
+// Automatically link IceXML[D|++11|++11D].lib with Visual C++
 //
 
 #if !defined(ICE_BUILDING_ICE_XML) && defined(ICE_XML_API_EXPORTS)
 #   define ICE_BUILDING_ICE_XML
 #endif
 
-#ifdef _MSC_VER
-#   if !defined(ICE_BUILDING_ICE_XML)
-#      if defined(_DEBUG) && !defined(ICE_OS_WINRT)
-#          pragma comment(lib, "IceXMLD.lib")
-#      else
-#          pragma comment(lib, "IceXML.lib")
-#      endif
-#   endif
+#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICE_XML)
+#   pragma comment(lib, ICE_LIBNAME("IceXML"))
 #endif
 
 namespace IceXML
@@ -54,11 +48,15 @@ public:
 
     ParserException(const std::string&);
     ParserException(const char*, int, const std::string&);
+#ifndef ICE_CPP11_COMPILER
     virtual ~ParserException() throw();
+#endif
 
-    virtual std::string ice_name() const;
+    virtual std::string ice_id() const;
     virtual void ice_print(std::ostream&) const;
+#ifndef ICE_CPP11_MAPPING
     virtual ParserException* ice_clone() const;
+#endif
     virtual void ice_throw() const;
 
     std::string reason() const;
@@ -88,6 +86,7 @@ typedef std::map<std::string, std::string> Attributes;
 class ICE_XML_API Node : public IceUtil::Shared
 {
 public:
+
     virtual ~Node();
 
     virtual NodePtr getParent() const;
@@ -99,10 +98,13 @@ public:
 
     virtual bool addChild(const NodePtr&);
 
+    virtual void destroy();
+
     int getLine() const;
     int getColumn() const;
 
 protected:
+
     Node(const NodePtr&, const std::string&, const std::string&, int, int);
 
     NodePtr _parent;
@@ -115,6 +117,7 @@ protected:
 class ICE_XML_API Element : public Node
 {
 public:
+
     Element(const NodePtr&, const std::string&, const Attributes&, int, int);
     virtual ~Element();
 
@@ -124,7 +127,10 @@ public:
 
     virtual bool addChild(const NodePtr&);
 
+    virtual void destroy();
+
 private:
+
     NodeList _children;
     Attributes _attributes;
 };
@@ -132,6 +138,7 @@ private:
 class ICE_XML_API Text : public Node
 {
 public:
+
     Text(const NodePtr&, const std::string&, int, int);
     virtual ~Text();
 };
@@ -139,6 +146,7 @@ public:
 class ICE_XML_API Document : public Node
 {
 public:
+
     Document();
     virtual ~Document();
 
@@ -146,13 +154,17 @@ public:
 
     virtual bool addChild(const NodePtr&);
 
+    virtual void destroy();
+
 private:
+
     NodeList _children;
 };
 
 class ICE_XML_API Handler
 {
 public:
+
     virtual ~Handler();
 
     virtual void startElement(const std::string&, const Attributes&, int, int) = 0;
diff --git a/cpp/src/IceXML/msbuild/icexml.vcxproj b/cpp/src/IceXML/msbuild/icexml.vcxproj
new file mode 100644
index 00000000000..7c750030c2c
--- /dev/null
+++ b/cpp/src/IceXML/msbuild/icexml.vcxproj
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{90EC26E8-AFFA-4E44-B068-AB5849A96FDD}</ProjectGuid>
+    <RootNamespace>IceXML</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_XML_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_XML_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_XML_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_XML_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\IceXML.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Parser.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Parser.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\msbuild\packages\expat.v120.2.1.0.3\build\native\expat.v120.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v120.2.1.0.3\build\native\expat.v120.targets')" />
+    <Import Project="..\..\..\msbuild\packages\expat.v140.2.1.0.3\build\native\expat.v140.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v140.2.1.0.3\build\native\expat.v140.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v120.2.1.0.3\build\native\expat.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v120.2.1.0.3\build\native\expat.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v140.2.1.0.3\build\native\expat.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v140.2.1.0.3\build\native\expat.v140.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceXML/msbuild/icexml.vcxproj.filters b/cpp/src/IceXML/msbuild/icexml.vcxproj.filters
new file mode 100644
index 00000000000..966b3af508d
--- /dev/null
+++ b/cpp/src/IceXML/msbuild/icexml.vcxproj.filters
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{B2CAEB3D-292E-4D15-BE8D-81752E1216EE}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{E314B504-D1B6-4103-802C-33965B372BB3}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{29D7A229-D89B-4362-9692-F740D841B87F}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\IceXML.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Parser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceXML/msbuild/packages.config b/cpp/src/IceXML/msbuild/packages.config
new file mode 100644
index 00000000000..fc686ae7bbf
--- /dev/null
+++ b/cpp/src/IceXML/msbuild/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="expat.v120" version="2.1.0.3" targetFramework="native" />
+  <package id="expat.v140" version="2.1.0.3" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/cpp/src/Makefile b/cpp/src/Makefile
deleted file mode 100644
index d398011aa5a..00000000000
--- a/cpp/src/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..
-
-include $(top_srcdir)/config/Make.rules
-
-ifneq ($(findstring MINGW,$(UNAME)),)
-    SUBDIRS	= IceUtil \
-		  Slice \
-		  slice2cpp \
-		  Ice \
-		  IceSSL \
-		  IceDiscovery \
-		  IceLocatorDiscovery
-else
-    SUBDIRS	= IceUtil \
-		  Slice \
-		  slice2cpp \
-		  slice2cs \
-		  slice2freeze \
-		  slice2freezej \
-		  slice2java \
-		  slice2php \
-		  slice2html \
-		  slice2js
-
-ifeq ($(UNAME),Darwin)
-    SUBDIRS	:= $(SUBDIRS) slice2objc
-endif
-
-    SUBDIRS	:= $(SUBDIRS) \
-		   Ice \
-		   IceXML \
-		   IceSSL \
-		   IceDiscovery \
-		   IceLocatorDiscovery \
-		   Freeze \
-		   FreezeScript \
-		   IceBox \
-		   Glacier2Lib \
-		   Glacier2CryptPermissionsVerifier \
-		   Glacier2 \
-		   IcePatch2Lib \
-		   IcePatch2 \
-		   IceStormLib \
-		   IceGridLib \
-		   IceStorm \
-		   IceGrid
-endif
-
-.PHONY: $(EVERYTHING) $(SUBDIRS)
-
-#
-# Dependencies for 'all' target when using -jx
-#
-
-Slice: IceUtil
-
-slice2cpp slice2cs slice2freeze slice2freezej slice2java slice2js slice2php slice2html slice2objc: Slice
-
-Ice: slice2cpp
-
-IceXML IceSSL Freeze FreezeScript IceBox Glacier2Lib IcePatch2Lib IceStormLib IceGridLib: Ice
-
-Freeze: slice2freeze
-
-FreezeScript: Freeze
-
-Glacier2 IceGridLib Glacier2CryptPermissionsVerifier: Glacier2Lib
-
-IcePatch2: IcePatch2Lib
-
-IceStorm: IceBox IceStormLib IceGridLib Glacier2Lib Freeze
-
-IceGrid: IceGridLib IceStorm IcePatch2Lib Freeze IceSSL IceBox IceXML
-
-IceDiscovery IceLocatorDiscovery: Ice
-
-all:: $(SUBDIRS)
-
-$(SUBDIRS):
-	@echo "making all in $@"
-	@$(MAKE) all --directory=$@
-
-$(EVERYTHING_EXCEPT_ALL)::
-	@for subdir in $(SUBDIRS); \
-        do \
-            if test -d $$subdir ; \
-            then \
-                echo "making $@ in $$subdir"; \
-                ( cd $$subdir && $(MAKE) $@ ) || exit 1; \
-            fi; \
-        done
diff --git a/cpp/src/Makefile.mak b/cpp/src/Makefile.mak
deleted file mode 100644
index fbc4020b24d..00000000000
--- a/cpp/src/Makefile.mak
+++ /dev/null
@@ -1,77 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-!if "$(WINRT)" == "yes"
-SUBDIRS		= IceUtil Slice slice2cpp
-SUBDIRS_WINRT	= IceUtil\winrt \
-		  Ice\winrt \
-		  Glacier2Lib\winrt \
-		  IceStormLib\winrt \
-		  IceGridLib\winrt
-
-!elseif "$(CPP_COMPILER)" == "VC100"
-SUBDIRS		= IceUtil \
-		  Slice \
-		  slice2cpp \
-		  Ice \
-		  IceSSL \
-		  IceDiscovery \
-		  IceLocatorDiscovery
-!else
-SUBDIRS		= IceUtil \
-		  Slice \
-		  slice2cpp \
-		  slice2freeze \
-		  slice2cs \
-		  slice2freezej \
-		  slice2java \
-		  slice2html \
-		  slice2php \
-		  slice2js \
-		  Ice \
-		  IceSSL \
-		  IceDiscovery \
-		  IceLocatorDiscovery \
-		  IceXML \
-		  Freeze \
-		  FreezeScript \
-		  IcePatch2Lib \
-		  Glacier2Lib \
-		  IceStormLib \
-		  IceGridLib \
-		  IceBox \
-		  IcePatch2 \
-		  Glacier2CryptPermissionsVerifier \
-		  Glacier2 \
-		  IceStorm \
-		  IceGrid \
-		  iceserviceinstall
-!endif
-
-!if "$(WINRT)" == "yes"
-$(EVERYTHING)::
-	@for %i in ( $(SUBDIRS) ) do \
-	    @if exist %i \
-	        @echo "making $@ in %i" && \
-	        cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak WINRT=no $@" || exit 1
-	@for %i in ( $(SUBDIRS_WINRT) ) do \
-	    @if exist %i \
-	        @echo "making $@ in %i" && \
-	        cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
-!else
-$(EVERYTHING)::
-	@for %i in ( $(SUBDIRS) ) do \
-	    @if exist %i \
-	        @echo "making $@ in %i" && \
-	        cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
-!endif
\ No newline at end of file
diff --git a/cpp/src/Slice/.depend.mak b/cpp/src/Slice/.depend.mak
deleted file mode 100755
index a4855d54a00..00000000000
--- a/cpp/src/Slice/.depend.mak
+++ /dev/null
@@ -1,275 +0,0 @@
-
-Checksum.obj: \
-	Checksum.cpp \
-    "$(includedir)\Slice\Checksum.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "MD5.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-
-CPlusPlusUtil.obj: \
-	CPlusPlusUtil.cpp \
-    "$(includedir)\Slice\CPlusPlusUtil.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\Slice\Util.h" \
-
-CsUtil.obj: \
-	CsUtil.cpp \
-    "$(includedir)\Slice\CsUtil.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\Slice\DotNetNames.h" \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-
-DotNetNames.obj: \
-	DotNetNames.cpp \
-    "$(includedir)\Slice\DotNetNames.h" \
-
-FileTracker.obj: \
-	FileTracker.cpp \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-
-JavaUtil.obj: \
-	JavaUtil.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\Slice\JavaUtil.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\Slice\Util.h" \
-    "MD5.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-
-MD5.obj: \
-	MD5.cpp \
-    "MD5.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "MD5I.h" \
-
-MD5I.obj: \
-	MD5I.cpp \
-    "MD5I.h" \
-
-Parser.obj: \
-	Parser.cpp \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "GrammarUtil.h" \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-
-PHPUtil.obj: \
-	PHPUtil.cpp \
-    "$(includedir)\Slice\PHPUtil.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-
-Preprocessor.obj: \
-	Preprocessor.cpp \
-    "$(includedir)\Slice\Preprocessor.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-PythonUtil.obj: \
-	PythonUtil.cpp \
-    "$(includedir)\Slice\PythonUtil.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\Slice\Checksum.h" \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
-
-Python.obj: \
-	Python.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\Slice\Preprocessor.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\Slice\PythonUtil.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\Slice\Util.h" \
-
-RubyUtil.obj: \
-	RubyUtil.cpp \
-    "$(includedir)\Slice\RubyUtil.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\Slice\Checksum.h" \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
-
-Util.obj: \
-	Util.cpp \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-Ruby.obj: \
-	Ruby.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Slice\Preprocessor.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\Slice\RubyUtil.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\Slice\Util.h" \
-
-Grammar.obj: \
-	Grammar.cpp \
-    "GrammarUtil.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-
-Scanner.obj: \
-	Scanner.cpp \
-    "$(includedir)\IceUtil\ScannerConfig.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "GrammarUtil.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "Grammar.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
diff --git a/cpp/src/Slice/.gitignore b/cpp/src/Slice/.gitignore
deleted file mode 100644
index 720f44c7047..00000000000
--- a/cpp/src/Slice/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index a7206d3219a..9375a4554fc 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -24,6 +24,12 @@ using namespace IceUtilInternal;
 namespace
 {
 
+string
+condString(bool ok, const string& str)
+{
+    return ok ? str : "";
+}
+
 string toTemplateArg(const string& arg)
 {
     if(arg.empty())
@@ -48,14 +54,7 @@ stringTypeToString(const TypePtr& type, const StringList& metaData, int typeCtx)
     string strType = findMetaData(metaData, typeCtx);
     if(strType == "wstring" || (typeCtx & TypeContextUseWstring && strType == ""))
     {
-        if(featureProfile == IceE)
-        {
-            return "::Ice::Wstring";
-        }
-        else
-        {
-            return "::std::wstring";
-        }
+        return "::std::wstring";
     }
     else if(strType != "" && strType != "string")
     {
@@ -148,7 +147,6 @@ dictionaryTypeToString(const DictionaryPtr& dict, const StringList& metaData, in
     }
 }
 
-
 void
 writeParamAllocateCode(Output& out, const TypePtr& type, bool optional, const string& fixedName,
                        const StringList& metaData, int typeCtx, bool endArg)
@@ -160,7 +158,7 @@ writeParamAllocateCode(Output& out, const TypePtr& type, bool optional, const st
     }
     out << nl << s << ' ' << fixedName << ';';
 
-    if(!(typeCtx & TypeContextInParam) || !endArg)
+    if((typeCtx & TypeContextCpp11) || !(typeCtx & TypeContextInParam) || !endArg)
     {
         return; // We're done.
     }
@@ -190,7 +188,7 @@ writeParamAllocateCode(Output& out, const TypePtr& type, bool optional, const st
             {
                 md.push_back("cpp:type:" + seqType.substr(strlen("%range:")));
             }
-            s = typeToString(seq, md);
+            s = typeToString(seq, md, 0);
         }
 
         if(!s.empty())
@@ -205,8 +203,13 @@ writeParamAllocateCode(Output& out, const TypePtr& type, bool optional, const st
 }
 
 void
-writeParamEndCode(Output& out, const TypePtr& type, bool optional, const string& fixedName, const StringList& metaData)
+writeParamEndCode(Output& out, const TypePtr& type, bool optional, const string& fixedName, const StringList& metaData,
+                  const string& obj = "")
 {
+    string objPrefix = obj.empty() ? obj : obj + ".";
+    string paramName = objPrefix + fixedName;
+    string escapedParamName = objPrefix + "___" + fixedName;
+
     SequencePtr seq = SequencePtr::dynamicCast(type);
     if(seq)
     {
@@ -227,14 +230,14 @@ writeParamEndCode(Output& out, const TypePtr& type, bool optional, const string&
             {
                 if(optional)
                 {
-                    out << nl << "if(___" << fixedName << ")";
+                    out << nl << "if(" << escapedParamName << ")";
                     out << sb;
-                    out << nl << fixedName << " = ___" << fixedName << "->second;";
-                        out << eb;
+                    out << nl << paramName << " = " << escapedParamName << "->second;";
+                    out << eb;
                 }
                 else
                 {
-                    out << nl << fixedName << " = ___" << fixedName << ".second;";
+                    out << nl << paramName << " = " << escapedParamName << ".second;";
                 }
             }
             else if(!builtin ||
@@ -244,32 +247,30 @@ writeParamEndCode(Output& out, const TypePtr& type, bool optional, const string&
             {
                 if(optional)
                 {
-                    out << nl << "if(___" << fixedName << ")";
+                    out << nl << "if(" << escapedParamName << ")";
                     out << sb;
-                    out << nl << fixedName << ".__setIsSet();";
-                    out << nl << "if(!___" << fixedName << "->empty())";
+                    out << nl << paramName << ".__setIsSet();";
+                    out << nl << "if(!" << escapedParamName << "->empty())";
                     out << sb;
-                    out << nl << fixedName << "->first" << " = &(*___" << fixedName << ")[0];";
-                    out << nl << fixedName << "->second" << " = " << fixedName << "->first + " << "___"
-                        << fixedName << "->size();";
+                    out << nl << paramName << "->first" << " = &(*" << escapedParamName << ")[0];";
+                    out << nl << paramName << "->second" << " = " << paramName << "->first + " << escapedParamName << "->size();";
                     out << eb;
                     out << nl << "else";
                     out << sb;
-                    out << nl << fixedName << "->first" << " = " << fixedName << "->second" << " = 0;";
+                    out << nl << paramName << "->first" << " = " << paramName << "->second" << " = 0;";
                     out << eb;
                     out << eb;
                 }
                 else
                 {
-                    out << nl << "if(!___" << fixedName << ".empty())";
+                    out << nl << "if(!" << escapedParamName << ".empty())";
                     out << sb;
-                    out << nl << fixedName << ".first" << " = &___" << fixedName << "[0];";
-                    out << nl << fixedName << ".second" << " = " << fixedName << ".first + " << "___"
-                        << fixedName << ".size();";
+                    out << nl << paramName << ".first" << " = &" << escapedParamName << "[0];";
+                    out << nl << paramName << ".second" << " = " << paramName << ".first + " << escapedParamName << ".size();";
                     out << eb;
                     out << nl << "else";
                     out << sb;
-                    out << nl << fixedName << ".first" << " = " << fixedName << ".second" << " = 0;";
+                    out << nl << paramName << ".first" << " = " << paramName << ".second" << " = 0;";
                     out << eb;
                 }
             }
@@ -278,30 +279,37 @@ writeParamEndCode(Output& out, const TypePtr& type, bool optional, const string&
         {
             if(optional)
             {
-                out << nl << "if(___" << fixedName << ")";
+                out << nl << "if(" << escapedParamName << ")";
                 out << sb;
-                out << nl << fixedName << ".__setIsSet();";
-                out << nl << fixedName << "->first = (*___" << fixedName << ").begin();";
-                out << nl << fixedName << "->second = (*___" << fixedName << ").end();";
+                out << nl << paramName << ".__setIsSet();";
+                out << nl << paramName << "->first = (*" << escapedParamName << ").begin();";
+                out << nl << paramName << "->second = (*" << escapedParamName << ").end();";
                 out << eb;
             }
             else
             {
-                out << nl << fixedName << ".first = ___" << fixedName << ".begin();";
-                out << nl << fixedName << ".second = ___" << fixedName << ".end();";
+                out << nl << paramName << ".first = " << escapedParamName << ".begin();";
+                out << nl << paramName << ".second = " << escapedParamName << ".end();";
             }
         }
     }
 }
 
 void
-writeMarshalUnmarshalParams(Output& out, const ParamDeclList& params, const OperationPtr& op, bool marshal, bool prepend, int typeCtx)
+writeMarshalUnmarshalParams(Output& out, const ParamDeclList& params, const OperationPtr& op, bool marshal,
+                            bool prepend, int typeCtx, const string& retP = "", const string& obj = "")
 {
     string prefix = prepend ? paramPrefix : "";
+    string returnValueS = retP.empty() ? string("__ret") : retP;
+
+    string objPrefix = obj.empty() ? obj : obj + ".";
+
+    bool cpp11 = (typeCtx & TypeContextCpp11) != 0;
 
     //
     // Marshal non optional parameters.
     //
+    ParamDeclList requiredParams;
     ParamDeclList optionals;
     for(ParamDeclList::const_iterator p = params.begin(); p != params.end(); ++p)
     {
@@ -311,53 +319,158 @@ writeMarshalUnmarshalParams(Output& out, const ParamDeclList& params, const Oper
         }
         else
         {
-            writeMarshalUnmarshalCode(out, (*p)->type(), false, 0, fixKwd(prefix + (*p)->name()), marshal, (*p)->getMetaData(),
-                                      typeCtx);
+            requiredParams.push_back(*p);
         }
     }
-    if(op && op->returnType())
+
+
+    if(!requiredParams.empty() || (op && op->returnType() && !op->returnIsOptional()))
     {
-        if(!op->returnIsOptional())
+        if(cpp11)
         {
-            writeMarshalUnmarshalCode(out, op->returnType(), false, 0, "__ret", marshal, op->getMetaData(), typeCtx);
+            out << nl;
+            if(marshal)
+            {
+                out << "__os->writeAll";
+            }
+            else
+            {
+                out << "__is->readAll";
+            }
+            out << spar;
+            for(ParamDeclList::const_iterator p = requiredParams.begin(); p != requiredParams.end(); ++p)
+            {
+                out << objPrefix + fixKwd(prefix + (*p)->name());
+            }
+            if(op && op->returnType() && !op->returnIsOptional())
+            {
+                out << objPrefix + returnValueS;
+            }
+            out << epar << ";";
+        }
+        else
+        {
+            for(ParamDeclList::const_iterator p = requiredParams.begin(); p != requiredParams.end(); ++p)
+            {
+                writeMarshalUnmarshalCode(out, (*p)->type(), false, 0, fixKwd(prefix + (*p)->name()), marshal, (*p)->getMetaData(),
+                                          typeCtx, "", true, obj);
+            }
+
+            if(op && op->returnType())
+            {
+                if(!op->returnIsOptional())
+                {
+                    writeMarshalUnmarshalCode(out, op->returnType(), false, 0, returnValueS, marshal, op->getMetaData(), typeCtx,
+                                              "", true, obj);
+                }
+            }
         }
     }
 
-    //
-    // Sort optional parameters by tag.
-    //
-    class SortFn
+    if(!optionals.empty() || (op && op->returnType() && op->returnIsOptional()))
     {
-    public:
-        static bool compare(const ParamDeclPtr& lhs, const ParamDeclPtr& rhs)
+        //
+        // Sort optional parameters by tag.
+        //
+        class SortFn
         {
-            return lhs->tag() < rhs->tag();
-        }
-    };
-    optionals.sort(SortFn::compare);
+        public:
+            static bool compare(const ParamDeclPtr& lhs, const ParamDeclPtr& rhs)
+            {
+                return lhs->tag() < rhs->tag();
+            }
+        };
+        optionals.sort(SortFn::compare);
 
-    //
-    // Marshal optional parameters.
-    //
-    bool checkReturnType = op && op->returnIsOptional();
-    for(ParamDeclList::const_iterator p = optionals.begin(); p != optionals.end(); ++p)
-    {
-        if(checkReturnType && op->returnTag() < (*p)->tag())
+        if(cpp11)
         {
-            writeMarshalUnmarshalCode(out, op->returnType(), true, op->returnTag(), "__ret", marshal,
-                                      op->getMetaData(), typeCtx);
-            checkReturnType = false;
+            out << nl;
+            if(marshal)
+            {
+                out << "__os->writeAll";
+            }
+            else
+            {
+                out << "__is->readAll";
+            }
+            out << spar;
+
+            {
+                //
+                // Tags
+                //
+                ostringstream os;
+                os << '{';
+                bool checkReturnType = op && op->returnIsOptional();
+                bool insertComma = false;
+                for(ParamDeclList::const_iterator p = optionals.begin(); p != optionals.end(); ++p)
+                {
+                    if(checkReturnType && op->returnTag() < (*p)->tag())
+                    {
+                        os << condString(insertComma, ", ") << op->returnTag();
+                        checkReturnType = false;
+                        insertComma = true;
+                    }
+                    os << condString(insertComma, ", ") << (*p)->tag();
+                    insertComma = true;
+                }
+                if(checkReturnType)
+                {
+                    os << condString(insertComma, ", ") << op->returnTag();
+                }
+                os << '}';
+                out << os.str();
+            }
+
+            {
+                //
+                // Parameters
+                //
+                bool checkReturnType = op && op->returnIsOptional();
+                for(ParamDeclList::const_iterator p = optionals.begin(); p != optionals.end(); ++p)
+                {
+                    if(checkReturnType && op->returnTag() < (*p)->tag())
+                    {
+                        out << objPrefix + returnValueS;
+                        checkReturnType = false;
+                    }
+                    out << objPrefix + fixKwd(prefix + (*p)->name());
+                }
+                if(checkReturnType)
+                {
+                    out << objPrefix + returnValueS;
+                }
+            }
+            out << epar << ";";
+        }
+        else
+        {
+
+            //
+            // Marshal optional parameters.
+            //
+
+            bool checkReturnType = op && op->returnIsOptional();
+            for(ParamDeclList::const_iterator p = optionals.begin(); p != optionals.end(); ++p)
+            {
+                if(checkReturnType && op->returnTag() < (*p)->tag())
+                {
+                    writeMarshalUnmarshalCode(out, op->returnType(), true, op->returnTag(), returnValueS, marshal,
+                                              op->getMetaData(), typeCtx, "", true, obj);
+
+                    checkReturnType = false;
+                }
+                writeMarshalUnmarshalCode(out, (*p)->type(), true, (*p)->tag(), fixKwd(prefix + (*p)->name()), marshal,
+                                          (*p)->getMetaData(), typeCtx, "", true, obj);
+            }
+            if(checkReturnType)
+            {
+                writeMarshalUnmarshalCode(out, op->returnType(), true, op->returnTag(), returnValueS, marshal, op->getMetaData(),
+                                          typeCtx, "", true, obj);
+            }
         }
-        writeMarshalUnmarshalCode(out, (*p)->type(), true, (*p)->tag(), fixKwd(prefix + (*p)->name()), marshal,
-                                  (*p)->getMetaData(), typeCtx);
-    }
-    if(checkReturnType)
-    {
-        writeMarshalUnmarshalCode(out, op->returnType(), true, op->returnTag(), "__ret", marshal, op->getMetaData(),
-                                  typeCtx);
     }
 }
-
 }
 
 Slice::FeatureProfile Slice::featureProfile = Slice::Ice;
@@ -439,10 +552,10 @@ Slice::printDllExportStuff(Output& out, const string& dllExport)
     {
         out << sp;
         out << "\n#ifndef " << dllExport;
-        out << "\n#   ifdef " << dllExport << "_EXPORTS";
-        out << "\n#       define " << dllExport << " ICE_DECLSPEC_EXPORT";
-        out << "\n#   elif defined(ICE_STATIC_LIBS)";
+        out << "\n#   if defined(ICE_STATIC_LIBS)";
         out << "\n#       define " << dllExport << " /**/";
+        out << "\n#   elif defined(" << dllExport << "_EXPORTS)";
+        out << "\n#       define " << dllExport << " ICE_DECLSPEC_EXPORT";
         out << "\n#   else";
         out << "\n#       define " << dllExport << " ICE_DECLSPEC_IMPORT";
         out << "\n#   endif";
@@ -450,10 +563,36 @@ Slice::printDllExportStuff(Output& out, const string& dllExport)
     }
 }
 
+bool
+Slice::isMovable(const TypePtr& type)
+{
+    BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
+    if(builtin)
+    {
+        switch(builtin->kind())
+        {
+            case Builtin::KindString:
+            case Builtin::KindObject:
+            case Builtin::KindObjectProxy:
+            case Builtin::KindLocalObject:
+            case Builtin::KindValue:
+            {
+                return true;
+            }
+            default:
+            {
+                return false;
+            }
+        }
+    }
+    return !EnumPtr::dynamicCast(type);
+}
 
 string
 Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx)
 {
+    bool cpp11 = (typeCtx & TypeContextCpp11) != 0;
+
     static const char* builtinTable[] =
     {
         "::Ice::Byte",
@@ -466,7 +605,24 @@ Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx
         "::std::string",
         "::Ice::ObjectPtr",
         "::Ice::ObjectPrx",
-        "::Ice::LocalObjectPtr"
+        "::Ice::LocalObjectPtr",
+        "::Ice::ValuePtr"
+    };
+
+    static const char* cpp11BuiltinTable[] =
+    {
+        "::Ice::Byte",
+        "bool",
+        "short",
+        "int",
+        "long long int",
+        "float",
+        "double",
+        "::std::string",
+        "::std::shared_ptr<::Ice::Object>",
+        "::std::shared_ptr<::Ice::ObjectPrx>",
+        "::std::shared_ptr<void>",
+        "::std::shared_ptr<::Ice::Value>"
     };
 
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
@@ -478,20 +634,55 @@ Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx
         }
         else
         {
-            return builtinTable[builtin->kind()];
+            if(cpp11)
+            {
+                if(builtin->kind() == Builtin::KindObject && !(typeCtx & TypeContextLocal))
+                {
+                    return "::std::shared_ptr<::Ice::Value>";
+                }
+                else
+                {
+                    return cpp11BuiltinTable[builtin->kind()];
+                }
+            }
+            else
+            {
+                return builtinTable[builtin->kind()];
+            }
         }
     }
 
     ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
     if(cl)
     {
-        return fixKwd(cl->scoped() + "Ptr");
+        if(cpp11)
+        {
+            if(cl->definition() && cl->definition()->isDelegate())
+            {
+                return classDefToDelegateString(cl->definition());
+            }
+            else if(cl->isInterface() && !cl->isLocal())
+            {
+                return "std::shared_ptr<::Ice::Value>";
+            }
+            else
+            {
+                return "::std::shared_ptr<" + cl->scoped() + ">";
+            }
+        }
+        else
+        {
+            return cl->scoped() + "Ptr";
+        }
     }
 
     StructPtr st = StructPtr::dynamicCast(type);
     if(st)
     {
-        if(findMetaData(st->getMetaData()) == "%class")
+        //
+        // C++11 mapping doesn't accept cpp:class metadata
+        //
+        if(!cpp11 && findMetaData(st->getMetaData()) == "%class")
         {
             return fixKwd(st->scoped() + "Ptr");
         }
@@ -501,7 +692,26 @@ Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx
     ProxyPtr proxy = ProxyPtr::dynamicCast(type);
     if(proxy)
     {
-        return fixKwd(proxy->_class()->scoped() + "Prx");
+        if(cpp11)
+        {
+            ClassDefPtr def = proxy->_class()->definition();
+            //
+            // Non local classes without operations map to the base
+            // proxy class shared_ptr<Ice::ObjectPrx>
+            //
+            if(def && !def->isInterface() && def->allOperations().empty())
+            {
+                return "::std::shared_ptr<::Ice::ObjectPrx>";
+            }
+            else
+            {
+                return "::std::shared_ptr<" + fixKwd(proxy->_class()->scoped() + "Prx") + ">";
+            }
+        }
+        else
+        {
+            return fixKwd(proxy->_class()->scoped() + "Prx");
+        }
     }
 
     SequencePtr seq = SequencePtr::dynamicCast(type);
@@ -563,7 +773,9 @@ Slice::returnTypeToString(const TypePtr& type, bool optional, const StringList&
 string
 Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx)
 {
-    static const char* inputBuiltinTable[] =
+    bool cpp11 = (typeCtx & TypeContextCpp11) != 0;
+
+    static const char* cpp98InputBuiltinTable[] =
     {
         "::Ice::Byte",
         "bool",
@@ -575,7 +787,24 @@ Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& m
         "const ::std::string&",
         "const ::Ice::ObjectPtr&",
         "const ::Ice::ObjectPrx&",
-        "const ::Ice::LocalObjectPtr&"
+        "const ::Ice::LocalObjectPtr&",
+        "const ::Ice::ValuePtr&"
+    };
+
+    static const char* cpp11InputBuiltinTable[] =
+    {
+        "::Ice::Byte",
+        "bool",
+        "short",
+        "int",
+        "long long int",
+        "float",
+        "double",
+        "const ::std::string&",
+        "const ::std::shared_ptr<::Ice::Object>&",
+        "const ::std::shared_ptr<::Ice::ObjectPrx>&",
+        "const ::std::shared_ptr<void>&",
+        "const ::std::shared_ptr<::Ice::Value>&"
     };
 
     typeCtx |= TypeContextInParam;
@@ -594,30 +823,87 @@ Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& m
         }
         else
         {
-            return inputBuiltinTable[builtin->kind()];
+            if(cpp11)
+            {
+                if(builtin->kind() == Builtin::KindObject && !(typeCtx & TypeContextLocal))
+                {
+                    return "const ::std::shared_ptr<::Ice::Value>&";
+                }
+                else
+                {
+                    return cpp11InputBuiltinTable[builtin->kind()];
+                }
+            }
+            else
+            {
+                return cpp98InputBuiltinTable[builtin->kind()];
+            }
         }
     }
 
     ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
     if(cl)
     {
-        return "const " + fixKwd(cl->scoped() + "Ptr&");
+        if(cpp11)
+        {
+            if(cl->definition() && cl->definition()->isDelegate())
+            {
+                return classDefToDelegateString(cl->definition(), typeCtx);
+            }
+            else if(cl->isInterface() && !cl->isLocal())
+            {
+                return "const ::std::shared_ptr<::Ice::Value>&";
+            }
+            else
+            {
+                return "const ::std::shared_ptr<" + fixKwd(cl->scoped()) + ">&";
+            }
+        }
+        else
+        {
+            return "const " + fixKwd(cl->scoped() + "Ptr&");
+        }
     }
 
     StructPtr st = StructPtr::dynamicCast(type);
     if(st)
     {
-        if(findMetaData(st->getMetaData()) == "%class")
+        if(cpp11)
         {
-            return "const " + fixKwd(st->scoped() + "Ptr&");
+            return "const " + fixKwd(st->scoped()) + "&";
+        }
+        else
+        {
+            if(findMetaData(st->getMetaData()) == "%class")
+            {
+                return "const " + fixKwd(st->scoped() + "Ptr&");
+            }
+            else
+            {
+                return "const " + fixKwd(st->scoped()) + "&";
+            }
         }
-        return "const " + fixKwd(st->scoped()) + "&";
     }
 
     ProxyPtr proxy = ProxyPtr::dynamicCast(type);
     if(proxy)
     {
-        return "const " + fixKwd(proxy->_class()->scoped() + "Prx&");
+        if(cpp11)
+        {
+            ClassDefPtr def = proxy->_class()->definition();
+            if(def && !def->isInterface() && def->allOperations().empty())
+            {
+                return "const ::std::shared_ptr<::Ice::ObjectPrx>&";
+            }
+            else
+            {
+                return "const ::std::shared_ptr<" + fixKwd(proxy->_class()->scoped() + "Prx") + ">&";
+            }
+        }
+        else
+        {
+            return "const " + fixKwd(proxy->_class()->scoped() + "Prx&");
+        }
     }
 
     EnumPtr en = EnumPtr::dynamicCast(type);
@@ -650,6 +936,8 @@ Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& m
 string
 Slice::outputTypeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx)
 {
+    bool cpp11 = (typeCtx & TypeContextCpp11) != 0;
+
     static const char* outputBuiltinTable[] =
     {
         "::Ice::Byte&",
@@ -661,8 +949,25 @@ Slice::outputTypeToString(const TypePtr& type, bool optional, const StringList&
         "::Ice::Double&",
         "::std::string&",
         "::Ice::ObjectPtr&",
-        "::Ice::ObjectPrx&",
-        "::Ice::LocalObjectPtr&"
+        "::Ice::ObjectPrxPtr&",
+        "::Ice::LocalObjectPtr&",
+        "::Ice::ValuePtr&"
+    };
+
+    static const char* cpp11OutputBuiltinTable[] =
+    {
+        "::Ice::Byte&",
+        "bool&",
+        "short&",
+        "int&",
+        "long long int&",
+        "float&",
+        "double&",
+        "::std::string&",
+        "::std::shared_ptr<::Ice::Object>&",
+        "::std::shared_ptr<::Ice::ObjectPrx>&",
+        "::std::shared_ptr<void>&",
+        "::std::shared_ptr<::Ice::Value>&"
     };
 
     if(optional)
@@ -679,30 +984,84 @@ Slice::outputTypeToString(const TypePtr& type, bool optional, const StringList&
         }
         else
         {
-            return outputBuiltinTable[builtin->kind()];
+            if(cpp11)
+            {
+                if(builtin->kind() == Builtin::KindObject && !(typeCtx & TypeContextLocal))
+                {
+                    return "::std::shared_ptr<::Ice::Value>";
+                }
+                else
+                {
+                    return cpp11OutputBuiltinTable[builtin->kind()];
+                }
+            }
+            else
+            {
+                return outputBuiltinTable[builtin->kind()];
+            }
         }
     }
 
     ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
     if(cl)
     {
-        return fixKwd(cl->scoped() + "Ptr&");
+        if(cpp11)
+        {
+            if(cl->definition() && cl->definition()->isDelegate())
+            {
+                return classDefToDelegateString(cl->definition(), typeCtx) + "&";
+            }
+            else if(cl->isInterface() && !cl->isLocal())
+            {
+                return "::std::shared_ptr<::Ice::Value>&";
+            }
+            else
+            {
+                return "::std::shared_ptr<" + fixKwd(cl->scoped()) + ">&";
+            }
+        }
+        else
+        {
+            return fixKwd(cl->scoped() + "Ptr&");
+        }
     }
 
     StructPtr st = StructPtr::dynamicCast(type);
     if(st)
     {
-        if(findMetaData(st->getMetaData()) == "%class")
+        if(!cpp11 && findMetaData(st->getMetaData()) == "%class")
         {
             return fixKwd(st->scoped() + "Ptr&");
         }
-        return fixKwd(st->scoped()) + "&";
+        else
+        {
+            return fixKwd(st->scoped()) + "&";
+        }
     }
 
     ProxyPtr proxy = ProxyPtr::dynamicCast(type);
     if(proxy)
     {
-        return fixKwd(proxy->_class()->scoped() + "Prx&");
+        if(cpp11)
+        {
+            ClassDefPtr def = proxy->_class()->definition();
+            //
+            // Non local classes without operations map to the base
+            // proxy class shared_ptr<Ice::ObjectPrx>
+            //
+            if(def && !def->isInterface() && def->allOperations().empty())
+            {
+                return "::std::shared_ptr<::Ice::ObjectPrx>";
+            }
+            else
+            {
+                return "::std::shared_ptr<" + fixKwd(proxy->_class()->scoped() + "Prx") + ">&";
+            }
+        }
+        else
+        {
+            return fixKwd(proxy->_class()->scoped() + "Prx&");
+        }
     }
 
     SequencePtr seq = SequencePtr::dynamicCast(type);
@@ -727,23 +1086,23 @@ Slice::outputTypeToString(const TypePtr& type, bool optional, const StringList&
 }
 
 string
-Slice::operationModeToString(Operation::Mode mode)
+Slice::operationModeToString(Operation::Mode mode, bool cpp11)
 {
     switch(mode)
     {
         case Operation::Normal:
         {
-            return "::Ice::Normal";
+            return cpp11 ? "::Ice::OperationMode::Normal" : "::Ice::Normal";
         }
 
         case Operation::Nonmutating:
         {
-            return "::Ice::Nonmutating";
+            return cpp11 ? "::Ice::OperationMode::Nonmutating" : "::Ice::Nonmutating";
         }
 
         case Operation::Idempotent:
         {
-            return "::Ice::Idempotent";
+            return cpp11 ? "::Ice::OperationMode::Idempotent" : "::Ice::Idempotent";
         }
 
         default:
@@ -868,8 +1227,11 @@ Slice::fixKwd(const string& name)
 
 void
 Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, bool optional, int tag, const string& param,
-                                 bool marshal, const StringList& metaData, int typeCtx, const string& str, bool pointer)
+                                 bool marshal, const StringList& metaData, int typeCtx, const string& str, bool pointer,
+                                 const string& obj)
 {
+    string objPrefix = obj.empty() ? obj : obj + ".";
+
     ostringstream os;
     if(str.empty())
     {
@@ -916,24 +1278,24 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, bool optional
                 BuiltinPtr builtin = BuiltinPtr::dynamicCast(seq->type());
                 if(builtin && builtin->kind() == Builtin::KindByte)
                 {
-                    out << nl << func << param << ");";
+                    out << nl << func << objPrefix << param << ");";
                     return;
                 }
 
-                out << nl << func << "___" << param << ");";
-                writeParamEndCode(out, seq, optional, param, metaData);
+                out << nl << func << objPrefix << "___" << param << ");";
+                writeParamEndCode(out, seq, optional, param, metaData, obj);
                 return;
             }
             else if(seqType.find("%range") == 0)
             {
-                out << nl << func << "___" << param << ");";
-                writeParamEndCode(out, seq, optional, param, metaData);
+                out << nl << func << objPrefix << "___" << param << ");";
+                writeParamEndCode(out, seq, optional, param, metaData, obj);
                 return;
             }
         }
     }
 
-    out << nl << func << param << ");";
+    out << nl << func << objPrefix << param << ");";
 }
 
 void
@@ -943,25 +1305,30 @@ Slice::writeMarshalCode(Output& out, const ParamDeclList& params, const Operatio
 }
 
 void
-Slice::writeUnmarshalCode(Output& out, const ParamDeclList& params, const OperationPtr& op, bool prepend, int typeCtx)
+Slice::writeUnmarshalCode(Output& out, const ParamDeclList& params, const OperationPtr& op, bool prepend, int typeCtx,
+                          const string& retP, const string& obj)
 {
-    writeMarshalUnmarshalParams(out, params, op, false, prepend, typeCtx);
+    writeMarshalUnmarshalParams(out, params, op, false, prepend, typeCtx, retP, obj);
 }
 
 void
 Slice::writeAllocateCode(Output& out, const ParamDeclList& params, const OperationPtr& op, bool prepend, int typeCtx)
 {
     string prefix = prepend ? paramPrefix : "";
+    string returnValueS = "__ret";
+
     for(ParamDeclList::const_iterator p = params.begin(); p != params.end(); ++p)
     {
         writeParamAllocateCode(out, (*p)->type(), (*p)->optional(), fixKwd(prefix + (*p)->name()), (*p)->getMetaData(),
-                               typeCtx, getEndArg((*p)->type(),(*p)->getMetaData(), (*p)->name()) != (*p)->name());
+                               typeCtx, getEndArg((*p)->type(), (*p)->getMetaData(), (*p)->name()) != (*p)->name());
     }
+
     if(op && op->returnType())
     {
-        writeParamAllocateCode(out, op->returnType(), op->returnIsOptional(), "__ret", op->getMetaData(), typeCtx,
-                               getEndArg(op->returnType(), op->getMetaData(), "__ret") != "__ret");
+        writeParamAllocateCode(out, op->returnType(), op->returnIsOptional(), returnValueS, op->getMetaData(), typeCtx,
+                               getEndArg(op->returnType(), op->getMetaData(), returnValueS) != returnValueS);
     }
+
 }
 
 string
@@ -1020,6 +1387,97 @@ Slice::writeEndCode(Output& out, const ParamDeclList& params, const OperationPtr
     }
 }
 
+void
+Slice::writeMarshalUnmarshalDataMemberInHolder(IceUtilInternal::Output& C,
+                                               const string& holder,
+                                               const DataMemberPtr& p,
+                                               bool marshal)
+{
+    writeMarshalUnmarshalCode(C, p->type(), p->optional(), p->tag(), holder + fixKwd(p->name()), marshal,
+                              p->getMetaData());
+}
+
+void
+Slice::writeStreamHelpers(Output& out, bool checkClassMetaData, const ContainedPtr& c, DataMemberList dataMembers,
+                          DataMemberList optionalDataMembers)
+{
+    string scoped = c->scoped();
+    bool classMetaData = false;
+
+    if(checkClassMetaData)
+    {
+        classMetaData = findMetaData(c->getMetaData(), false) == "%class";
+    }
+
+    string fullName = classMetaData ? fixKwd(scoped + "Ptr") : fixKwd(scoped);
+    string holder = classMetaData ? "v->" : "v.";
+
+    out << nl << "template<typename S>";
+    out << nl << "struct StreamWriter< " << fullName << ", S>";
+    out << sb;
+    out << nl << "static void write(S* __os, const " <<  fullName << "& v)";
+    out << sb;
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        if(!(*q)->optional())
+        {
+            writeMarshalUnmarshalDataMemberInHolder(out, holder, *q, true);
+        }
+    }
+    for(DataMemberList::const_iterator q = optionalDataMembers.begin(); q != optionalDataMembers.end(); ++q)
+    {
+        writeMarshalUnmarshalDataMemberInHolder(out, holder, *q, true);
+    }
+    out << eb;
+    out << eb << ";" << nl;
+
+    out << nl << "template<typename S>";
+    out << nl << "struct StreamReader< " << fullName << ", S>";
+    out << sb;
+    out << nl << "static void read(S* __is, " << fullName << "& v)";
+    out << sb;
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        if(!(*q)->optional())
+        {
+            writeMarshalUnmarshalDataMemberInHolder(out, holder, *q, false);
+        }
+    }
+    for(DataMemberList::const_iterator q = optionalDataMembers.begin(); q != optionalDataMembers.end(); ++q)
+    {
+        writeMarshalUnmarshalDataMemberInHolder(out, holder, *q, false);
+    }
+    out << eb;
+    out << eb << ";" << nl;
+}
+
+bool
+Slice::findMetaData(const string& prefix, const ClassDeclPtr& cl, string& value)
+{
+    if(findMetaData(prefix, cl->getMetaData(), value))
+    {
+        return true;
+    }
+
+    ClassDefPtr def = cl->definition();
+    return def ? findMetaData(prefix, def->getMetaData(), value) : false;
+}
+
+bool
+Slice::findMetaData(const string& prefix, const StringList& metaData, string& value)
+{
+    for(StringList::const_iterator i = metaData.begin(); i != metaData.end(); i++)
+    {
+        string s = *i;
+        if(s.find(prefix) == 0)
+        {
+            value = s.substr(prefix.size());
+            return true;
+        }
+    }
+    return false;
+}
+
 string
 Slice::findMetaData(const StringList& metaData, int typeCtx)
 {
@@ -1041,28 +1499,23 @@ Slice::findMetaData(const StringList& metaData, int typeCtx)
             // the return value is % followed by the string after cpp:.
             //
             // The priority of the metadata is as follows:
-            // 1: protobuf
-            // 2: array, range, view-type for "view" parameters
-            // 3: class
+            // 1: array, range (C++98 only), view-type for "view" parameters
+            // 2: class (C++98 only), unscoped (C++11 only)
+            //
 
             if(pos != string::npos)
             {
                 string ss = str.substr(prefix.size());
 
-                if(ss.find("protobuf:") == 0)
-                {
-                    return str.substr(pos + 1);
-                }
-
                 if(typeCtx & (TypeContextInParam | TypeContextAMIPrivateEnd))
                 {
-                    if(ss.find("range:") == 0)
+                    if(ss.find("view-type:") == 0)
                     {
-                        return string("%") + str.substr(prefix.size());
+                        return str.substr(pos + 1);
                     }
-                    else if(ss.find("view-type:") == 0)
+                    else if(ss.find("range:") == 0 && !(typeCtx & TypeContextCpp11))
                     {
-                        return str.substr(pos + 1);
+                        return string("%") + str.substr(prefix.size());
                     }
                 }
 
@@ -1078,21 +1531,25 @@ Slice::findMetaData(const StringList& metaData, int typeCtx)
                 {
                     return "%array";
                 }
-                else if(ss == "range")
+                else if(ss == "range" && !(typeCtx & TypeContextCpp11))
                 {
                     return "%range";
                 }
             }
             //
-            // Otherwise if the data is "class" it is returned.
+            // Otherwise if the data is "class", "unscoped" it is returned.
             //
             else
             {
                 string ss = str.substr(prefix.size());
-                if(ss == "class")
+                if(ss == "class" && !(typeCtx & TypeContextCpp11))
                 {
                     return "%class";
                 }
+                else if(ss == "unscoped" && (typeCtx & TypeContextCpp11))
+                {
+                    return "%unscoped";
+                }
             }
         }
     }
@@ -1144,3 +1601,35 @@ Slice::getDataMemberRef(const DataMemberPtr& p)
         return "(*" + name + ")";
     }
 }
+
+string
+Slice::classDefToDelegateString(const ClassDefPtr& cl, int typeCtx)
+{
+    assert(cl->isDelegate());
+
+    // A delegate only has one operation
+    OperationPtr op = cl->allOperations().front();
+
+    TypePtr ret = op->returnType();
+    string retS = returnTypeToString(ret, op->returnIsOptional(), op->getMetaData(), typeCtx);
+
+    string t = "::std::function<" + retS + "(";
+
+    ParamDeclList paramList = cl->allOperations().front()->parameters();
+    for(ParamDeclList::iterator q = paramList.begin(); q != paramList.end(); ++q)
+    {
+        if((*q)->isOutParam())
+        {
+            t += outputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), typeCtx);
+        }
+        else
+        {
+            t += inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), typeCtx);
+        }
+
+        t += distance(q, paramList.end()) == 1  ? "" : ", ";
+    }
+
+    t += ")>";
+    return t;
+}
diff --git a/cpp/src/Slice/CPlusPlusUtil.h b/cpp/src/Slice/CPlusPlusUtil.h
new file mode 100644
index 00000000000..da430845e30
--- /dev/null
+++ b/cpp/src/Slice/CPlusPlusUtil.h
@@ -0,0 +1,75 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef C_PLUS_PLUS_UTIL_H
+#define C_PLUS_PLUS_UTIL_H
+
+#include <Slice/Parser.h>
+#include <IceUtil/OutputUtil.h>
+
+namespace Slice
+{
+
+extern FeatureProfile featureProfile;
+extern std::string paramPrefix;
+
+struct ToIfdef
+{
+    char operator()(char);
+};
+
+void printHeader(::IceUtilInternal::Output&);
+void printVersionCheck(::IceUtilInternal::Output&);
+void printDllExportStuff(::IceUtilInternal::Output&, const std::string&);
+
+const int TypeContextInParam = 1;
+const int TypeContextAMIEnd = 2;
+const int TypeContextAMIPrivateEnd = 4;
+const int TypeContextAMICallPrivateEnd = 8;
+const int TypeContextUseWstring = 16;
+const int TypeContextLocal = 32;
+const int TypeContextCpp11 = 64;
+
+bool isMovable(const TypePtr&);
+
+std::string typeToString(const TypePtr&, const StringList& = StringList(), int = 0);
+std::string typeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
+std::string returnTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
+std::string inputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
+std::string outputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
+std::string operationModeToString(Operation::Mode, bool = false);
+std::string opFormatTypeToString(const OperationPtr&);
+
+std::string fixKwd(const std::string&);
+
+void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, bool, int, const std::string&,
+                               bool, const StringList& = StringList(), int = 0, const std::string& = "",
+                               bool = true, const std::string& = "");
+
+void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0);
+void writeUnmarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0,
+                        const std::string& = "", const std::string& = "");
+void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0);
+
+std::string getEndArg(const TypePtr&, const StringList&, const std::string&);
+void writeEndCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool = false);
+void writeMarshalUnmarshalDataMemberInHolder(IceUtilInternal::Output&, const std::string&, const DataMemberPtr&, bool);
+void writeStreamHelpers(::IceUtilInternal::Output&, bool, const ContainedPtr&, DataMemberList, DataMemberList = DataMemberList());
+
+bool findMetaData(const std::string&, const ClassDeclPtr&, std::string&);
+bool findMetaData(const std::string&, const StringList&, std::string&);
+std::string findMetaData(const StringList&, int = 0);
+bool inWstringModule(const SequencePtr&);
+
+std::string getDataMemberRef(const DataMemberPtr&);
+
+std::string classDefToDelegateString(const ClassDefPtr&, int = 0);
+}
+
+#endif
diff --git a/cpp/src/FreezeScript/Print.h b/cpp/src/Slice/Checksum.h
index c3e2451d12e..3744d8a6ad4 100644
--- a/cpp/src/FreezeScript/Print.h
+++ b/cpp/src/Slice/Checksum.h
@@ -7,16 +7,20 @@
 //
 // **********************************************************************
 
-#ifndef FREEZE_SCRIPT_PRINT_H
-#define FREEZE_SCRIPT_PRINT_H
+#ifndef SLICE_CHECKSUM_H
+#define SLICE_CHECKSUM_H
 
-#include <FreezeScript/Data.h>
+#include <Slice/Parser.h>
+#include <map>
+#include <vector>
 
-namespace FreezeScript
+namespace Slice
 {
 
-void printData(const DataPtr&, std::ostream&);
+typedef std::map<std::string, std::vector<unsigned char> > ChecksumMap;
 
-} // End of namespace FreezeScript
+ChecksumMap createChecksums(const UnitPtr&);
+
+}
 
 #endif
diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp
index a6e1dc810ea..e57de914e31 100644
--- a/cpp/src/Slice/FileTracker.cpp
+++ b/cpp/src/Slice/FileTracker.cpp
@@ -23,16 +23,16 @@ Slice::FileException::FileException(const char* file, int line, const string& r)
 {
 }
 
+#ifndef ICE_CPP11_COMPILER
 Slice::FileException::~FileException() throw()
 {
 }
-
-const char* Slice::FileException::_name = "Slice::FileException";
+#endif
 
 string
-Slice::FileException::ice_name() const
+Slice::FileException::ice_id() const
 {
-    return _name;
+    return "::Slice::FileException";
 }
 
 void
@@ -42,11 +42,13 @@ Slice::FileException::ice_print(ostream& out) const
     out << ": " << _reason;
 }
 
+#ifndef ICE_CPP11_MAPPING
 Slice::FileException*
 Slice::FileException::ice_clone() const
 {
     return new FileException(*this);
 }
+#endif
 
 void
 Slice::FileException::ice_throw() const
diff --git a/cpp/src/Slice/FileTracker.h b/cpp/src/Slice/FileTracker.h
new file mode 100644
index 00000000000..1826e52a495
--- /dev/null
+++ b/cpp/src/Slice/FileTracker.h
@@ -0,0 +1,75 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef FILE_TRACKER_H
+#define FILE_TRACKER_H
+
+#include <IceUtil/Shared.h>
+#include <Slice/Parser.h>
+
+namespace Slice
+{
+
+class FileException : public ::IceUtil::Exception
+{
+public:
+
+    FileException(const char*, int, const std::string&);
+#ifndef ICE_CPP11_COMPILER
+    ~FileException() throw();
+#endif
+    virtual std::string ice_id() const;
+    virtual void ice_print(std::ostream&) const;
+#ifndef ICE_CPP11_MAPPING
+    virtual FileException* ice_clone() const;
+#endif
+    virtual void ice_throw() const;
+
+    std::string reason() const;
+
+private:
+
+    static const char* _name;
+    const std::string _reason;
+};
+
+class FileTracker;
+typedef IceUtil::Handle<FileTracker> FileTrackerPtr;
+
+class FileTracker : public ::IceUtil::SimpleShared
+{
+public:
+
+    FileTracker();
+    ~FileTracker();
+
+    static FileTrackerPtr instance();
+
+    void setSource(const std::string&);
+    void setOutput(const std::string&, bool);
+    void addFile(const std::string&);
+    void addDirectory(const std::string&);
+
+    void cleanup();
+    void dumpxml();
+
+private:
+
+    std::string escape(const std::string&) const;
+
+    std::list<std::pair< std::string, bool> > _files;
+    std::string _source;
+    std::map<std::string, std::string> _errors;
+    std::map<std::string, std::list<std::string> > _generated;
+    std::map<std::string, std::list<std::string> >::iterator _curr;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp
index 24588b6ba35..af37d694387 100644
--- a/cpp/src/Slice/Grammar.cpp
+++ b/cpp/src/Slice/Grammar.cpp
@@ -1,21 +1,19 @@
+/* A Bison parser, made by GNU Bison 3.0.2.  */
 
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* Bison implementation for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-   
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -28,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -46,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "3.0.2"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -60,23 +58,17 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
-/* Using locations.  */
-#define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
 #define yyparse         slice_parse
 #define yylex           slice_lex
 #define yyerror         slice_error
-#define yylval          slice_lval
-#define yychar          slice_char
 #define yydebug         slice_debug
 #define yynerrs         slice_nerrs
 
 
 /* Copy the first part of user declarations.  */
-
-/* Line 189 of yacc.c  */
-#line 1 "../Slice/Grammar.y"
+#line 1 "../Slice/Grammar.y" /* yacc.c:339  */
 
 
 // **********************************************************************
@@ -119,23 +111,24 @@ slice_error(const char* s)
 
     if (strcmp(s, "parse error") == 0)
     {
-	unit->error("syntax error");
+        unit->error("syntax error");
     }
     else
     {
-	unit->error(s);
+        unit->error(s);
     }
 }
 
 
+#line 124 "Grammar.tab.c" /* yacc.c:339  */
 
-/* Line 189 of yacc.c  */
-#line 134 "Grammar.tab.c"
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
@@ -145,78 +138,85 @@ slice_error(const char* s)
 # define YYERROR_VERBOSE 0
 #endif
 
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* In a future release of Bison, this section will be replaced
+   by #include "Grammar.tab.h".  */
+#ifndef YY_SLICE_GRAMMAR_TAB_H_INCLUDED
+# define YY_SLICE_GRAMMAR_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int slice_debug;
 #endif
 
-
-/* Tokens.  */
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ICE_MODULE = 258,
-     ICE_CLASS = 259,
-     ICE_INTERFACE = 260,
-     ICE_EXCEPTION = 261,
-     ICE_STRUCT = 262,
-     ICE_SEQUENCE = 263,
-     ICE_DICTIONARY = 264,
-     ICE_ENUM = 265,
-     ICE_OUT = 266,
-     ICE_EXTENDS = 267,
-     ICE_IMPLEMENTS = 268,
-     ICE_THROWS = 269,
-     ICE_VOID = 270,
-     ICE_BYTE = 271,
-     ICE_BOOL = 272,
-     ICE_SHORT = 273,
-     ICE_INT = 274,
-     ICE_LONG = 275,
-     ICE_FLOAT = 276,
-     ICE_DOUBLE = 277,
-     ICE_STRING = 278,
-     ICE_OBJECT = 279,
-     ICE_LOCAL_OBJECT = 280,
-     ICE_LOCAL = 281,
-     ICE_CONST = 282,
-     ICE_FALSE = 283,
-     ICE_TRUE = 284,
-     ICE_IDEMPOTENT = 285,
-     ICE_OPTIONAL = 286,
-     ICE_SCOPE_DELIMITER = 287,
-     ICE_IDENTIFIER = 288,
-     ICE_STRING_LITERAL = 289,
-     ICE_INTEGER_LITERAL = 290,
-     ICE_FLOATING_POINT_LITERAL = 291,
-     ICE_IDENT_OP = 292,
-     ICE_KEYWORD_OP = 293,
-     ICE_OPTIONAL_OP = 294,
-     ICE_METADATA_OPEN = 295,
-     ICE_METADATA_CLOSE = 296,
-     ICE_GLOBAL_METADATA_OPEN = 297,
-     ICE_GLOBAL_METADATA_CLOSE = 298,
-     BAD_CHAR = 299
-   };
+  enum yytokentype
+  {
+    ICE_MODULE = 258,
+    ICE_CLASS = 259,
+    ICE_INTERFACE = 260,
+    ICE_EXCEPTION = 261,
+    ICE_STRUCT = 262,
+    ICE_SEQUENCE = 263,
+    ICE_DICTIONARY = 264,
+    ICE_ENUM = 265,
+    ICE_OUT = 266,
+    ICE_EXTENDS = 267,
+    ICE_IMPLEMENTS = 268,
+    ICE_THROWS = 269,
+    ICE_VOID = 270,
+    ICE_BYTE = 271,
+    ICE_BOOL = 272,
+    ICE_SHORT = 273,
+    ICE_INT = 274,
+    ICE_LONG = 275,
+    ICE_FLOAT = 276,
+    ICE_DOUBLE = 277,
+    ICE_STRING = 278,
+    ICE_OBJECT = 279,
+    ICE_LOCAL_OBJECT = 280,
+    ICE_LOCAL = 281,
+    ICE_CONST = 282,
+    ICE_FALSE = 283,
+    ICE_TRUE = 284,
+    ICE_IDEMPOTENT = 285,
+    ICE_OPTIONAL = 286,
+    ICE_VALUE = 287,
+    ICE_SCOPE_DELIMITER = 288,
+    ICE_IDENTIFIER = 289,
+    ICE_STRING_LITERAL = 290,
+    ICE_INTEGER_LITERAL = 291,
+    ICE_FLOATING_POINT_LITERAL = 292,
+    ICE_IDENT_OP = 293,
+    ICE_KEYWORD_OP = 294,
+    ICE_OPTIONAL_OP = 295,
+    ICE_METADATA_OPEN = 296,
+    ICE_METADATA_CLOSE = 297,
+    ICE_GLOBAL_METADATA_OPEN = 298,
+    ICE_GLOBAL_METADATA_CLOSE = 299,
+    BAD_CHAR = 300
+  };
 #endif
 
-
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
-/* Copy the second part of user declarations.  */
 
+int slice_parse (void);
 
-/* Line 264 of yacc.c  */
-#line 220 "Grammar.tab.c"
+#endif /* !YY_SLICE_GRAMMAR_TAB_H_INCLUDED  */
+
+/* Copy the second part of user declarations.  */
+
+#line 220 "Grammar.tab.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -230,11 +230,8 @@ typedef unsigned char yytype_uint8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
 #else
-typedef short int yytype_int8;
+typedef signed char yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
@@ -254,8 +251,7 @@ typedef short int yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -266,42 +262,71 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
 #endif
 
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(n) (n)
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
 #else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
-    int yyi;
+# define YY_INITIAL_VALUE(Value) Value
 #endif
-{
-  return yyi;
-}
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
+
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
@@ -319,11 +344,11 @@ YYID (yyi)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -331,8 +356,8 @@ YYID (yyi)
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
        and a page size can be as small as 4096 bytes.  So we cannot safely
@@ -346,25 +371,23 @@ YYID (yyi)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
-	     && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined malloc && ! defined EXIT_SUCCESS
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined free && ! defined EXIT_SUCCESS
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
@@ -374,7 +397,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
@@ -392,79 +415,85 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
 
 #endif
 
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  13
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   886
+#define YYLAST   920
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  54
+#define YYNTOKENS  55
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  72
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  202
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  301
+#define YYNRULES  205
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  304
 
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   299
+#define YYMAXUTOK   300
 
-#define YYTRANSLATE(YYX)						\
+#define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,    48,    53,     2,    50,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,    45,
-      51,    49,    52,     2,     2,     2,     2,     2,     2,     2,
+       2,    49,    54,     2,    51,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,    46,
+      52,    50,    53,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    46,     2,    47,     2,     2,     2,     2,
+       2,     2,     2,    47,     2,    48,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -481,129 +510,39 @@ static const yytype_uint8 yytranslate[] =
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45
 };
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,     5,     9,    13,    14,    15,    19,    20,
-      26,    27,    32,    35,    36,    38,    40,    42,    44,    46,
-      48,    50,    52,    54,    56,    58,    60,    62,    63,    70,
-      73,    76,    79,    80,    88,    91,    92,    97,   101,   104,
-     105,   108,   112,   116,   119,   121,   124,   126,   128,   131,
-     134,   137,   138,   145,   150,   154,   157,   158,   160,   163,
-     166,   171,   176,   178,   181,   182,   191,   194,   195,   198,
-     199,   204,   208,   211,   212,   214,   218,   221,   223,   225,
-     229,   232,   237,   240,   242,   245,   247,   249,   252,   256,
-     259,   263,   264,   270,   271,   277,   279,   281,   284,   287,
-     290,   291,   299,   303,   305,   307,   310,   311,   316,   320,
-     323,   324,   326,   330,   332,   334,   336,   344,   352,   363,
-     374,   377,   380,   381,   388,   394,   398,   400,   402,   406,
-     408,   409,   411,   413,   415,   416,   417,   421,   427,   432,
-     439,   443,   449,   452,   453,   455,   458,   462,   464,   466,
-     468,   470,   472,   474,   476,   478,   480,   483,   485,   487,
-     490,   493,   495,   499,   501,   503,   504,   506,   508,   510,
-     512,   514,   516,   523,   529,   531,   533,   535,   537,   539,
-     541,   543,   545,   547,   549,   551,   553,   555,   557,   559,
-     561,   563,   565,   567,   569,   571,   573,   575,   577,   579,
-     581,   583,   585
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      55,     0,    -1,    58,    -1,    42,   121,    43,    -1,    40,
-     121,    41,    -1,    -1,    -1,    56,    59,    58,    -1,    -1,
-      57,    62,    60,    45,    58,    -1,    -1,     1,    45,    61,
-      58,    -1,    57,    62,    -1,    -1,    63,    -1,    83,    -1,
-      84,    -1,    98,    -1,    99,    -1,    66,    -1,    67,    -1,
-      76,    -1,    77,    -1,   107,    -1,   108,    -1,   110,    -1,
-     124,    -1,    -1,     3,    33,    64,    46,    58,    47,    -1,
-       6,    33,    -1,     6,   125,    -1,   122,    65,    -1,    -1,
-     122,    65,    69,    68,    46,    70,    47,    -1,    12,   118,
-      -1,    -1,    57,    74,    45,    70,    -1,     1,    45,    70,
-      -1,    57,    74,    -1,    -1,   119,    33,    -1,    39,    35,
-      48,    -1,    39,   118,    48,    -1,    39,    48,    -1,    31,
-      -1,    72,    71,    -1,    71,    -1,    89,    -1,     7,    33,
-      -1,     7,   125,    -1,   122,    75,    -1,    -1,   122,    75,
-      78,    46,    79,    47,    -1,    57,    80,    45,    79,    -1,
-       1,    45,    79,    -1,    57,    80,    -1,    -1,    90,    -1,
-       4,    33,    -1,     4,   125,    -1,     4,    37,    35,    48,
-      -1,     4,    37,   118,    48,    -1,    81,    -1,   122,    81,
-      -1,    -1,   122,    82,    86,    87,    85,    46,    88,    47,
-      -1,    12,   118,    -1,    -1,    13,   101,    -1,    -1,    57,
-      96,    45,    88,    -1,     1,    45,    88,    -1,    57,    96,
-      -1,    -1,    73,    -1,    73,    49,   123,    -1,   119,   125,
-      -1,   119,    -1,    71,    -1,    71,    49,   123,    -1,    72,
-      71,    -1,    72,    71,    49,   123,    -1,   119,   125,    -1,
-     119,    -1,    72,   119,    -1,   119,    -1,    15,    -1,    91,
-      37,    -1,    30,    91,    37,    -1,    91,    38,    -1,    30,
-      91,    38,    -1,    -1,    92,   116,    48,    94,   117,    -1,
-      -1,    92,     1,    48,    95,   117,    -1,    89,    -1,    93,
-      -1,     5,    33,    -1,     5,   125,    -1,   122,    97,    -1,
-      -1,   122,    97,   102,   100,    46,   103,    47,    -1,   118,
-      50,   101,    -1,   118,    -1,    24,    -1,    12,   101,    -1,
-      -1,    57,   104,    45,   103,    -1,     1,    45,   103,    -1,
-      57,   104,    -1,    -1,    93,    -1,   106,    50,   105,    -1,
-     106,    -1,   118,    -1,   125,    -1,   122,     8,    51,    57,
-     119,    52,    33,    -1,   122,     8,    51,    57,   119,    52,
-     125,    -1,   122,     9,    51,    57,   119,    50,    57,   119,
-      52,    33,    -1,   122,     9,    51,    57,   119,    50,    57,
-     119,    52,   125,    -1,    10,    33,    -1,    10,   125,    -1,
-      -1,   122,   109,   111,    46,   112,    47,    -1,   122,    10,
-      46,   112,    47,    -1,   113,    50,   112,    -1,   113,    -1,
-      33,    -1,    33,    49,   114,    -1,   125,    -1,    -1,    35,
-      -1,   118,    -1,    11,    -1,    -1,    -1,   115,    57,    73,
-      -1,   116,    50,   115,    57,    73,    -1,   115,    57,   119,
-     125,    -1,   116,    50,   115,    57,   119,   125,    -1,   115,
-      57,   119,    -1,   116,    50,   115,    57,   119,    -1,    14,
-     105,    -1,    -1,    33,    -1,    32,    33,    -1,   118,    32,
-      33,    -1,    16,    -1,    17,    -1,    18,    -1,    19,    -1,
-      20,    -1,    21,    -1,    22,    -1,    23,    -1,    24,    -1,
-      24,    53,    -1,    25,    -1,   118,    -1,   118,    53,    -1,
-      34,   120,    -1,    34,    -1,   121,    50,   120,    -1,   120,
-      -1,    26,    -1,    -1,    35,    -1,    36,    -1,   118,    -1,
-      34,    -1,    28,    -1,    29,    -1,    27,    57,   119,    33,
-      49,   123,    -1,    27,    57,   119,    49,   123,    -1,     3,
-      -1,     4,    -1,     5,    -1,     6,    -1,     7,    -1,     8,
-      -1,     9,    -1,    10,    -1,    11,    -1,    12,    -1,    13,
-      -1,    14,    -1,    15,    -1,    16,    -1,    17,    -1,    18,
-      -1,    19,    -1,    20,    -1,    21,    -1,    22,    -1,    23,
-      -1,    24,    -1,    25,    -1,    26,    -1,    27,    -1,    28,
-      -1,    29,    -1,    30,    -1,    31,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   114,   114,   122,   131,   136,   145,   144,   154,   153,
-     164,   163,   168,   173,   180,   184,   188,   192,   196,   200,
-     204,   208,   212,   216,   220,   224,   228,   238,   237,   271,
-     275,   286,   297,   296,   323,   332,   340,   349,   352,   357,
-     364,   377,   397,   453,   461,   474,   482,   497,   503,   507,
-     518,   529,   528,   570,   579,   582,   587,   594,   600,   604,
-     615,   640,   705,   717,   731,   730,   770,   805,   813,   818,
-     826,   835,   838,   843,   850,   872,   899,   921,   947,   956,
-     967,   976,   985,   995,  1009,  1015,  1023,  1035,  1059,  1084,
-    1108,  1139,  1138,  1161,  1160,  1183,  1184,  1190,  1194,  1205,
-    1220,  1219,  1254,  1289,  1324,  1334,  1339,  1347,  1356,  1359,
-    1364,  1371,  1377,  1384,  1396,  1408,  1419,  1428,  1443,  1454,
-    1471,  1475,  1487,  1486,  1510,  1525,  1531,  1539,  1551,  1574,
-    1582,  1591,  1595,  1634,  1641,  1652,  1654,  1670,  1686,  1698,
-    1710,  1721,  1737,  1742,  1750,  1753,  1759,  1772,  1776,  1780,
-    1784,  1788,  1792,  1796,  1800,  1804,  1808,  1812,  1816,  1835,
-    1876,  1882,  1890,  1897,  1909,  1916,  1926,  1939,  1952,  1998,
-    2009,  2020,  2036,  2045,  2059,  2062,  2065,  2068,  2071,  2074,
-    2077,  2080,  2083,  2086,  2089,  2092,  2095,  2098,  2101,  2104,
-    2107,  2110,  2113,  2116,  2119,  2122,  2125,  2128,  2131,  2134,
-    2137,  2140,  2143
+       0,   115,   115,   123,   132,   137,   146,   145,   155,   154,
+     165,   164,   169,   174,   181,   185,   189,   193,   197,   201,
+     205,   209,   213,   217,   221,   225,   229,   239,   238,   272,
+     276,   287,   298,   297,   324,   333,   341,   350,   353,   358,
+     365,   378,   398,   454,   462,   475,   483,   498,   504,   508,
+     519,   530,   529,   571,   580,   583,   588,   595,   601,   605,
+     616,   641,   706,   718,   732,   731,   771,   806,   814,   819,
+     827,   836,   839,   844,   851,   873,   900,   922,   948,   957,
+     968,   977,   986,   996,  1010,  1016,  1024,  1036,  1060,  1085,
+    1109,  1140,  1139,  1162,  1161,  1184,  1185,  1191,  1195,  1206,
+    1221,  1220,  1255,  1290,  1325,  1330,  1340,  1345,  1353,  1362,
+    1365,  1370,  1377,  1383,  1390,  1402,  1414,  1425,  1434,  1449,
+    1460,  1477,  1481,  1493,  1492,  1516,  1531,  1537,  1545,  1557,
+    1580,  1588,  1597,  1601,  1640,  1647,  1658,  1660,  1676,  1692,
+    1704,  1716,  1727,  1743,  1748,  1756,  1759,  1765,  1778,  1782,
+    1786,  1790,  1794,  1798,  1802,  1806,  1810,  1814,  1818,  1822,
+    1826,  1845,  1886,  1892,  1900,  1907,  1919,  1926,  1936,  1949,
+    1962,  2008,  2019,  2030,  2046,  2055,  2069,  2072,  2075,  2078,
+    2081,  2084,  2087,  2090,  2093,  2096,  2099,  2102,  2105,  2108,
+    2111,  2114,  2117,  2120,  2123,  2126,  2129,  2132,  2135,  2138,
+    2141,  2144,  2147,  2150,  2153,  2156
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
@@ -614,7 +553,7 @@ static const char *const yytname[] =
   "ICE_THROWS", "ICE_VOID", "ICE_BYTE", "ICE_BOOL", "ICE_SHORT", "ICE_INT",
   "ICE_LONG", "ICE_FLOAT", "ICE_DOUBLE", "ICE_STRING", "ICE_OBJECT",
   "ICE_LOCAL_OBJECT", "ICE_LOCAL", "ICE_CONST", "ICE_FALSE", "ICE_TRUE",
-  "ICE_IDEMPOTENT", "ICE_OPTIONAL", "ICE_SCOPE_DELIMITER",
+  "ICE_IDEMPOTENT", "ICE_OPTIONAL", "ICE_VALUE", "ICE_SCOPE_DELIMITER",
   "ICE_IDENTIFIER", "ICE_STRING_LITERAL", "ICE_INTEGER_LITERAL",
   "ICE_FLOATING_POINT_LITERAL", "ICE_IDENT_OP", "ICE_KEYWORD_OP",
   "ICE_OPTIONAL_OP", "ICE_METADATA_OPEN", "ICE_METADATA_CLOSE",
@@ -635,495 +574,456 @@ static const char *const yytname[] =
   "dictionary_def", "enum_id", "enum_def", "@11", "enumerator_list",
   "enumerator", "enumerator_initializer", "out_qualifier", "parameters",
   "throws", "scoped_name", "type", "string_literal", "string_list",
-  "local_qualifier", "const_initializer", "const_def", "keyword", 0
+  "local_qualifier", "const_initializer", "const_def", "keyword", YY_NULLPTR
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,    59,   123,   125,    41,    61,
-      44,    60,    62,    42
+     295,   296,   297,   298,   299,   300,    59,   123,   125,    41,
+      61,    44,    60,    62,    42
 };
 # endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    54,    55,    56,    57,    57,    59,    58,    60,    58,
-      61,    58,    58,    58,    62,    62,    62,    62,    62,    62,
-      62,    62,    62,    62,    62,    62,    62,    64,    63,    65,
-      65,    66,    68,    67,    69,    69,    70,    70,    70,    70,
-      71,    72,    72,    72,    72,    73,    73,    74,    75,    75,
-      76,    78,    77,    79,    79,    79,    79,    80,    81,    81,
-      82,    82,    82,    83,    85,    84,    86,    86,    87,    87,
-      88,    88,    88,    88,    89,    89,    89,    89,    90,    90,
-      90,    90,    90,    90,    91,    91,    91,    92,    92,    92,
-      92,    94,    93,    95,    93,    96,    96,    97,    97,    98,
-     100,    99,   101,   101,   101,   102,   102,   103,   103,   103,
-     103,   104,   105,   105,   106,   106,   107,   107,   108,   108,
-     109,   109,   111,   110,   110,   112,   112,   113,   113,   113,
-     113,   114,   114,   115,   115,   116,   116,   116,   116,   116,
-     116,   116,   117,   117,   118,   118,   118,   119,   119,   119,
-     119,   119,   119,   119,   119,   119,   119,   119,   119,   119,
-     120,   120,   121,   121,   122,   122,   123,   123,   123,   123,
-     123,   123,   124,   124,   125,   125,   125,   125,   125,   125,
-     125,   125,   125,   125,   125,   125,   125,   125,   125,   125,
-     125,   125,   125,   125,   125,   125,   125,   125,   125,   125,
-     125,   125,   125
-};
+#define YYPACT_NINF -221
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-221)))
+
+#define YYTABLE_NINF -137
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int16 yypact[] =
 {
-       0,     2,     1,     3,     3,     0,     0,     3,     0,     5,
-       0,     4,     2,     0,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     0,     6,     2,
-       2,     2,     0,     7,     2,     0,     4,     3,     2,     0,
-       2,     3,     3,     2,     1,     2,     1,     1,     2,     2,
-       2,     0,     6,     4,     3,     2,     0,     1,     2,     2,
-       4,     4,     1,     2,     0,     8,     2,     0,     2,     0,
-       4,     3,     2,     0,     1,     3,     2,     1,     1,     3,
-       2,     4,     2,     1,     2,     1,     1,     2,     3,     2,
-       3,     0,     5,     0,     5,     1,     1,     2,     2,     2,
-       0,     7,     3,     1,     1,     2,     0,     4,     3,     2,
-       0,     1,     3,     1,     1,     1,     7,     7,    10,    10,
-       2,     2,     0,     6,     5,     3,     1,     1,     3,     1,
-       0,     1,     1,     1,     0,     0,     3,     5,     4,     6,
-       3,     5,     2,     0,     1,     2,     3,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     1,     1,     2,
-       2,     1,     3,     1,     1,     0,     1,     1,     1,     1,
-       1,     1,     6,     5,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1
+     523,   -16,     2,     2,    34,  -221,    19,  -221,  -221,     2,
+    -221,    24,   -15,  -221,   115,    43,  -221,    40,    39,  -221,
+    -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,
+    -221,   124,  -221,   115,  -221,  -221,     2,  -221,  -221,  -221,
+     221,    65,   601,   669,   701,   733,    60,    61,   488,     3,
+      79,     9,   123,     4,  -221,  -221,  -221,    89,  -221,  -221,
+    -221,  -221,  -221,  -221,  -221,  -221,    83,  -221,  -221,   104,
+    -221,     6,   -10,   115,  -221,  -221,  -221,  -221,  -221,  -221,
+    -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,
+    -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,
+    -221,  -221,  -221,  -221,  -221,    -1,  -221,  -221,  -221,  -221,
+    -221,  -221,  -221,    40,    40,  -221,   765,  -221,    46,  -221,
+      93,    46,   130,    59,  -221,   100,   442,  -221,  -221,   114,
+    -221,    99,    66,  -221,   101,    10,   221,   221,   102,   103,
+     106,  -221,   120,   108,   362,   120,    59,  -221,  -221,  -221,
+    -221,    -7,   112,   765,   116,  -221,    66,  -221,  -221,  -221,
+    -221,  -221,   120,  -221,  -221,  -221,   117,   118,    54,  -221,
+     765,   396,   119,   880,   125,  -221,   121,    59,   294,   127,
+    -221,  -221,   797,    40,  -221,  -221,   120,  -221,   126,   880,
+     131,   362,  -221,    35,   128,   221,   134,  -221,   829,  -221,
+     328,  -221,   136,   440,   137,  -221,  -221,  -221,   221,   396,
+    -221,   221,   138,   141,  -221,   829,  -221,  -221,   122,  -221,
+      29,    66,   139,   133,   362,  -221,  -221,   144,   440,   143,
+     294,  -221,   521,   221,    67,   257,  -221,   147,  -221,  -221,
+     142,  -221,  -221,    66,   396,  -221,  -221,  -221,  -221,    66,
+    -221,   328,   221,  -221,  -221,   148,   564,  -221,  -221,    69,
+    -221,  -221,  -221,   135,  -221,    40,    23,   294,   861,  -221,
+    -221,  -221,  -221,   133,   328,  -221,  -221,  -221,   880,  -221,
+     185,  -221,  -221,  -221,  -221,   184,  -221,   829,   184,    40,
+     637,  -221,  -221,  -221,   880,  -221,   149,   120,  -221,  -221,
+     829,   637,  -221,  -221
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       0,     0,     0,     0,     0,     6,   165,     2,    10,   161,
-     163,     0,     0,     1,     0,     0,   164,     5,    12,    14,
+       0,     0,     0,     0,     0,     6,   167,     2,    10,   163,
+     165,     0,     0,     1,     0,     0,   166,     5,    12,    14,
       19,    20,    21,    22,    15,    16,    17,    18,    23,    24,
-      25,     0,    26,     0,   160,     4,     0,     3,     7,    27,
+      25,     0,    26,     0,   162,     4,     0,     3,     7,    27,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    31,
-      50,    62,    67,    99,   122,    11,   162,     0,   147,   148,
-     149,   150,   151,   152,   153,   154,   155,   157,     0,   144,
-     158,     0,     0,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,    58,     0,    59,    97,    98,    29,    30,    48,
-      49,     5,     5,   120,   130,   121,     0,    32,     0,     0,
-      69,     0,   100,     0,     0,   156,   145,     0,   159,     0,
-       0,     9,     0,     0,     0,     0,   127,     0,   126,   129,
-      34,     0,     0,    66,     0,    64,   104,   105,   103,     0,
-     130,     0,   146,     0,   170,   171,   169,   166,   167,   168,
-     173,    60,    61,     0,     0,     0,   124,   130,     0,     0,
-       0,     0,    68,     0,     0,     0,     0,    28,   172,     0,
-       5,   131,   128,   132,   125,     0,     0,     0,     0,    44,
-       0,    78,     0,    55,    57,    83,    52,     0,   102,     0,
-       0,     0,   123,   116,   117,     0,     0,    46,     0,    74,
-      38,    47,    77,    33,    54,     0,    43,     0,     0,    80,
-       0,     0,    40,    82,     0,     0,     0,     0,    86,     0,
-       0,     0,     0,   111,   109,    85,   101,     0,    37,    45,
-       0,     0,    76,    41,    42,    79,     0,    53,     0,     0,
-      95,    96,    72,    77,    65,   108,     0,    84,    87,    89,
-       0,   133,     5,     0,     0,     0,    75,    36,    81,    71,
-      84,     0,    88,    90,    93,     0,    91,   134,   107,   118,
-     119,    70,   143,   136,   140,   143,     5,     0,    94,   138,
-      92,     0,   142,   113,   114,   115,   137,   141,     0,   139,
-     112
-};
-
-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
-{
-      -1,     4,     5,     6,     7,    14,    41,    33,    18,    19,
-      57,    49,    20,    21,   141,   117,   187,   207,   208,   209,
-     210,    50,    22,    23,   118,   171,   193,    51,    52,    24,
-      25,   173,   120,   145,   226,   211,   194,   231,   232,   233,
-     285,   282,   252,    53,    26,    27,   149,   147,   122,   201,
-     234,   292,   293,    28,    29,    54,    30,   123,   137,   138,
-     182,   262,   263,   288,    70,   220,    10,    11,    31,   160,
-      32,   139
+      50,    62,    67,    99,   123,    11,   164,     0,   148,   149,
+     150,   151,   152,   153,   154,   155,   156,   158,   159,     0,
+     145,   160,     0,     0,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,    58,     0,    59,    97,    98,    29,
+      30,    48,    49,     5,     5,   121,   131,   122,     0,    32,
+       0,     0,    69,     0,   100,     0,     0,   157,   146,     0,
+     161,     0,     0,     9,     0,     0,     0,     0,   128,     0,
+     127,   130,    34,     0,     0,    66,     0,    64,   104,   105,
+     106,   103,     0,   131,     0,   147,     0,   172,   173,   171,
+     168,   169,   170,   175,    60,    61,     0,     0,     0,   125,
+     131,     0,     0,     0,     0,    68,     0,     0,     0,     0,
+      28,   174,     0,     5,   132,   129,   133,   126,     0,     0,
+       0,     0,    44,     0,    78,     0,    55,    57,    83,    52,
+       0,   102,     0,     0,     0,   124,   117,   118,     0,     0,
+      46,     0,    74,    38,    47,    77,    33,    54,     0,    43,
+       0,     0,    80,     0,     0,    40,    82,     0,     0,     0,
+       0,    86,     0,     0,     0,     0,   112,   110,    85,   101,
+       0,    37,    45,     0,     0,    76,    41,    42,    79,     0,
+      53,     0,     0,    95,    96,    72,    77,    65,   109,     0,
+      84,    87,    89,     0,   134,     5,     0,     0,     0,    75,
+      36,    81,    71,    84,     0,    88,    90,    93,     0,    91,
+     135,   108,   119,   120,    70,   144,   137,   141,   144,     5,
+       0,    94,   139,    92,     0,   143,   114,   115,   116,   138,
+     142,     0,   140,   113
 };
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -227
-static const yytype_int16 yypact[] =
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
 {
-     126,   -16,     4,     4,    65,  -227,    21,  -227,  -227,     4,
-    -227,   -10,   -11,  -227,    73,    38,  -227,    46,    58,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,   291,  -227,    73,  -227,  -227,     4,  -227,  -227,  -227,
-     853,    61,   559,   625,   656,   687,    59,    63,   479,     6,
-      77,     9,    99,    11,  -227,  -227,  -227,    82,  -227,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,    84,  -227,   106,  -227,
-       5,    26,    73,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,    29,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,    46,    46,  -227,   718,  -227,     1,  -227,    94,     1,
-     129,     3,  -227,   100,   434,  -227,  -227,   112,  -227,    98,
-     158,  -227,   101,    37,   853,   853,   105,   103,   110,  -227,
-     116,   109,   356,   116,     3,  -227,  -227,  -227,    -6,   115,
-     718,   117,  -227,   158,  -227,  -227,  -227,  -227,  -227,   116,
-    -227,  -227,  -227,   104,   119,    86,  -227,   718,   389,   120,
-     829,   123,  -227,   121,     3,   290,   125,  -227,  -227,   749,
-      46,  -227,  -227,   116,  -227,   130,   829,   132,   356,  -227,
-      69,   113,   853,   131,  -227,   780,  -227,   323,  -227,   136,
-     432,   135,  -227,  -227,  -227,   853,   389,  -227,   853,   128,
-     138,  -227,   780,  -227,  -227,   140,  -227,    57,   158,   146,
-     151,   356,  -227,  -227,   152,   432,   153,   290,  -227,   219,
-     853,    54,   254,  -227,   154,  -227,  -227,   149,  -227,  -227,
-     158,   389,  -227,  -227,  -227,  -227,   158,  -227,   323,   853,
-    -227,  -227,   160,   523,  -227,  -227,    60,  -227,  -227,  -227,
-     159,  -227,    46,    74,   290,   811,  -227,  -227,  -227,  -227,
-     151,   323,  -227,  -227,  -227,   829,  -227,   195,  -227,  -227,
-    -227,  -227,   194,  -227,   780,   194,    46,   594,  -227,  -227,
-    -227,   829,  -227,   161,   116,  -227,  -227,   780,   594,  -227,
-    -227
+    -221,  -221,  -221,   -17,   -12,  -221,  -221,  -221,  -221,  -221,
+    -221,  -221,  -221,  -221,  -221,  -221,  -191,  -170,  -165,  -208,
+    -221,  -221,  -221,  -221,  -221,  -168,  -221,  -221,  -221,  -221,
+    -221,  -221,  -221,  -221,  -220,   -29,  -221,   -30,  -221,   -25,
+    -221,  -221,  -221,  -221,  -221,  -221,  -221,  -119,  -221,  -218,
+    -221,   -97,  -221,  -221,  -221,  -221,  -221,  -221,  -105,  -221,
+    -221,   -72,  -221,   -79,  -104,   -27,    11,   207,  -221,  -145,
+    -221,   -38
 };
 
-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
 {
-    -227,  -227,  -227,   -17,   -12,  -227,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,  -191,  -162,  -159,  -182,
-    -227,  -227,  -227,  -227,  -227,  -168,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,  -227,  -226,   -13,  -227,   -20,  -227,    -9,
-    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -119,  -227,  -215,
-    -227,   -85,  -227,  -227,  -227,  -227,  -227,  -227,   -83,  -227,
-    -227,   -63,  -227,   -68,  -102,   -27,     7,   215,  -227,  -150,
-    -227,   -38
+      -1,     4,     5,     6,     7,    14,    41,    33,    18,    19,
+      57,    49,    20,    21,   143,   119,   190,   210,   211,   212,
+     213,    50,    22,    23,   120,   174,   196,    51,    52,    24,
+      25,   176,   122,   147,   229,   214,   197,   234,   235,   236,
+     288,   285,   255,    53,    26,    27,   152,   150,   124,   204,
+     237,   295,   296,    28,    29,    54,    30,   125,   139,   140,
+     185,   265,   266,   291,    71,   223,    10,    11,    31,   163,
+      32,   141
 };
 
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -136
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-      40,   133,    38,   178,   104,   106,   108,   110,   191,   -63,
-     115,   192,   255,    71,   140,   238,    34,   143,   116,   148,
-     214,    55,   269,   121,    15,   172,   127,   146,   159,     8,
-     219,    35,    37,    68,    69,    68,    69,   127,     9,    36,
-      36,   230,   148,    56,   174,   281,   239,    16,    17,   278,
-     267,   159,   -35,   247,   -63,   198,   -63,  -106,   128,   129,
-     131,    68,    69,   183,   132,    13,   249,   176,   245,   127,
-     230,    39,   148,   -13,     1,   130,    -5,    -5,    -5,    -5,
-      -5,    -5,    -5,    -5,   184,   162,     2,   239,   217,   127,
-     266,   258,   259,   283,   134,   135,   268,   272,   273,    -5,
-      -5,    68,    69,    -8,   215,   244,    72,   163,   164,   296,
-     111,   119,   151,     2,   112,     3,   159,   216,    68,    69,
-     -13,   181,   276,   -51,   277,   170,   -13,     1,   124,    -5,
-      -5,    -5,    -5,    -5,    -5,    -5,    -5,   125,   159,   126,
-     142,   204,   144,   195,   159,   152,   150,   153,   127,   161,
-     166,   186,    -5,    -5,   165,   168,   179,   223,   200,   212,
-     167,   175,   218,   205,   177,   188,     2,   197,     3,   180,
-     196,   170,   202,   235,   242,   206,   221,   240,   237,   213,
-     225,   227,   236,   241,   222,   294,   154,   155,   243,   186,
-      68,    69,   156,   157,   158,   246,   294,   248,   253,   264,
-     254,   265,   235,   257,   170,   271,   261,   274,   287,   256,
-     200,   298,   250,   300,   286,   242,   251,   290,    12,     0,
-       0,     0,   270,     0,   186,     0,     0,   280,     0,     0,
-       0,   225,     0,     0,   228,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,   275,   289,   200,   284,   295,
-     189,    68,    69,     0,   225,   260,     0,     0,   190,   299,
-     295,     0,     0,     0,   297,   261,     0,     0,     0,   291,
-    -134,  -134,  -134,  -134,  -134,  -134,  -134,  -134,  -134,  -134,
-       0,     0,     0,     0,     0,  -134,  -134,  -134,     0,     0,
-       0,   199,     0,  -134,  -134,    42,    43,    44,    45,    46,
-      47,    48,  -135,     0,  -135,    -5,    -5,    -5,    -5,    -5,
-      -5,    -5,    -5,    -5,    -5,    -5,     0,     0,     0,     0,
-      -5,    -5,    -5,    -5,   224,     0,     0,     0,     0,    -5,
-       2,     0,     0,     0,     0,     0,     0,  -110,    -5,    -5,
-      -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,     0,
-       0,     0,     0,    -5,    -5,    -5,    -5,   169,     0,     0,
+      40,   135,    38,   194,   106,   108,   110,   112,   195,   -63,
+     117,   181,   258,    72,   142,   118,   123,   145,   241,   151,
+      34,    55,    15,   217,   131,   222,   129,   175,   162,    37,
+       8,   272,    69,    70,    13,   134,    36,     9,   233,   129,
+     132,   242,   151,   129,   177,    16,    17,    56,   179,   281,
+     -35,  -107,   162,   270,   284,   -63,   250,   -63,   201,   165,
+     130,   133,   129,   252,   186,   187,    35,   233,    69,    70,
+     286,   218,   279,   151,   280,    36,   248,    39,   247,    69,
+      70,     2,   242,   148,   219,    -8,   299,    69,    70,   220,
+     184,   149,    69,    70,   157,   158,   136,   137,   269,    69,
+      70,   159,   160,   161,   271,   261,   262,   275,   276,   166,
+     167,    73,   113,   114,   154,   -13,     1,   162,    -5,    -5,
+      -5,    -5,    -5,    -5,    -5,    -5,   -51,   173,    42,    43,
+      44,    45,    46,    47,    48,   121,   126,   127,   128,   162,
+     144,    -5,    -5,   146,   207,   162,   198,   153,   155,   156,
+     164,   169,   168,   129,   189,   171,     2,   170,     3,   178,
+     226,   203,   215,   -13,   180,   191,   208,   225,   200,   183,
+     182,   246,   209,   199,   173,   205,   238,   245,   221,   216,
+     224,   240,   230,   228,   277,   239,   297,   244,   243,   249,
+     251,   257,   189,   267,   274,   268,   264,   297,   290,   253,
+     301,   256,   259,   254,   303,   238,   260,   173,   289,   293,
+      12,     0,     0,   203,     0,     0,     0,     0,   245,     0,
+       0,     0,     0,     0,     0,   273,     0,   189,     0,     0,
+     283,     0,     0,     0,   228,     0,     0,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,     0,   278,   292,
+     203,   287,   298,    68,    69,    70,     0,   228,   263,     0,
+       0,     0,   302,   298,     0,     0,     0,   300,   264,     0,
+       0,     0,   294,  -135,  -135,  -135,  -135,  -135,  -135,  -135,
+    -135,  -135,  -135,     0,     0,     0,     0,     0,  -135,  -135,
+    -135,  -135,     0,     0,     0,   202,     0,  -135,  -135,     0,
+       0,     0,     0,     0,     0,     0,  -136,     0,  -136,    -5,
+      -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,
+       0,     0,     0,     0,    -5,    -5,    -5,    -5,    -5,   227,
+       0,     0,     0,     0,    -5,     2,     0,     0,     0,     0,
+       0,     0,  -111,    -5,    -5,    -5,    -5,    -5,    -5,    -5,
+      -5,    -5,    -5,    -5,     0,     0,     0,     0,    -5,    -5,
+      -5,    -5,    -5,   172,     0,     0,     0,     0,    -5,     2,
+       0,     0,     0,     0,     0,     0,   -73,     0,    -5,    -5,
+      -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,     0,     0,
+       0,     0,     0,    -5,    -5,    -5,    -5,   188,     0,     0,
        0,     0,    -5,     2,     0,     0,     0,     0,     0,     0,
-     -73,     0,    -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,
+     -56,     0,    -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,
       -5,    -5,     0,     0,     0,     0,     0,    -5,    -5,    -5,
-     185,     0,     0,     0,     0,    -5,     2,     0,     0,     0,
-       0,     0,     0,   -56,     0,    -5,    -5,    -5,    -5,    -5,
-      -5,    -5,    -5,    -5,    -5,     0,     0,     0,     0,     0,
-      -5,    -5,    -5,     0,     0,     0,     0,     0,    -5,     2,
-       0,     0,     0,     0,     0,     1,   -39,    -5,    -5,    -5,
-      -5,    -5,    -5,    -5,    -5,     0,     0,   228,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    67,     0,     0,
-      -5,    -5,   229,   189,    68,    69,     0,     0,     0,     0,
-       0,   190,     0,     0,     2,     0,     3,     0,     0,     0,
-       0,   -13,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,     0,   113,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   114,    73,    74,    75,    76,
+      -5,     0,     0,     0,     0,     0,    -5,     2,     0,     0,
+       0,     0,     0,     1,   -39,    -5,    -5,    -5,    -5,    -5,
+      -5,    -5,    -5,     0,     0,   231,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,     0,     0,    -5,    -5,
+     232,   192,    68,    69,    70,     0,     0,     0,     0,     0,
+     193,     0,     0,     2,     0,     3,     0,     0,     0,     0,
+     -13,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+     103,     0,   115,   -13,     1,     0,    -5,    -5,    -5,    -5,
+      -5,    -5,    -5,    -5,     0,   116,   231,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,     0,     0,    -5,
+      -5,     0,   192,    68,    69,    70,     0,     0,     0,     0,
+       0,   193,     0,     0,     2,     0,     3,    74,    75,    76,
       77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
       87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,     0,   222,     0,     0,     0,
-     -85,   -85,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,     0,   102,     0,     0,     0,   103,    73,    74,    75,
+      97,    98,    99,   100,   101,   102,   103,     0,   225,     0,
+       0,     0,   -85,   -85,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,     0,   104,     0,     0,     0,   105,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+      69,    70,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,     0,   107,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,     0,   109,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,     0,   111,    74,    75,
       76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
       86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,    68,    69,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,     0,   105,    73,
+      96,    97,    98,    99,   100,   101,   102,   103,     0,   138,
       74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
       84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,     0,   107,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,     0,
-     109,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+       0,   206,    74,    75,    76,    77,    78,    79,    80,    81,
       82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
       92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
-       0,   136,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,     0,   203,    73,    74,    75,    76,    77,    78,    79,
+     102,   103,     0,   225,    74,    75,    76,    77,    78,    79,
       80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
       90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,   101,     0,   222,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,     0,   279,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,     0,     0,     0,     0,     0,
-     189,    68,    69,     0,     0,     0,     0,     0,   190,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,     0,
-       0,     0,     0,     0,     0,    68,    69
+     100,   101,   102,   103,     0,   282,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,     0,     0,     0,     0,
+       0,   192,    68,    69,    70,     0,     0,     0,     0,     0,
+     193
 };
 
 static const yytype_int16 yycheck[] =
 {
-      17,   103,    14,   153,    42,    43,    44,    45,   170,     0,
-      48,   170,   227,    40,   116,   206,     9,   119,    12,   121,
-     188,    33,   248,    12,     3,   144,    32,    24,   130,    45,
-     192,    41,    43,    32,    33,    32,    33,    32,    34,    50,
-      50,   200,   144,    36,    50,   271,   208,    26,    27,   264,
-     241,   153,    46,   221,    45,   174,    47,    46,    53,    33,
-      72,    32,    33,   165,    35,     0,   225,   150,   218,    32,
-     229,    33,   174,     0,     1,    49,     3,     4,     5,     6,
-       7,     8,     9,    10,   167,    48,    40,   249,   190,    32,
-     240,    37,    38,   275,   111,   112,   246,    37,    38,    26,
-      27,    32,    33,    45,    35,    48,    45,   134,   135,   291,
-      51,    12,   124,    40,    51,    42,   218,    48,    32,    33,
-      47,    35,    48,    46,    50,   142,     0,     1,    46,     3,
-       4,     5,     6,     7,     8,     9,    10,    53,   240,    33,
-      46,   179,    13,   170,   246,    33,    46,    49,    32,    48,
-      47,   168,    26,    27,    49,    46,    52,   195,   175,   186,
-      50,    46,    49,   180,    47,    45,    40,    46,    42,    50,
-      47,   188,    47,   200,   212,    45,    45,    49,   205,    47,
-     197,    45,    47,    45,    33,   287,    28,    29,    48,   206,
-      32,    33,    34,    35,    36,    49,   298,    45,   225,    45,
-      47,    52,   229,   230,   221,    45,    11,    48,    14,   229,
-     227,    50,   225,   298,   277,   253,   225,   285,     3,    -1,
-      -1,    -1,   249,    -1,   241,    -1,    -1,   265,    -1,    -1,
-      -1,   248,    -1,    -1,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,   262,   284,   264,   275,   287,
-      31,    32,    33,    -1,   271,     1,    -1,    -1,    39,   297,
-     298,    -1,    -1,    -1,   291,    11,    -1,    -1,    -1,   286,
+      17,   105,    14,   173,    42,    43,    44,    45,   173,     0,
+      48,   156,   230,    40,   118,    12,    12,   121,   209,   123,
+       9,    33,     3,   191,    34,   195,    33,   146,   132,    44,
+      46,   251,    33,    34,     0,    36,    51,    35,   203,    33,
+      50,   211,   146,    33,    51,    26,    27,    36,   153,   267,
+      47,    47,   156,   244,   274,    46,   224,    48,   177,    49,
+      54,    73,    33,   228,   168,   170,    42,   232,    33,    34,
+     278,    36,    49,   177,    51,    51,   221,    34,    49,    33,
+      34,    41,   252,    24,    49,    46,   294,    33,    34,   193,
+      36,    32,    33,    34,    28,    29,   113,   114,   243,    33,
+      34,    35,    36,    37,   249,    38,    39,    38,    39,   136,
+     137,    46,    52,    52,   126,     0,     1,   221,     3,     4,
+       5,     6,     7,     8,     9,    10,    47,   144,     4,     5,
+       6,     7,     8,     9,    10,    12,    47,    54,    34,   243,
+      47,    26,    27,    13,   182,   249,   173,    47,    34,    50,
+      49,    48,    50,    33,   171,    47,    41,    51,    43,    47,
+     198,   178,   189,    48,    48,    46,   183,    34,    47,    51,
+      53,    49,    46,    48,   191,    48,   203,   215,    50,    48,
+      46,   208,    46,   200,    49,    48,   290,    46,    50,    50,
+      46,    48,   209,    46,    46,    53,    11,   301,    14,   228,
+      51,   228,   232,   228,   301,   232,   233,   224,   280,   288,
+       3,    -1,    -1,   230,    -1,    -1,    -1,    -1,   256,    -1,
+      -1,    -1,    -1,    -1,    -1,   252,    -1,   244,    -1,    -1,
+     268,    -1,    -1,    -1,   251,    -1,    -1,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    -1,   265,   287,
+     267,   278,   290,    32,    33,    34,    -1,   274,     1,    -1,
+      -1,    -1,   300,   301,    -1,    -1,    -1,   294,    11,    -1,
+      -1,    -1,   289,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    -1,    -1,    -1,    -1,    -1,    31,    32,
+      33,    34,    -1,    -1,    -1,     1,    -1,    40,    41,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    49,    -1,    51,    15,
       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      -1,    -1,    -1,    -1,    -1,    31,    32,    33,    -1,    -1,
-      -1,     1,    -1,    39,    40,     4,     5,     6,     7,     8,
-       9,    10,    48,    -1,    50,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    -1,    -1,    -1,    -1,
-      30,    31,    32,    33,     1,    -1,    -1,    -1,    -1,    39,
-      40,    -1,    -1,    -1,    -1,    -1,    -1,    47,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
-      -1,    -1,    -1,    30,    31,    32,    33,     1,    -1,    -1,
-      -1,    -1,    39,    40,    -1,    -1,    -1,    -1,    -1,    -1,
-      47,    -1,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    -1,    -1,    -1,    -1,    -1,    31,    32,    33,
-       1,    -1,    -1,    -1,    -1,    39,    40,    -1,    -1,    -1,
-      -1,    -1,    -1,    47,    -1,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    -1,    -1,    -1,    -1,    -1,
-      31,    32,    33,    -1,    -1,    -1,    -1,    -1,    39,    40,
-      -1,    -1,    -1,    -1,    -1,     1,    47,     3,     4,     5,
-       6,     7,     8,     9,    10,    -1,    -1,    15,    16,    17,
+      -1,    -1,    -1,    -1,    30,    31,    32,    33,    34,     1,
+      -1,    -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,
+      -1,    -1,    48,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    -1,    -1,    -1,    -1,    30,    31,
+      32,    33,    34,     1,    -1,    -1,    -1,    -1,    40,    41,
+      -1,    -1,    -1,    -1,    -1,    -1,    48,    -1,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    -1,    -1,
-      26,    27,    30,    31,    32,    33,    -1,    -1,    -1,    -1,
-      -1,    39,    -1,    -1,    40,    -1,    42,    -1,    -1,    -1,
-      -1,    47,     3,     4,     5,     6,     7,     8,     9,    10,
+      -1,    -1,    -1,    31,    32,    33,    34,     1,    -1,    -1,
+      -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,    -1,
+      48,    -1,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    -1,    -1,    -1,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    -1,    -1,    -1,    40,    41,    -1,    -1,
+      -1,    -1,    -1,     1,    48,     3,     4,     5,     6,     7,
+       8,     9,    10,    -1,    -1,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    -1,    -1,    26,    27,
+      30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,    -1,
+      40,    -1,    -1,    41,    -1,    43,    -1,    -1,    -1,    -1,
+      48,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+      32,    -1,    34,     0,     1,    -1,     3,     4,     5,     6,
+       7,     8,     9,    10,    -1,    47,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    -1,    -1,    26,
+      27,    -1,    31,    32,    33,    34,    -1,    -1,    -1,    -1,
+      -1,    40,    -1,    -1,    41,    -1,    43,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    -1,    34,    -1,
+      -1,    -1,    38,    39,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    -1,    34,    -1,    -1,    -1,    38,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+      33,    34,     3,     4,     5,     6,     7,     8,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
       21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    -1,    33,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    46,     3,     4,     5,     6,
+      31,    32,    -1,    34,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    -1,    34,     3,     4,     5,     6,
        7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    -1,    33,    -1,    -1,    -1,
-      37,    38,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    -1,    33,    -1,    -1,    -1,    37,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,     3,     4,
+      27,    28,    29,    30,    31,    32,    -1,    34,     3,     4,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    -1,    33,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    -1,    33,
+      25,    26,    27,    28,    29,    30,    31,    32,    -1,    34,
        3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
       13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    -1,
-      33,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      -1,    33,     3,     4,     5,     6,     7,     8,     9,    10,
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+      -1,    34,     3,     4,     5,     6,     7,     8,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
       21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    -1,    33,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    -1,    33,     3,     4,     5,     6,     7,     8,
+      31,    32,    -1,    34,     3,     4,     5,     6,     7,     8,
        9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    -1,    33,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    -1,    -1,    -1,    -1,    -1,
-      31,    32,    33,    -1,    -1,    -1,    -1,    -1,    39,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
-      -1,    -1,    -1,    -1,    -1,    32,    33
+      29,    30,    31,    32,    -1,    34,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    -1,    -1,    -1,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    -1,    -1,    -1,
+      40
 };
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,     1,    40,    42,    55,    56,    57,    58,    45,    34,
-     120,   121,   121,     0,    59,     3,    26,    27,    62,    63,
-      66,    67,    76,    77,    83,    84,    98,    99,   107,   108,
-     110,   122,   124,    61,   120,    41,    50,    43,    58,    33,
-      57,    60,     4,     5,     6,     7,     8,     9,    10,    65,
-      75,    81,    82,    97,   109,    58,   120,    64,    16,    17,
+       0,     1,    41,    43,    56,    57,    58,    59,    46,    35,
+     121,   122,   122,     0,    60,     3,    26,    27,    63,    64,
+      67,    68,    77,    78,    84,    85,    99,   100,   108,   109,
+     111,   123,   125,    62,   121,    42,    51,    44,    59,    34,
+      58,    61,     4,     5,     6,     7,     8,     9,    10,    66,
+      76,    82,    83,    98,   110,    59,   121,    65,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    32,    33,
-     118,   119,    45,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    33,    37,   125,    33,   125,    33,   125,    33,
-     125,    51,    51,    33,    46,   125,    12,    69,    78,    12,
-      86,    12,   102,   111,    46,    53,    33,    32,    53,    33,
-      49,    58,    35,   118,    57,    57,    33,   112,   113,   125,
-     118,    68,    46,   118,    13,    87,    24,   101,   118,   100,
-      46,    58,    33,    49,    28,    29,    34,    35,    36,   118,
-     123,    48,    48,   119,   119,    49,    47,    50,    46,     1,
-      57,    79,   101,    85,    50,    46,   112,    47,   123,    52,
-      50,    35,   114,   118,   112,     1,    57,    70,    45,    31,
-      39,    71,    72,    80,    90,   119,    47,    46,   101,     1,
-      57,   103,    47,    33,   125,    57,    45,    71,    72,    73,
-      74,    89,   119,    47,    79,    35,    48,   118,    49,    71,
-     119,    45,    33,   125,     1,    57,    88,    45,    15,    30,
-      72,    91,    92,    93,   104,   119,    47,   119,    70,    71,
-      49,    45,   125,    48,    48,   123,    49,    79,    45,    72,
-      89,    93,    96,   119,    47,   103,    91,   119,    37,    38,
-       1,    11,   115,   116,    45,    52,   123,    70,   123,    88,
-     119,    45,    37,    38,    48,    57,    48,    50,   103,    33,
-     125,    88,    95,    73,   119,    94,   115,    14,   117,   125,
-     117,    57,   105,   106,   118,   125,    73,   119,    50,   125,
-     105
+      34,   119,   120,    46,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    34,    38,   126,    34,   126,    34,
+     126,    34,   126,    52,    52,    34,    47,   126,    12,    70,
+      79,    12,    87,    12,   103,   112,    47,    54,    34,    33,
+      54,    34,    50,    59,    36,   119,    58,    58,    34,   113,
+     114,   126,   119,    69,    47,   119,    13,    88,    24,    32,
+     102,   119,   101,    47,    59,    34,    50,    28,    29,    35,
+      36,    37,   119,   124,    49,    49,   120,   120,    50,    48,
+      51,    47,     1,    58,    80,   102,    86,    51,    47,   113,
+      48,   124,    53,    51,    36,   115,   119,   113,     1,    58,
+      71,    46,    31,    40,    72,    73,    81,    91,   120,    48,
+      47,   102,     1,    58,   104,    48,    34,   126,    58,    46,
+      72,    73,    74,    75,    90,   120,    48,    80,    36,    49,
+     119,    50,    72,   120,    46,    34,   126,     1,    58,    89,
+      46,    15,    30,    73,    92,    93,    94,   105,   120,    48,
+     120,    71,    72,    50,    46,   126,    49,    49,   124,    50,
+      80,    46,    73,    90,    94,    97,   120,    48,   104,    92,
+     120,    38,    39,     1,    11,   116,   117,    46,    53,   124,
+      71,   124,    89,   120,    46,    38,    39,    49,    58,    49,
+      51,   104,    34,   126,    89,    96,    74,   120,    95,   116,
+      14,   118,   126,   118,    58,   106,   107,   119,   126,    74,
+     120,    51,   126,   106
+};
+
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    55,    56,    57,    58,    58,    60,    59,    61,    59,
+      62,    59,    59,    59,    63,    63,    63,    63,    63,    63,
+      63,    63,    63,    63,    63,    63,    63,    65,    64,    66,
+      66,    67,    69,    68,    70,    70,    71,    71,    71,    71,
+      72,    73,    73,    73,    73,    74,    74,    75,    76,    76,
+      77,    79,    78,    80,    80,    80,    80,    81,    82,    82,
+      83,    83,    83,    84,    86,    85,    87,    87,    88,    88,
+      89,    89,    89,    89,    90,    90,    90,    90,    91,    91,
+      91,    91,    91,    91,    92,    92,    92,    93,    93,    93,
+      93,    95,    94,    96,    94,    97,    97,    98,    98,    99,
+     101,   100,   102,   102,   102,   102,   103,   103,   104,   104,
+     104,   104,   105,   106,   106,   107,   107,   108,   108,   109,
+     109,   110,   110,   112,   111,   111,   113,   113,   114,   114,
+     114,   114,   115,   115,   116,   116,   117,   117,   117,   117,
+     117,   117,   117,   118,   118,   119,   119,   119,   120,   120,
+     120,   120,   120,   120,   120,   120,   120,   120,   120,   120,
+     120,   120,   121,   121,   122,   122,   123,   123,   124,   124,
+     124,   124,   124,   124,   125,   125,   126,   126,   126,   126,
+     126,   126,   126,   126,   126,   126,   126,   126,   126,   126,
+     126,   126,   126,   126,   126,   126,   126,   126,   126,   126,
+     126,   126,   126,   126,   126,   126
 };
 
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     3,     3,     0,     0,     3,     0,     5,
+       0,     4,     2,     0,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     0,     6,     2,
+       2,     2,     0,     7,     2,     0,     4,     3,     2,     0,
+       2,     3,     3,     2,     1,     2,     1,     1,     2,     2,
+       2,     0,     6,     4,     3,     2,     0,     1,     2,     2,
+       4,     4,     1,     2,     0,     8,     2,     0,     2,     0,
+       4,     3,     2,     0,     1,     3,     2,     1,     1,     3,
+       2,     4,     2,     1,     2,     1,     1,     2,     3,     2,
+       3,     0,     5,     0,     5,     1,     1,     2,     2,     2,
+       0,     7,     3,     1,     1,     1,     2,     0,     4,     3,
+       2,     0,     1,     3,     1,     1,     1,     7,     7,    10,
+      10,     2,     2,     0,     6,     5,     3,     1,     1,     3,
+       1,     0,     1,     1,     1,     0,     0,     3,     5,     4,
+       6,     3,     5,     2,     0,     1,     2,     3,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     1,     1,
+       1,     2,     2,     1,     3,     1,     1,     0,     1,     1,
+       1,     1,     1,     1,     6,     5,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1
+};
 
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
 
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
 
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
 
-#define YYFAIL		goto yyerrlab
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK (1);						\
-      goto yybackup;						\
-    }								\
-  else								\
-    {								\
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
       yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;							\
-    }								\
-while (YYID (0))
-
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
-    do									\
-      if (YYID (N))                                                    \
-	{								\
-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
-      else								\
-	{								\
-	  (Current).first_line   = (Current).last_line   =		\
-	    YYRHSLOC (Rhs, 0).last_line;				\
-	  (Current).first_column = (Current).last_column =		\
-	    YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
-    while (YYID (0))
-#endif
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
 
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
 
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
 
-#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval)
-#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -1133,54 +1033,46 @@ while (YYID (0))
 #  define YYFPRINTF fprintf
 # endif
 
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (YYID (0))
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-do {									  \
-  if (yydebug)								  \
-    {									  \
-      YYFPRINTF (stderr, "%s ", Title);					  \
-      yy_symbol_print (stderr,						  \
-		  Type, Value); \
-      YYFPRINTF (stderr, "\n");						  \
-    }									  \
-} while (YYID (0))
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
 
 
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
 # endif
-  switch (yytype)
-    {
-      default:
-	break;
-    }
+  YYUSE (yytype);
 }
 
 
@@ -1188,22 +1080,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
   yy_symbol_value_print (yyoutput, yytype, yyvaluep);
   YYFPRINTF (yyoutput, ")");
@@ -1214,16 +1095,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
-#endif
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -1234,49 +1107,42 @@ yy_stack_print (yybottom, yytop)
   YYFPRINTF (stderr, "\n");
 }
 
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
+  unsigned long int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	     yyrule - 1, yylno);
+             yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       );
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              );
       YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -1290,7 +1156,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
+#ifndef YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -1305,7 +1171,6 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
-
 
 #if YYERROR_VERBOSE
 
@@ -1314,15 +1179,8 @@ int yydebug;
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
 yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif
 {
   YYSIZE_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)
@@ -1338,16 +1196,8 @@ yystrlen (yystr)
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static char *
 yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
 {
   char *yyd = yydest;
   const char *yys = yysrc;
@@ -1377,27 +1227,27 @@ yytnamerr (char *yyres, const char *yystr)
       char const *yyp = yystr;
 
       for (;;)
-	switch (*++yyp)
-	  {
-	  case '\'':
-	  case ',':
-	    goto do_not_strip_quotes;
-
-	  case '\\':
-	    if (*++yyp != '\\')
-	      goto do_not_strip_quotes;
-	    /* Fall through.  */
-	  default:
-	    if (yyres)
-	      yyres[yyn] = *yyp;
-	    yyn++;
-	    break;
-
-	  case '"':
-	    if (yyres)
-	      yyres[yyn] = '\0';
-	    return yyn;
-	  }
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
     do_not_strip_quotes: ;
     }
 
@@ -1408,197 +1258,178 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
 {
-  int yyn = yypact[yystate];
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
 
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
+
+  if (*yymsg_alloc < yysize)
     {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	      }
-	    yyarg[yycount++] = yytname[yyx];
-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
-
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
-
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
-
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyarg[yyi++]);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
     }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
-
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
 {
   YYUSE (yyvaluep);
-
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-  switch (yytype)
-    {
-
-      default:
-	break;
-    }
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
-/* Prevent warnings from -Wmissing-prototypes.  */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
 
 
 
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+/*----------.
+| yyparse.  |
+`----------*/
 
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
 {
 /* The lookahead symbol.  */
 int yychar;
 
+
 /* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
+/* Default value used for initialization, for pacifying older GCCs
+   or non-GCC compilers.  */
+YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
+YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
     /* Number of syntax errors so far.  */
     int yynerrs;
@@ -1608,10 +1439,10 @@ YYSTYPE yylval;
     int yyerrstatus;
 
     /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
+       'yyss': related to states.
+       'yyvs': related to semantic values.
 
-       Refer to the stacks thru separate pointers, to allow yyoverflow
+       Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
@@ -1629,7 +1460,7 @@ YYSTYPE yylval;
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
+  int yytoken = 0;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
@@ -1647,9 +1478,8 @@ YYSTYPE yylval;
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
   yystacksize = YYINITDEPTH;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1658,14 +1488,6 @@ YYSTYPE yylval;
   yyerrstatus = 0;
   yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-  yyssp = yyss;
-  yyvsp = yyvs;
-
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1686,23 +1508,23 @@ YYSTYPE yylval;
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack.  Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	yytype_int16 *yyss1 = yyss;
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow (YY_("memory exhausted"),
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
@@ -1710,22 +1532,22 @@ YYSTYPE yylval;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;
 
       {
-	yytype_int16 *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
       }
 # endif
 #endif /* no yyoverflow */
@@ -1734,10 +1556,10 @@ YYSTYPE yylval;
       yyvsp = yyvs + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
+                  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
+        YYABORT;
     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1757,7 +1579,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1766,7 +1588,7 @@ yybackup:
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
+      yychar = yylex (&yylval);
     }
 
   if (yychar <= YYEOF)
@@ -1788,8 +1610,8 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -1806,7 +1628,9 @@ yybackup:
   yychar = YYEMPTY;
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -1829,7 +1653,7 @@ yyreduce:
   yylen = yyr2[yyn];
 
   /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
+     '$$ = $1'.
 
      Otherwise, the following line sets YYVAL to garbage.
      This behavior is undocumented and Bison
@@ -1843,391 +1667,353 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-
-/* Line 1455 of yacc.c  */
-#line 115 "../Slice/Grammar.y"
+#line 116 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 1674 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 3:
-
-/* Line 1455 of yacc.c  */
-#line 123 "../Slice/Grammar.y"
+#line 124 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (3)]);
-;}
+    (yyval) = (yyvsp[-1]);
+}
+#line 1682 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 4:
-
-/* Line 1455 of yacc.c  */
-#line 132 "../Slice/Grammar.y"
+#line 133 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (3)]);
-;}
+    (yyval) = (yyvsp[-1]);
+}
+#line 1690 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 5:
-
-/* Line 1455 of yacc.c  */
-#line 136 "../Slice/Grammar.y"
+#line 137 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = new StringListTok;
-;}
+}
+#line 1698 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 6:
-
-/* Line 1455 of yacc.c  */
-#line 145 "../Slice/Grammar.y"
+#line 146 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[0]));
     if(!metaData->v.empty())
     {
         unit->addGlobalMetaData(metaData->v);
     }
-;}
+}
+#line 1710 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 8:
-
-/* Line 1455 of yacc.c  */
-#line 154 "../Slice/Grammar.y"
+#line 155 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-1]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[0]));
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
-;}
+}
+#line 1723 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 10:
-
-/* Line 1455 of yacc.c  */
-#line 164 "../Slice/Grammar.y"
+#line 165 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     yyerrok;
-;}
+}
+#line 1731 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 12:
-
-/* Line 1455 of yacc.c  */
-#line 169 "../Slice/Grammar.y"
+#line 170 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("`;' missing after definition");
-;}
+}
+#line 1739 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 13:
-
-/* Line 1455 of yacc.c  */
-#line 173 "../Slice/Grammar.y"
+#line 174 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 1746 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 14:
-
-/* Line 1455 of yacc.c  */
-#line 181 "../Slice/Grammar.y"
+#line 182 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || ModulePtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || ModulePtr::dynamicCast((yyvsp[0])));
+}
+#line 1754 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 15:
-
-/* Line 1455 of yacc.c  */
-#line 185 "../Slice/Grammar.y"
+#line 186 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[0])));
+}
+#line 1762 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 16:
-
-/* Line 1455 of yacc.c  */
-#line 189 "../Slice/Grammar.y"
+#line 190 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || ClassDefPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || ClassDefPtr::dynamicCast((yyvsp[0])));
+}
+#line 1770 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 17:
-
-/* Line 1455 of yacc.c  */
-#line 193 "../Slice/Grammar.y"
+#line 194 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[0])));
+}
+#line 1778 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 18:
-
-/* Line 1455 of yacc.c  */
-#line 197 "../Slice/Grammar.y"
+#line 198 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || ClassDefPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || ClassDefPtr::dynamicCast((yyvsp[0])));
+}
+#line 1786 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 19:
-
-/* Line 1455 of yacc.c  */
-#line 201 "../Slice/Grammar.y"
+#line 202 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0);
-;}
+    assert((yyvsp[0]) == 0);
+}
+#line 1794 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 20:
-
-/* Line 1455 of yacc.c  */
-#line 205 "../Slice/Grammar.y"
+#line 206 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || ExceptionPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || ExceptionPtr::dynamicCast((yyvsp[0])));
+}
+#line 1802 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 21:
-
-/* Line 1455 of yacc.c  */
-#line 209 "../Slice/Grammar.y"
+#line 210 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0);
-;}
+    assert((yyvsp[0]) == 0);
+}
+#line 1810 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 22:
-
-/* Line 1455 of yacc.c  */
-#line 213 "../Slice/Grammar.y"
+#line 214 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || StructPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || StructPtr::dynamicCast((yyvsp[0])));
+}
+#line 1818 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 23:
-
-/* Line 1455 of yacc.c  */
-#line 217 "../Slice/Grammar.y"
+#line 218 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || SequencePtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || SequencePtr::dynamicCast((yyvsp[0])));
+}
+#line 1826 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 24:
-
-/* Line 1455 of yacc.c  */
-#line 221 "../Slice/Grammar.y"
+#line 222 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || DictionaryPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || DictionaryPtr::dynamicCast((yyvsp[0])));
+}
+#line 1834 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 25:
-
-/* Line 1455 of yacc.c  */
-#line 225 "../Slice/Grammar.y"
+#line 226 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || EnumPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || EnumPtr::dynamicCast((yyvsp[0])));
+}
+#line 1842 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 26:
-
-/* Line 1455 of yacc.c  */
-#line 229 "../Slice/Grammar.y"
+#line 230 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || ConstPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || ConstPtr::dynamicCast((yyvsp[0])));
+}
+#line 1850 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 27:
-
-/* Line 1455 of yacc.c  */
-#line 238 "../Slice/Grammar.y"
+#line 239 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->setSeenDefinition();
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     ModulePtr module = cont->createModule(ident->v);
     if(module)
     {
-	cont->checkIntroduced(ident->v, module);
-	unit->pushContainer(module);
-	(yyval) = module;
+        cont->checkIntroduced(ident->v, module);
+        unit->pushContainer(module);
+        (yyval) = module;
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 1871 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 28:
-
-/* Line 1455 of yacc.c  */
-#line 255 "../Slice/Grammar.y"
+#line 256 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    if((yyvsp[(3) - (6)]))
+    if((yyvsp[-3]))
     {
-	unit->popContainer();
-	(yyval) = (yyvsp[(3) - (6)]);
+        unit->popContainer();
+        (yyval) = (yyvsp[-3]);
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 1887 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 29:
-
-/* Line 1455 of yacc.c  */
-#line 272 "../Slice/Grammar.y"
+#line 273 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 1895 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 30:
-
-/* Line 1455 of yacc.c  */
-#line 276 "../Slice/Grammar.y"
+#line 277 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     unit->error("keyword `" + ident->v + "' cannot be used as exception name");
-    (yyval) = (yyvsp[(2) - (2)]); // Dummy
-;}
+    (yyval) = (yyvsp[0]); // Dummy
+}
+#line 1905 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 31:
-
-/* Line 1455 of yacc.c  */
-#line 287 "../Slice/Grammar.y"
+#line 288 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("exceptions cannot be forward declared");
     (yyval) = 0;
-;}
+}
+#line 1914 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 32:
-
-/* Line 1455 of yacc.c  */
-#line 297 "../Slice/Grammar.y"
+#line 298 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
-    ExceptionPtr base = ExceptionPtr::dynamicCast((yyvsp[(3) - (3)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-2]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-1]));
+    ExceptionPtr base = ExceptionPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     ExceptionPtr ex = cont->createException(ident->v, base, local->v);
     if(ex)
     {
-	cont->checkIntroduced(ident->v, ex);
-	unit->pushContainer(ex);
+        cont->checkIntroduced(ident->v, ex);
+        unit->pushContainer(ex);
     }
     (yyval) = ex;
-;}
+}
+#line 1932 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 33:
-
-/* Line 1455 of yacc.c  */
-#line 311 "../Slice/Grammar.y"
+#line 312 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    if((yyvsp[(4) - (7)]))
+    if((yyvsp[-3]))
     {
-	unit->popContainer();
+        unit->popContainer();
     }
-    (yyval) = (yyvsp[(4) - (7)]);
-;}
+    (yyval) = (yyvsp[-3]);
+}
+#line 1944 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 34:
-
-/* Line 1455 of yacc.c  */
-#line 324 "../Slice/Grammar.y"
+#line 325 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     ContainedPtr contained = cont->lookupException(scoped->v);
     cont->checkIntroduced(scoped->v);
     (yyval) = contained;
-;}
+}
+#line 1956 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 35:
-
-/* Line 1455 of yacc.c  */
-#line 332 "../Slice/Grammar.y"
+#line 333 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = 0;
-;}
+}
+#line 1964 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 36:
-
-/* Line 1455 of yacc.c  */
-#line 341 "../Slice/Grammar.y"
+#line 342 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2]));
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
-;}
+}
+#line 1977 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 37:
-
-/* Line 1455 of yacc.c  */
-#line 350 "../Slice/Grammar.y"
+#line 351 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 1984 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 38:
-
-/* Line 1455 of yacc.c  */
-#line 353 "../Slice/Grammar.y"
+#line 354 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("`;' missing after definition");
-;}
+}
+#line 1992 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 39:
-
-/* Line 1455 of yacc.c  */
-#line 357 "../Slice/Grammar.y"
+#line 358 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 1999 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 40:
-
-/* Line 1455 of yacc.c  */
-#line 365 "../Slice/Grammar.y"
+#line 366 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     TypeStringTokPtr typestring = new TypeStringTok;
     typestring->v = make_pair(type, ident->v);
     (yyval) = typestring;
-;}
+}
+#line 2011 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 41:
-
-/* Line 1455 of yacc.c  */
-#line 378 "../Slice/Grammar.y"
+#line 379 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    IntegerTokPtr i = IntegerTokPtr::dynamicCast((yyvsp[(2) - (3)]));
+    IntegerTokPtr i = IntegerTokPtr::dynamicCast((yyvsp[-1]));
 
     int tag;
     if(i->v < 0 || i->v > Int32Max)
@@ -2244,15 +2030,14 @@ yyreduce:
     m->v.optional = tag >= 0;
     m->v.tag = tag;
     (yyval) = m;
-;}
+}
+#line 2035 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 42:
-
-/* Line 1455 of yacc.c  */
-#line 398 "../Slice/Grammar.y"
+#line 399 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1]));
 
     ContainerPtr cont = unit->currentContainer();
     assert(cont);
@@ -2305,106 +2090,98 @@ yyreduce:
     m->v.optional = tag >= 0;
     m->v.tag = tag;
     (yyval) = m;
-;}
+}
+#line 2095 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 43:
-
-/* Line 1455 of yacc.c  */
-#line 454 "../Slice/Grammar.y"
+#line 455 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("missing tag for optional");
     OptionalDefTokPtr m = new OptionalDefTok; // Dummy
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-;}
+}
+#line 2107 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 44:
-
-/* Line 1455 of yacc.c  */
-#line 462 "../Slice/Grammar.y"
+#line 463 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("missing tag for optional");
     OptionalDefTokPtr m = new OptionalDefTok; // Dummy
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-;}
+}
+#line 2119 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 45:
-
-/* Line 1455 of yacc.c  */
-#line 475 "../Slice/Grammar.y"
+#line 476 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0]));
     m->v.type = ts->v.first;
     m->v.name = ts->v.second;
     (yyval) = m;
-;}
+}
+#line 2131 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 46:
-
-/* Line 1455 of yacc.c  */
-#line 483 "../Slice/Grammar.y"
+#line 484 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0]));
     OptionalDefTokPtr m = new OptionalDefTok;
     m->v.type = ts->v.first;
     m->v.name = ts->v.second;
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-;}
+}
+#line 2145 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 48:
-
-/* Line 1455 of yacc.c  */
-#line 504 "../Slice/Grammar.y"
+#line 505 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 2153 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 49:
-
-/* Line 1455 of yacc.c  */
-#line 508 "../Slice/Grammar.y"
+#line 509 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     unit->error("keyword `" + ident->v + "' cannot be used as struct name");
-    (yyval) = (yyvsp[(2) - (2)]); // Dummy
-;}
+    (yyval) = (yyvsp[0]); // Dummy
+}
+#line 2163 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 50:
-
-/* Line 1455 of yacc.c  */
-#line 519 "../Slice/Grammar.y"
+#line 520 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("structs cannot be forward declared");
     (yyval) = 0; // Dummy
-;}
+}
+#line 2172 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 51:
-
-/* Line 1455 of yacc.c  */
-#line 529 "../Slice/Grammar.y"
+#line 530 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     StructPtr st = cont->createStruct(ident->v, local->v);
     if(st)
     {
-	cont->checkIntroduced(ident->v, st);
-	unit->pushContainer(st);
+        cont->checkIntroduced(ident->v, st);
+        unit->pushContainer(st);
     }
     else
     {
@@ -2413,19 +2190,18 @@ yyreduce:
         unit->pushContainer(st);
     }
     (yyval) = st;
-;}
+}
+#line 2195 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 52:
-
-/* Line 1455 of yacc.c  */
-#line 548 "../Slice/Grammar.y"
+#line 549 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    if((yyvsp[(3) - (6)]))
+    if((yyvsp[-3]))
     {
-	unit->popContainer();
+        unit->popContainer();
     }
-    (yyval) = (yyvsp[(3) - (6)]);
+    (yyval) = (yyvsp[-3]);
 
     //
     // Empty structures are not allowed
@@ -2434,76 +2210,69 @@ yyreduce:
     assert(st);
     if(st->dataMembers().empty())
     {
-    	unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy
+        unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy
     }
-;}
+}
+#line 2217 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 53:
-
-/* Line 1455 of yacc.c  */
-#line 571 "../Slice/Grammar.y"
+#line 572 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2]));
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
-;}
+}
+#line 2230 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 54:
-
-/* Line 1455 of yacc.c  */
-#line 580 "../Slice/Grammar.y"
+#line 581 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 2237 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 55:
-
-/* Line 1455 of yacc.c  */
-#line 583 "../Slice/Grammar.y"
+#line 584 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("`;' missing after definition");
-;}
+}
+#line 2245 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 56:
-
-/* Line 1455 of yacc.c  */
-#line 587 "../Slice/Grammar.y"
+#line 588 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 2252 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 58:
-
-/* Line 1455 of yacc.c  */
-#line 601 "../Slice/Grammar.y"
+#line 602 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 2260 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 59:
-
-/* Line 1455 of yacc.c  */
-#line 605 "../Slice/Grammar.y"
+#line 606 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     unit->error("keyword `" + ident->v + "' cannot be used as class name");
-    (yyval) = (yyvsp[(2) - (2)]); // Dummy
-;}
+    (yyval) = (yyvsp[0]); // Dummy
+}
+#line 2270 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 60:
-
-/* Line 1455 of yacc.c  */
-#line 616 "../Slice/Grammar.y"
+#line 617 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    IceUtil::Int64 id = IntegerTokPtr::dynamicCast((yyvsp[(3) - (4)]))->v;
+    IceUtil::Int64 id = IntegerTokPtr::dynamicCast((yyvsp[-1]))->v;
     if(id < 0)
     {
         unit->error("invalid compact id for class: id must be a positive integer");
@@ -2522,18 +2291,17 @@ yyreduce:
     }
 
     ClassIdTokPtr classId = new ClassIdTok();
-    classId->v = StringTokPtr::dynamicCast((yyvsp[(2) - (4)]))->v;
+    classId->v = StringTokPtr::dynamicCast((yyvsp[-2]))->v;
     classId->t = static_cast<int>(id);
     (yyval) = classId;
-;}
+}
+#line 2299 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 61:
-
-/* Line 1455 of yacc.c  */
-#line 641 "../Slice/Grammar.y"
+#line 642 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(3) - (4)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1]));
 
     ContainerPtr cont = unit->currentContainer();
     assert(cont);
@@ -2591,194 +2359,181 @@ yyreduce:
     }
 
     ClassIdTokPtr classId = new ClassIdTok();
-    classId->v = StringTokPtr::dynamicCast((yyvsp[(2) - (4)]))->v;
+    classId->v = StringTokPtr::dynamicCast((yyvsp[-2]))->v;
     classId->t = id;
     (yyval) = classId;
 
-;}
+}
+#line 2368 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 62:
-
-/* Line 1455 of yacc.c  */
-#line 706 "../Slice/Grammar.y"
+#line 707 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     ClassIdTokPtr classId = new ClassIdTok();
-    classId->v = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]))->v;
+    classId->v = StringTokPtr::dynamicCast((yyvsp[0]))->v;
     classId->t = -1;
     (yyval) = classId;
-;}
+}
+#line 2379 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 63:
-
-/* Line 1455 of yacc.c  */
-#line 718 "../Slice/Grammar.y"
+#line 719 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     ClassDeclPtr cl = cont->createClassDecl(ident->v, false, local->v);
     (yyval) = cl;
-;}
+}
+#line 2391 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 64:
-
-/* Line 1455 of yacc.c  */
-#line 731 "../Slice/Grammar.y"
+#line 732 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (4)]));
-    ClassIdTokPtr ident = ClassIdTokPtr::dynamicCast((yyvsp[(2) - (4)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-3]));
+    ClassIdTokPtr ident = ClassIdTokPtr::dynamicCast((yyvsp[-2]));
     ContainerPtr cont = unit->currentContainer();
-    ClassDefPtr base = ClassDefPtr::dynamicCast((yyvsp[(3) - (4)]));
-    ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[(4) - (4)]));
+    ClassDefPtr base = ClassDefPtr::dynamicCast((yyvsp[-1]));
+    ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[0]));
     if(base)
     {
-	bases->v.push_front(base);
+    bases->v.push_front(base);
     }
     ClassDefPtr cl = cont->createClassDef(ident->v, ident->t, false, bases->v, local->v);
     if(cl)
     {
-	cont->checkIntroduced(ident->v, cl);
-	unit->pushContainer(cl);
-	(yyval) = cl;
+        cont->checkIntroduced(ident->v, cl);
+        unit->pushContainer(cl);
+        (yyval) = cl;
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 2418 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 65:
-
-/* Line 1455 of yacc.c  */
-#line 754 "../Slice/Grammar.y"
+#line 755 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    if((yyvsp[(5) - (8)]))
+    if((yyvsp[-3]))
     {
-	unit->popContainer();
-	(yyval) = (yyvsp[(5) - (8)]);
+        unit->popContainer();
+        (yyval) = (yyvsp[-3]);
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 2434 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 66:
-
-/* Line 1455 of yacc.c  */
-#line 771 "../Slice/Grammar.y"
+#line 772 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     TypeList types = cont->lookupType(scoped->v);
     (yyval) = 0;
     if(!types.empty())
     {
-	ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
-	if(!cl || cl->isInterface())
-	{
-	    string msg = "`";
-	    msg += scoped->v;
-	    msg += "' is not a class";
-	    unit->error(msg);
-	}
-	else
-	{
-	    ClassDefPtr def = cl->definition();
-	    if(!def)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' has been declared but not defined";
-		unit->error(msg);
-	    }
-	    else
-	    {
-	    	cont->checkIntroduced(scoped->v);
-		(yyval) = def;
-	    }
-	}
+        ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
+        if(!cl || cl->isInterface())
+        {
+            string msg = "`";
+            msg += scoped->v;
+            msg += "' is not a class";
+            unit->error(msg);
+        }
+        else
+        {
+            ClassDefPtr def = cl->definition();
+            if(!def)
+            {
+                string msg = "`";
+                msg += scoped->v;
+                msg += "' has been declared but not defined";
+                unit->error(msg);
+            }
+            else
+            {
+                cont->checkIntroduced(scoped->v);
+                (yyval) = def;
+            }
+        }
     }
-;}
+}
+#line 2472 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 67:
-
-/* Line 1455 of yacc.c  */
-#line 805 "../Slice/Grammar.y"
+#line 806 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = 0;
-;}
+}
+#line 2480 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 68:
-
-/* Line 1455 of yacc.c  */
-#line 814 "../Slice/Grammar.y"
+#line 815 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 2488 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 69:
-
-/* Line 1455 of yacc.c  */
-#line 818 "../Slice/Grammar.y"
+#line 819 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = new ClassListTok;
-;}
+}
+#line 2496 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 70:
-
-/* Line 1455 of yacc.c  */
-#line 827 "../Slice/Grammar.y"
+#line 828 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2]));
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
-;}
+}
+#line 2509 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 71:
-
-/* Line 1455 of yacc.c  */
-#line 836 "../Slice/Grammar.y"
+#line 837 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 2516 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 72:
-
-/* Line 1455 of yacc.c  */
-#line 839 "../Slice/Grammar.y"
+#line 840 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("`;' missing after definition");
-;}
+}
+#line 2524 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 73:
-
-/* Line 1455 of yacc.c  */
-#line 843 "../Slice/Grammar.y"
+#line 844 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 2531 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 74:
-
-/* Line 1455 of yacc.c  */
-#line 851 "../Slice/Grammar.y"
+#line 852 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[0]));
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     DataMemberPtr dm;
     if(cl)
@@ -2797,16 +2552,15 @@ yyreduce:
     }
     unit->currentContainer()->checkIntroduced(def->v.name, dm);
     (yyval) = dm;
-;}
+}
+#line 2557 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 75:
-
-/* Line 1455 of yacc.c  */
-#line 873 "../Slice/Grammar.y"
+#line 874 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[-2]));
+    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0]));
 
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     DataMemberPtr dm;
@@ -2829,16 +2583,15 @@ yyreduce:
     }
     unit->currentContainer()->checkIntroduced(def->v.name, dm);
     (yyval) = dm;
-;}
+}
+#line 2588 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 76:
-
-/* Line 1455 of yacc.c  */
-#line 900 "../Slice/Grammar.y"
+#line 901 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
-    string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
+    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
+    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
@@ -2856,15 +2609,14 @@ yyreduce:
     }
     assert((yyval));
     unit->error("keyword `" + name + "' cannot be used as data member name");
-;}
+}
+#line 2614 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 77:
-
-/* Line 1455 of yacc.c  */
-#line 922 "../Slice/Grammar.y"
+#line 923 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[0]));
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
@@ -2882,758 +2634,719 @@ yyreduce:
     }
     assert((yyval));
     unit->error("missing data member name");
-;}
+}
+#line 2639 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 78:
-
-/* Line 1455 of yacc.c  */
-#line 948 "../Slice/Grammar.y"
+#line 949 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     DataMemberPtr dm = st->createDataMember(ts->v.second, ts->v.first, false, -1, 0, "", "");
     unit->currentContainer()->checkIntroduced(ts->v.second, dm);
     (yyval) = dm;
-;}
+}
+#line 2652 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 79:
-
-/* Line 1455 of yacc.c  */
-#line 957 "../Slice/Grammar.y"
+#line 958 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[-2]));
+    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     DataMemberPtr dm = st->createDataMember(ts->v.second, ts->v.first, false, -1, value->v.value,
                                             value->v.valueAsString, value->v.valueAsLiteral);
     unit->currentContainer()->checkIntroduced(ts->v.second, dm);
     (yyval) = dm;
-;}
+}
+#line 2667 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 80:
-
-/* Line 1455 of yacc.c  */
-#line 968 "../Slice/Grammar.y"
+#line 969 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     (yyval) = st->createDataMember(ts->v.second, ts->v.first, false, 0, 0, "", ""); // Dummy
     assert((yyval));
     unit->error("optional data members not supported in struct");
-;}
+}
+#line 2680 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 81:
-
-/* Line 1455 of yacc.c  */
-#line 977 "../Slice/Grammar.y"
+#line 978 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (4)]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[-2]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     (yyval) = st->createDataMember(ts->v.second, ts->v.first, false, 0, 0, "", ""); // Dummy
     assert((yyval));
     unit->error("optional data members not supported in struct");
-;}
+}
+#line 2693 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 82:
-
-/* Line 1455 of yacc.c  */
-#line 986 "../Slice/Grammar.y"
+#line 987 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
-    string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
+    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
+    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     (yyval) = st->createDataMember(name, type, false, 0, 0, "", ""); // Dummy
     assert((yyval));
     unit->error("keyword `" + name + "' cannot be used as data member name");
-;}
+}
+#line 2707 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 83:
-
-/* Line 1455 of yacc.c  */
-#line 996 "../Slice/Grammar.y"
+#line 997 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[0]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     (yyval) = st->createDataMember(IceUtil::generateUUID(), type, false, 0, 0, "", ""); // Dummy
     assert((yyval));
     unit->error("missing data member name");
-;}
+}
+#line 2720 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 84:
-
-/* Line 1455 of yacc.c  */
-#line 1010 "../Slice/Grammar.y"
+#line 1011 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    m->v.type = TypePtr::dynamicCast((yyvsp[(2) - (2)]));
+    OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
+    m->v.type = TypePtr::dynamicCast((yyvsp[0]));
     (yyval) = m;
-;}
+}
+#line 2730 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 85:
-
-/* Line 1455 of yacc.c  */
-#line 1016 "../Slice/Grammar.y"
+#line 1017 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     OptionalDefTokPtr m = new OptionalDefTok();
-    m->v.type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
+    m->v.type = TypePtr::dynamicCast((yyvsp[0]));
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-;}
+}
+#line 2742 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 86:
-
-/* Line 1455 of yacc.c  */
-#line 1024 "../Slice/Grammar.y"
+#line 1025 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     OptionalDefTokPtr m = new OptionalDefTok;
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-;}
+}
+#line 2753 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 87:
-
-/* Line 1455 of yacc.c  */
-#line 1036 "../Slice/Grammar.y"
+#line 1037 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
+    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
+    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
-	if(op)
-	{
-	    cl->checkIntroduced(name, op);
-	    unit->pushContainer(op);
-	    (yyval) = op;
-	}
-	else
-	{
-	    (yyval) = 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
+        if(op)
+        {
+            cl->checkIntroduced(name, op);
+            unit->pushContainer(op);
+            (yyval) = op;
+        }
+        else
+        {
+            (yyval) = 0;
+        }
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 2781 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 88:
-
-/* Line 1455 of yacc.c  */
-#line 1060 "../Slice/Grammar.y"
+#line 1061 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(2) - (3)]));
-    string name = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v;
+    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
+    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
-                                              Operation::Idempotent);
-	if(op)
-	{
-	    cl->checkIntroduced(name, op);
-	    unit->pushContainer(op);
-	    (yyval) = op;
-	}
-	else
-	{
-	    (yyval) = 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
+                                                Operation::Idempotent);
+        if(op)
+        {
+            cl->checkIntroduced(name, op);
+            unit->pushContainer(op);
+            (yyval) = op;
+        }
+        else
+        {
+            (yyval) = 0;
+        }
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 2810 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 89:
-
-/* Line 1455 of yacc.c  */
-#line 1085 "../Slice/Grammar.y"
+#line 1086 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
+    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
+    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
-	if(op)
-	{
-	    unit->pushContainer(op);
-	    unit->error("keyword `" + name + "' cannot be used as operation name");
-	    (yyval) = op; // Dummy
-	}
-	else
-	{
-	    (yyval) = 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
+        if(op)
+        {
+            unit->pushContainer(op);
+            unit->error("keyword `" + name + "' cannot be used as operation name");
+            (yyval) = op; // Dummy
+        }
+        else
+        {
+            (yyval) = 0;
+        }
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 2838 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 90:
-
-/* Line 1455 of yacc.c  */
-#line 1109 "../Slice/Grammar.y"
+#line 1110 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(2) - (3)]));
-    string name = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v;
+    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
+    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
-                                              Operation::Idempotent);
-	if(op)
-	{
-	    unit->pushContainer(op);
-	    unit->error("keyword `" + name + "' cannot be used as operation name");
-	    (yyval) = op; // Dummy
-	}
-	else
-	{
-	    return 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
+                                                Operation::Idempotent);
+        if(op)
+        {
+            unit->pushContainer(op);
+            unit->error("keyword `" + name + "' cannot be used as operation name");
+            (yyval) = op; // Dummy
+        }
+        else
+        {
+            return 0;
+        }
     }
     else
     {
-    	(yyval) = 0;
+        (yyval) = 0;
     }
-;}
+}
+#line 2867 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 91:
-
-/* Line 1455 of yacc.c  */
-#line 1139 "../Slice/Grammar.y"
+#line 1140 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    if((yyvsp[(1) - (3)]))
+    if((yyvsp[-2]))
     {
-	unit->popContainer();
-	(yyval) = (yyvsp[(1) - (3)]);
+        unit->popContainer();
+        (yyval) = (yyvsp[-2]);
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 2883 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 92:
-
-/* Line 1455 of yacc.c  */
-#line 1151 "../Slice/Grammar.y"
+#line 1152 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OperationPtr op = OperationPtr::dynamicCast((yyvsp[(4) - (5)]));
-    ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[(5) - (5)]));
+    OperationPtr op = OperationPtr::dynamicCast((yyvsp[-1]));
+    ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[0]));
     assert(el);
     if(op)
     {
         op->setExceptionList(el->v);
     }
-;}
+}
+#line 2897 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 93:
-
-/* Line 1455 of yacc.c  */
-#line 1161 "../Slice/Grammar.y"
+#line 1162 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    if((yyvsp[(1) - (3)]))
+    if((yyvsp[-2]))
     {
-	unit->popContainer();
+        unit->popContainer();
     }
     yyerrok;
-;}
+}
+#line 2909 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 94:
-
-/* Line 1455 of yacc.c  */
-#line 1169 "../Slice/Grammar.y"
+#line 1170 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OperationPtr op = OperationPtr::dynamicCast((yyvsp[(4) - (5)]));
-    ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[(5) - (5)]));
+    OperationPtr op = OperationPtr::dynamicCast((yyvsp[-1]));
+    ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[0]));
     assert(el);
     if(op)
     {
         op->setExceptionList(el->v); // Dummy
     }
-;}
+}
+#line 2923 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 97:
-
-/* Line 1455 of yacc.c  */
-#line 1191 "../Slice/Grammar.y"
+#line 1192 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 2931 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 98:
-
-/* Line 1455 of yacc.c  */
-#line 1195 "../Slice/Grammar.y"
+#line 1196 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     unit->error("keyword `" + ident->v + "' cannot be used as interface name");
-    (yyval) = (yyvsp[(2) - (2)]); // Dummy
-;}
+    (yyval) = (yyvsp[0]); // Dummy
+}
+#line 2941 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 99:
-
-/* Line 1455 of yacc.c  */
-#line 1206 "../Slice/Grammar.y"
+#line 1207 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     ClassDeclPtr cl = cont->createClassDecl(ident->v, true, local->v);
     cont->checkIntroduced(ident->v, cl);
     (yyval) = cl;
-;}
+}
+#line 2954 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 100:
-
-/* Line 1455 of yacc.c  */
-#line 1220 "../Slice/Grammar.y"
+#line 1221 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-2]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-1]));
     ContainerPtr cont = unit->currentContainer();
-    ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[0]));
     ClassDefPtr cl = cont->createClassDef(ident->v, -1, true, bases->v, local->v);
     if(cl)
     {
-	cont->checkIntroduced(ident->v, cl);
-	unit->pushContainer(cl);
-	(yyval) = cl;
+    cont->checkIntroduced(ident->v, cl);
+    unit->pushContainer(cl);
+    (yyval) = cl;
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 2976 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 101:
-
-/* Line 1455 of yacc.c  */
-#line 1238 "../Slice/Grammar.y"
+#line 1239 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    if((yyvsp[(4) - (7)]))
+    if((yyvsp[-3]))
     {
-	unit->popContainer();
-	(yyval) = (yyvsp[(4) - (7)]);
+    unit->popContainer();
+    (yyval) = (yyvsp[-3]);
     }
     else
     {
-	(yyval) = 0;
+    (yyval) = 0;
     }
-;}
+}
+#line 2992 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 102:
-
-/* Line 1455 of yacc.c  */
-#line 1255 "../Slice/Grammar.y"
+#line 1256 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    ClassListTokPtr intfs = ClassListTokPtr::dynamicCast((yyvsp[(3) - (3)]));
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
+    ClassListTokPtr intfs = ClassListTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-2]));
     ContainerPtr cont = unit->currentContainer();
     TypeList types = cont->lookupType(scoped->v);
     if(!types.empty())
     {
-	ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
-	if(!cl || !cl->isInterface())
-	{
-	    string msg = "`";
-	    msg += scoped->v;
-	    msg += "' is not an interface";
-	    unit->error(msg);
-	}
-	else
-	{
-	    ClassDefPtr def = cl->definition();
-	    if(!def)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' has been declared but not defined";
-		unit->error(msg);
-	    }
-	    else
-	    {
-	    	cont->checkIntroduced(scoped->v);
-		intfs->v.push_front(def);
-	    }
-	}
+    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
+    if(!cl || !cl->isInterface())
+    {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' is not an interface";
+        unit->error(msg);
+    }
+    else
+    {
+        ClassDefPtr def = cl->definition();
+        if(!def)
+        {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' has been declared but not defined";
+        unit->error(msg);
+        }
+        else
+        {
+            cont->checkIntroduced(scoped->v);
+        intfs->v.push_front(def);
+        }
+    }
     }
     (yyval) = intfs;
-;}
+}
+#line 3031 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 103:
-
-/* Line 1455 of yacc.c  */
-#line 1290 "../Slice/Grammar.y"
+#line 1291 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     ClassListTokPtr intfs = new ClassListTok;
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     TypeList types = cont->lookupType(scoped->v);
     if(!types.empty())
     {
-	ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
-	if(!cl || !cl->isInterface())
-	{
-	    string msg = "`";
-	    msg += scoped->v;
-	    msg += "' is not an interface";
-	    unit->error(msg); // $$ is a dummy
-	}
-	else
-	{
-	    ClassDefPtr def = cl->definition();
-	    if(!def)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' has been declared but not defined";
-		unit->error(msg); // $$ is a dummy
-	    }
-	    else
-	    {
-	    	cont->checkIntroduced(scoped->v);
-		intfs->v.push_front(def);
-	    }
-	}
+    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
+    if(!cl || !cl->isInterface())
+    {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' is not an interface";
+        unit->error(msg); // $$ is a dummy
+    }
+    else
+    {
+        ClassDefPtr def = cl->definition();
+        if(!def)
+        {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' has been declared but not defined";
+        unit->error(msg); // $$ is a dummy
+        }
+        else
+        {
+            cont->checkIntroduced(scoped->v);
+        intfs->v.push_front(def);
+        }
+    }
     }
     (yyval) = intfs;
-;}
+}
+#line 3070 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 104:
-
-/* Line 1455 of yacc.c  */
-#line 1325 "../Slice/Grammar.y"
+#line 1326 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("illegal inheritance from type Object");
     (yyval) = new ClassListTok; // Dummy
-;}
+}
+#line 3079 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 105:
-
-/* Line 1455 of yacc.c  */
-#line 1335 "../Slice/Grammar.y"
+#line 1331 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    unit->error("illegal inheritance from type Value");
+    (yyval) = new ClassListTok; // Dummy
+}
+#line 3088 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 106:
-
-/* Line 1455 of yacc.c  */
-#line 1339 "../Slice/Grammar.y"
+#line 1341 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = new ClassListTok;
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 3096 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 107:
+#line 1345 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+    (yyval) = new ClassListTok;
+}
+#line 3104 "Grammar.tab.c" /* yacc.c:1646  */
+    break;
 
-/* Line 1455 of yacc.c  */
-#line 1348 "../Slice/Grammar.y"
+  case 108:
+#line 1354 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2]));
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+    contained->setMetaData(metaData->v);
     }
-;}
+}
+#line 3117 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 108:
-
-/* Line 1455 of yacc.c  */
-#line 1357 "../Slice/Grammar.y"
+  case 109:
+#line 1363 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 3124 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 109:
-
-/* Line 1455 of yacc.c  */
-#line 1360 "../Slice/Grammar.y"
+  case 110:
+#line 1366 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("`;' missing after definition");
-;}
+}
+#line 3132 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 110:
-
-/* Line 1455 of yacc.c  */
-#line 1364 "../Slice/Grammar.y"
+  case 111:
+#line 1370 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 3139 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 112:
-
-/* Line 1455 of yacc.c  */
-#line 1378 "../Slice/Grammar.y"
+  case 113:
+#line 1384 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[(1) - (3)]));
-    ExceptionListTokPtr exceptionList = ExceptionListTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[-2]));
+    ExceptionListTokPtr exceptionList = ExceptionListTokPtr::dynamicCast((yyvsp[0]));
     exceptionList->v.push_front(exception);
     (yyval) = exceptionList;
-;}
+}
+#line 3150 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 113:
-
-/* Line 1455 of yacc.c  */
-#line 1385 "../Slice/Grammar.y"
+  case 114:
+#line 1391 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[(1) - (1)]));
+    ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[0]));
     ExceptionListTokPtr exceptionList = new ExceptionListTok;
     exceptionList->v.push_front(exception);
     (yyval) = exceptionList;
-;}
+}
+#line 3161 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 114:
-
-/* Line 1455 of yacc.c  */
-#line 1397 "../Slice/Grammar.y"
+  case 115:
+#line 1403 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     ExceptionPtr exception = cont->lookupException(scoped->v);
     if(!exception)
     {
-	exception = cont->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy
+    exception = cont->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy
     }
     cont->checkIntroduced(scoped->v, exception);
     (yyval) = exception;
-;}
+}
+#line 3177 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 115:
-
-/* Line 1455 of yacc.c  */
-#line 1409 "../Slice/Grammar.y"
+  case 116:
+#line 1415 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     unit->error("keyword `" + ident->v + "' cannot be used as exception name");
     (yyval) = unit->currentContainer()->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy
-;}
+}
+#line 3187 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 116:
-
-/* Line 1455 of yacc.c  */
-#line 1420 "../Slice/Grammar.y"
+  case 117:
+#line 1426 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (7)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(7) - (7)]));
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (7)]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (7)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-6]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[-2]));
     ContainerPtr cont = unit->currentContainer();
     (yyval) = cont->createSequence(ident->v, type, metaData->v, local->v);
-;}
+}
+#line 3200 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 117:
-
-/* Line 1455 of yacc.c  */
-#line 1429 "../Slice/Grammar.y"
+  case 118:
+#line 1435 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (7)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(7) - (7)]));
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (7)]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (7)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-6]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[-2]));
     ContainerPtr cont = unit->currentContainer();
     (yyval) = cont->createSequence(ident->v, type, metaData->v, local->v); // Dummy
     unit->error("keyword `" + ident->v + "' cannot be used as sequence name");
-;}
+}
+#line 3214 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 118:
-
-/* Line 1455 of yacc.c  */
-#line 1444 "../Slice/Grammar.y"
-    {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (10)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(10) - (10)]));
-    StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (10)]));
-    TypePtr keyType = TypePtr::dynamicCast((yyvsp[(5) - (10)]));
-    StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[(7) - (10)]));
-    TypePtr valueType = TypePtr::dynamicCast((yyvsp[(8) - (10)]));
+  case 119:
+#line 1450 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-9]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[-6]));
+    TypePtr keyType = TypePtr::dynamicCast((yyvsp[-5]));
+    StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    TypePtr valueType = TypePtr::dynamicCast((yyvsp[-2]));
     ContainerPtr cont = unit->currentContainer();
     (yyval) = cont->createDictionary(ident->v, keyType, keyMetaData->v, valueType, valueMetaData->v, local->v);
-;}
+}
+#line 3229 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 119:
-
-/* Line 1455 of yacc.c  */
-#line 1455 "../Slice/Grammar.y"
-    {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (10)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(10) - (10)]));
-    StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (10)]));
-    TypePtr keyType = TypePtr::dynamicCast((yyvsp[(5) - (10)]));
-    StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[(7) - (10)]));
-    TypePtr valueType = TypePtr::dynamicCast((yyvsp[(8) - (10)]));
+  case 120:
+#line 1461 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-9]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[-6]));
+    TypePtr keyType = TypePtr::dynamicCast((yyvsp[-5]));
+    StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    TypePtr valueType = TypePtr::dynamicCast((yyvsp[-2]));
     ContainerPtr cont = unit->currentContainer();
     (yyval) = cont->createDictionary(ident->v, keyType, keyMetaData->v, valueType, valueMetaData->v, local->v); // Dummy
     unit->error("keyword `" + ident->v + "' cannot be used as dictionary name");
-;}
+}
+#line 3245 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 120:
-
-/* Line 1455 of yacc.c  */
-#line 1472 "../Slice/Grammar.y"
+  case 121:
+#line 1478 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 3253 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 121:
-
-/* Line 1455 of yacc.c  */
-#line 1476 "../Slice/Grammar.y"
+  case 122:
+#line 1482 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     unit->error("keyword `" + ident->v + "' cannot be used as enumeration name");
-    (yyval) = (yyvsp[(2) - (2)]); // Dummy
-;}
+    (yyval) = (yyvsp[0]); // Dummy
+}
+#line 3263 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 122:
-
-/* Line 1455 of yacc.c  */
-#line 1487 "../Slice/Grammar.y"
+  case 123:
+#line 1493 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     EnumPtr en = cont->createEnum(ident->v, local->v);
     cont->checkIntroduced(ident->v, en);
     (yyval) = en;
-;}
+}
+#line 3276 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 123:
-
-/* Line 1455 of yacc.c  */
-#line 1496 "../Slice/Grammar.y"
+  case 124:
+#line 1502 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    EnumPtr en = EnumPtr::dynamicCast((yyvsp[(3) - (6)]));
+    EnumPtr en = EnumPtr::dynamicCast((yyvsp[-3]));
     if(en)
     {
-	EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[(5) - (6)]));
-	if(enumerators->v.empty())
-	{
-	    unit->error("enum `" + en->name() + "' must have at least one enumerator");
-	}
-	en->setEnumerators(enumerators->v); // Dummy
+    EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[-1]));
+    if(enumerators->v.empty())
+    {
+        unit->error("enum `" + en->name() + "' must have at least one enumerator");
     }
-    (yyval) = (yyvsp[(3) - (6)]);
-;}
+    en->setEnumerators(enumerators->v); // Dummy
+    }
+    (yyval) = (yyvsp[-3]);
+}
+#line 3294 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 124:
-
-/* Line 1455 of yacc.c  */
-#line 1511 "../Slice/Grammar.y"
+  case 125:
+#line 1517 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("missing enumeration name");
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (5)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-4]));
     ContainerPtr cont = unit->currentContainer();
     EnumPtr en = cont->createEnum(IceUtil::generateUUID(), local->v, Dummy); // Dummy
-    EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[(4) - (5)]));
+    EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[-1]));
     en->setEnumerators(enumerators->v); // Dummy
     (yyval) = en;
-;}
+}
+#line 3308 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 125:
-
-/* Line 1455 of yacc.c  */
-#line 1526 "../Slice/Grammar.y"
+  case 126:
+#line 1532 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    EnumeratorListTokPtr ens = EnumeratorListTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    ens->v.splice(ens->v.end(), EnumeratorListTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v);
+    EnumeratorListTokPtr ens = EnumeratorListTokPtr::dynamicCast((yyvsp[-2]));
+    ens->v.splice(ens->v.end(), EnumeratorListTokPtr::dynamicCast((yyvsp[0]))->v);
     (yyval) = ens;
-;}
+}
+#line 3318 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 126:
-
-/* Line 1455 of yacc.c  */
-#line 1532 "../Slice/Grammar.y"
+  case 127:
+#line 1538 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 3325 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 127:
-
-/* Line 1455 of yacc.c  */
-#line 1540 "../Slice/Grammar.y"
+  case 128:
+#line 1546 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     EnumeratorListTokPtr ens = new EnumeratorListTok;
     ContainerPtr cont = unit->currentContainer();
     EnumeratorPtr en = cont->createEnumerator(ident->v);
     if(en)
     {
-	ens->v.push_front(en);
+    ens->v.push_front(en);
     }
     (yyval) = ens;
-;}
+}
+#line 3341 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 128:
-
-/* Line 1455 of yacc.c  */
-#line 1552 "../Slice/Grammar.y"
+  case 129:
+#line 1558 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-2]));
     EnumeratorListTokPtr ens = new EnumeratorListTok;
     ContainerPtr cont = unit->currentContainer();
-    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[0]));
     if(intVal)
     {
         if(intVal->v < 0 || intVal->v > Int32Max)
@@ -3650,46 +3363,42 @@ yyreduce:
         }
     }
     (yyval) = ens;
-;}
+}
+#line 3368 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 129:
-
-/* Line 1455 of yacc.c  */
-#line 1575 "../Slice/Grammar.y"
+  case 130:
+#line 1581 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     unit->error("keyword `" + ident->v + "' cannot be used as enumerator");
     EnumeratorListTokPtr ens = new EnumeratorListTok; // Dummy
     (yyval) = ens;
-;}
+}
+#line 3379 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 130:
-
-/* Line 1455 of yacc.c  */
-#line 1582 "../Slice/Grammar.y"
+  case 131:
+#line 1588 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     EnumeratorListTokPtr ens = new EnumeratorListTok;
     (yyval) = ens; // Dummy
-;}
+}
+#line 3388 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 131:
-
-/* Line 1455 of yacc.c  */
-#line 1592 "../Slice/Grammar.y"
+  case 132:
+#line 1598 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(1) - (1)]);
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 3396 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 132:
-
-/* Line 1455 of yacc.c  */
-#line 1596 "../Slice/Grammar.y"
+  case 133:
+#line 1602 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainedList cl = unit->currentContainer()->lookupContained(scoped->v);
     IntegerTokPtr tok;
     if(!cl.empty())
@@ -3720,433 +3429,407 @@ yyreduce:
     }
 
     (yyval) = tok;
-;}
+}
+#line 3434 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 133:
-
-/* Line 1455 of yacc.c  */
-#line 1635 "../Slice/Grammar.y"
+  case 134:
+#line 1641 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BoolTokPtr out = new BoolTok;
     out->v = true;
     (yyval) = out;
-;}
+}
+#line 3444 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 134:
-
-/* Line 1455 of yacc.c  */
-#line 1641 "../Slice/Grammar.y"
+  case 135:
+#line 1647 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BoolTokPtr out = new BoolTok;
     out->v = false;
     (yyval) = out;
-;}
+}
+#line 3454 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 135:
-
-/* Line 1455 of yacc.c  */
-#line 1652 "../Slice/Grammar.y"
+  case 136:
+#line 1658 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 3461 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 136:
-
-/* Line 1455 of yacc.c  */
-#line 1655 "../Slice/Grammar.y"
+  case 137:
+#line 1661 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2]));
+    OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[0]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
-	unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
-        StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (3)]));
+        ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
+        unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
+        StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-1]));
         if(!metaData->v.empty())
         {
             pd->setMetaData(metaData->v);
         }
     }
-;}
+}
+#line 3481 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 137:
-
-/* Line 1455 of yacc.c  */
-#line 1671 "../Slice/Grammar.y"
+  case 138:
+#line 1677 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (5)]));
-    OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[(5) - (5)]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2]));
+    OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[0]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
-	unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
-        StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (5)]));
+        ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
+        unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
+        StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-1]));
         if(!metaData->v.empty())
         {
             pd->setMetaData(metaData->v);
         }
     }
-;}
-    break;
-
-  case 138:
-
-/* Line 1455 of yacc.c  */
-#line 1687 "../Slice/Grammar.y"
-    {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (4)]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(3) - (4)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(4) - (4)]));
-    OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
-    if(op)
-    {
-	op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
-	unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
-    }
-;}
+}
+#line 3501 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 139:
-
-/* Line 1455 of yacc.c  */
-#line 1699 "../Slice/Grammar.y"
+#line 1693 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (6)]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (6)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(6) - (6)]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-3]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
-	unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
+        op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
+        unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
     }
-;}
+}
+#line 3517 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 140:
-
-/* Line 1455 of yacc.c  */
-#line 1711 "../Slice/Grammar.y"
+#line 1705 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(3) - (3)]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-3]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
-	unit->error("missing parameter name");
+        op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
+        unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
     }
-;}
+}
+#line 3533 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 141:
-
-/* Line 1455 of yacc.c  */
-#line 1722 "../Slice/Grammar.y"
+#line 1717 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (5)]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (5)]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[0]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
-	unit->error("missing parameter name");
+        op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
+        unit->error("missing parameter name");
     }
-;}
+}
+#line 3548 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 142:
-
-/* Line 1455 of yacc.c  */
-#line 1738 "../Slice/Grammar.y"
+#line 1728 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[0]));
+    OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
+    if(op)
+    {
+        op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
+        unit->error("missing parameter name");
+    }
+}
+#line 3563 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 143:
-
-/* Line 1455 of yacc.c  */
-#line 1742 "../Slice/Grammar.y"
+#line 1744 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = new ExceptionListTok;
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 3571 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 144:
-
-/* Line 1455 of yacc.c  */
-#line 1751 "../Slice/Grammar.y"
+#line 1748 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+    (yyval) = new ExceptionListTok;
+}
+#line 3579 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 145:
+#line 1757 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+}
+#line 3586 "Grammar.tab.c" /* yacc.c:1646  */
+    break;
 
-/* Line 1455 of yacc.c  */
-#line 1754 "../Slice/Grammar.y"
+  case 146:
+#line 1760 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     ident->v = "::" + ident->v;
     (yyval) = ident;
-;}
+}
+#line 3596 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 146:
-
-/* Line 1455 of yacc.c  */
-#line 1760 "../Slice/Grammar.y"
+  case 147:
+#line 1766 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-2]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     scoped->v += "::";
     scoped->v += ident->v;
     (yyval) = scoped;
-;}
+}
+#line 3608 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 147:
-
-/* Line 1455 of yacc.c  */
-#line 1773 "../Slice/Grammar.y"
+  case 148:
+#line 1779 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindByte);
-;}
+}
+#line 3616 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 148:
-
-/* Line 1455 of yacc.c  */
-#line 1777 "../Slice/Grammar.y"
+  case 149:
+#line 1783 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindBool);
-;}
+}
+#line 3624 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 149:
-
-/* Line 1455 of yacc.c  */
-#line 1781 "../Slice/Grammar.y"
+  case 150:
+#line 1787 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindShort);
-;}
+}
+#line 3632 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 150:
-
-/* Line 1455 of yacc.c  */
-#line 1785 "../Slice/Grammar.y"
+  case 151:
+#line 1791 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindInt);
-;}
+}
+#line 3640 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 151:
-
-/* Line 1455 of yacc.c  */
-#line 1789 "../Slice/Grammar.y"
+  case 152:
+#line 1795 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindLong);
-;}
+}
+#line 3648 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 152:
-
-/* Line 1455 of yacc.c  */
-#line 1793 "../Slice/Grammar.y"
+  case 153:
+#line 1799 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindFloat);
-;}
+}
+#line 3656 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 153:
-
-/* Line 1455 of yacc.c  */
-#line 1797 "../Slice/Grammar.y"
+  case 154:
+#line 1803 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindDouble);
-;}
+}
+#line 3664 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 154:
-
-/* Line 1455 of yacc.c  */
-#line 1801 "../Slice/Grammar.y"
+  case 155:
+#line 1807 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindString);
-;}
+}
+#line 3672 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 155:
-
-/* Line 1455 of yacc.c  */
-#line 1805 "../Slice/Grammar.y"
+  case 156:
+#line 1811 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindObject);
-;}
+}
+#line 3680 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 156:
-
-/* Line 1455 of yacc.c  */
-#line 1809 "../Slice/Grammar.y"
+  case 157:
+#line 1815 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindObjectProxy);
-;}
+}
+#line 3688 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 157:
-
-/* Line 1455 of yacc.c  */
-#line 1813 "../Slice/Grammar.y"
+  case 158:
+#line 1819 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindLocalObject);
-;}
+}
+#line 3696 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 158:
+  case 159:
+#line 1823 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+    (yyval) = unit->builtin(Builtin::KindValue);
+}
+#line 3704 "Grammar.tab.c" /* yacc.c:1646  */
+    break;
 
-/* Line 1455 of yacc.c  */
-#line 1817 "../Slice/Grammar.y"
+  case 160:
+#line 1827 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     if(cont)
     {
-	TypeList types = cont->lookupType(scoped->v);
-	if(types.empty())
-	{
-	    YYERROR; // Can't continue, jump to next yyerrok
-	}
-	cont->checkIntroduced(scoped->v);
-	(yyval) = types.front();
+        TypeList types = cont->lookupType(scoped->v);
+        if(types.empty())
+        {
+            YYERROR; // Can't continue, jump to next yyerrok
+        }
+        cont->checkIntroduced(scoped->v);
+        (yyval) = types.front();
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 3727 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 159:
-
-/* Line 1455 of yacc.c  */
-#line 1836 "../Slice/Grammar.y"
+  case 161:
+#line 1846 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (2)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1]));
     ContainerPtr cont = unit->currentContainer();
     if(cont)
     {
-	TypeList types = cont->lookupType(scoped->v);
-	if(types.empty())
-	{
-	    YYERROR; // Can't continue, jump to next yyerrok
-	}
-	for(TypeList::iterator p = types.begin(); p != types.end(); ++p)
-	{
-	    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(*p);
-	    if(!cl)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' must be class or interface";
-		unit->error(msg);
-		YYERROR; // Can't continue, jump to next yyerrok
-	    }
-	    cont->checkIntroduced(scoped->v);
-	    if(cl->isLocal())
-	    {
-		unit->error("cannot create proxy for " + cl->kindOf() + " `" + cl->name() + "'"); // $$ is dummy
-	    }
-	    *p = new Proxy(cl);
-	}
-	(yyval) = types.front();
+        TypeList types = cont->lookupType(scoped->v);
+        if(types.empty())
+        {
+            YYERROR; // Can't continue, jump to next yyerrok
+        }
+        for(TypeList::iterator p = types.begin(); p != types.end(); ++p)
+        {
+            ClassDeclPtr cl = ClassDeclPtr::dynamicCast(*p);
+            if(!cl)
+            {
+                string msg = "`";
+                msg += scoped->v;
+                msg += "' must be class or interface";
+                unit->error(msg);
+                YYERROR; // Can't continue, jump to next yyerrok
+            }
+            cont->checkIntroduced(scoped->v);
+            if(cl->isLocal())
+            {
+                unit->error("cannot create proxy for " + cl->kindOf() + " `" + cl->name() + "'"); // $$ is dummy
+            }
+            *p = new Proxy(cl);
+        }
+        (yyval) = types.front();
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 3767 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 160:
-
-/* Line 1455 of yacc.c  */
-#line 1877 "../Slice/Grammar.y"
+  case 162:
+#line 1887 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr str1 = StringTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    StringTokPtr str2 = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr str1 = StringTokPtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr str2 = StringTokPtr::dynamicCast((yyvsp[0]));
     str1->v += str2->v;
-;}
+}
+#line 3777 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 161:
-
-/* Line 1455 of yacc.c  */
-#line 1883 "../Slice/Grammar.y"
+  case 163:
+#line 1893 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 3784 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 162:
-
-/* Line 1455 of yacc.c  */
-#line 1891 "../Slice/Grammar.y"
+  case 164:
+#line 1901 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]));
-    StringListTokPtr stringList = StringListTokPtr::dynamicCast((yyvsp[(1) - (3)]));
+    StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringListTokPtr stringList = StringListTokPtr::dynamicCast((yyvsp[-2]));
     stringList->v.push_back(str->v);
     (yyval) = stringList;
-;}
+}
+#line 3795 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 163:
-
-/* Line 1455 of yacc.c  */
-#line 1898 "../Slice/Grammar.y"
+  case 165:
+#line 1908 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[0]));
     StringListTokPtr stringList = new StringListTok;
     stringList->v.push_back(str->v);
     (yyval) = stringList;
-;}
+}
+#line 3806 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 164:
-
-/* Line 1455 of yacc.c  */
-#line 1910 "../Slice/Grammar.y"
+  case 166:
+#line 1920 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BoolTokPtr local = new BoolTok;
     local->v = true;
     (yyval) = local;
-;}
+}
+#line 3816 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 165:
-
-/* Line 1455 of yacc.c  */
-#line 1916 "../Slice/Grammar.y"
+  case 167:
+#line 1926 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BoolTokPtr local = new BoolTok;
     local->v = false;
     (yyval) = local;
-;}
+}
+#line 3826 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 166:
-
-/* Line 1455 of yacc.c  */
-#line 1927 "../Slice/Grammar.y"
+  case 168:
+#line 1937 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BuiltinPtr type = unit->builtin(Builtin::KindLong);
-    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[0]));
     ostringstream sstr;
     sstr << intVal->v;
     ConstDefTokPtr def = new ConstDefTok;
@@ -4155,16 +3838,15 @@ yyreduce:
     def->v.valueAsString = sstr.str();
     def->v.valueAsLiteral = intVal->literal;
     (yyval) = def;
-;}
+}
+#line 3843 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 167:
-
-/* Line 1455 of yacc.c  */
-#line 1940 "../Slice/Grammar.y"
+  case 169:
+#line 1950 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BuiltinPtr type = unit->builtin(Builtin::KindDouble);
-    FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[0]));
     ostringstream sstr;
     sstr << floatVal->v;
     ConstDefTokPtr def = new ConstDefTok;
@@ -4173,15 +3855,14 @@ yyreduce:
     def->v.valueAsString = sstr.str();
     def->v.valueAsLiteral = floatVal->literal;
     (yyval) = def;
-;}
+}
+#line 3860 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 168:
-
-/* Line 1455 of yacc.c  */
-#line 1953 "../Slice/Grammar.y"
+  case 170:
+#line 1963 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
     ConstDefTokPtr def = new ConstDefTok;
     ContainedList cl = unit->currentContainer()->lookupContained(scoped->v);
     if(cl.empty())
@@ -4193,9 +3874,9 @@ yyreduce:
     }
     else
     {
-	EnumeratorPtr enumerator = EnumeratorPtr::dynamicCast(cl.front());
+        EnumeratorPtr enumerator = EnumeratorPtr::dynamicCast(cl.front());
         ConstPtr constant = ConstPtr::dynamicCast(cl.front());
-	if(enumerator)
+        if(enumerator)
         {
             unit->currentContainer()->checkIntroduced(scoped->v, enumerator);
             def->v.type = enumerator->type();
@@ -4211,336 +3892,319 @@ yyreduce:
             def->v.valueAsLiteral = constant->value();
         }
         else
-	{
-	    string msg = "illegal initializer: `" + scoped->v + "' is a";
-	    static const string vowels = "aeiou";
-	    string kindOf = cl.front()->kindOf();
-	    if(vowels.find_first_of(kindOf[0]) != string::npos)
-	    {
-	    	msg += "n";
-	    }
-	    msg += " " + kindOf;
-	    unit->error(msg); // $$ is dummy
-	}
+        {
+            string msg = "illegal initializer: `" + scoped->v + "' is a";
+            static const string vowels = "aeiou";
+            string kindOf = cl.front()->kindOf();
+            if(vowels.find_first_of(kindOf[0]) != string::npos)
+            {
+                msg += "n";
+            }
+            msg += " " + kindOf;
+            unit->error(msg); // $$ is dummy
+        }
     }
     (yyval) = def;
-;}
+}
+#line 3910 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 169:
-
-/* Line 1455 of yacc.c  */
-#line 1999 "../Slice/Grammar.y"
+  case 171:
+#line 2009 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BuiltinPtr type = unit->builtin(Builtin::KindString);
-    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0]));
     ConstDefTokPtr def = new ConstDefTok;
     def->v.type = type;
     def->v.value = type;
     def->v.valueAsString = literal->v;
     def->v.valueAsLiteral = literal->literal;
     (yyval) = def;
-;}
+}
+#line 3925 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 170:
-
-/* Line 1455 of yacc.c  */
-#line 2010 "../Slice/Grammar.y"
+  case 172:
+#line 2020 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BuiltinPtr type = unit->builtin(Builtin::KindBool);
-    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0]));
     ConstDefTokPtr def = new ConstDefTok;
     def->v.type = type;
     def->v.value = type;
     def->v.valueAsString = "false";
     def->v.valueAsLiteral = "false";
     (yyval) = def;
-;}
+}
+#line 3940 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 171:
-
-/* Line 1455 of yacc.c  */
-#line 2021 "../Slice/Grammar.y"
+  case 173:
+#line 2031 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BuiltinPtr type = unit->builtin(Builtin::KindBool);
-    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0]));
     ConstDefTokPtr def = new ConstDefTok;
     def->v.type = type;
     def->v.value = type;
     def->v.valueAsString = "true";
     def->v.valueAsLiteral = "true";
     (yyval) = def;
-;}
+}
+#line 3955 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 172:
-
-/* Line 1455 of yacc.c  */
-#line 2037 "../Slice/Grammar.y"
+  case 174:
+#line 2047 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (6)]));
-    TypePtr const_type = TypePtr::dynamicCast((yyvsp[(3) - (6)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(4) - (6)]));
-    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(6) - (6)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-4]));
+    TypePtr const_type = TypePtr::dynamicCast((yyvsp[-3]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-2]));
+    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0]));
     (yyval) = unit->currentContainer()->createConst(ident->v, const_type, metaData->v, value->v.value,
                                                value->v.valueAsString, value->v.valueAsLiteral);
-;}
+}
+#line 3968 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 173:
-
-/* Line 1455 of yacc.c  */
-#line 2046 "../Slice/Grammar.y"
+  case 175:
+#line 2056 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (5)]));
-    TypePtr const_type = TypePtr::dynamicCast((yyvsp[(3) - (5)]));
-    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(5) - (5)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    TypePtr const_type = TypePtr::dynamicCast((yyvsp[-2]));
+    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0]));
     unit->error("missing constant name");
     (yyval) = unit->currentContainer()->createConst(IceUtil::generateUUID(), const_type, metaData->v, value->v.value,
                                                value->v.valueAsString, value->v.valueAsLiteral, Dummy); // Dummy
-;}
-    break;
-
-  case 174:
-
-/* Line 1455 of yacc.c  */
-#line 2060 "../Slice/Grammar.y"
-    {
-;}
-    break;
-
-  case 175:
-
-/* Line 1455 of yacc.c  */
-#line 2063 "../Slice/Grammar.y"
-    {
-;}
+}
+#line 3981 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 176:
-
-/* Line 1455 of yacc.c  */
-#line 2066 "../Slice/Grammar.y"
+#line 2070 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 3988 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 177:
-
-/* Line 1455 of yacc.c  */
-#line 2069 "../Slice/Grammar.y"
+#line 2073 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 3995 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 178:
-
-/* Line 1455 of yacc.c  */
-#line 2072 "../Slice/Grammar.y"
+#line 2076 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4002 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 179:
-
-/* Line 1455 of yacc.c  */
-#line 2075 "../Slice/Grammar.y"
+#line 2079 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4009 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 180:
-
-/* Line 1455 of yacc.c  */
-#line 2078 "../Slice/Grammar.y"
+#line 2082 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4016 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 181:
-
-/* Line 1455 of yacc.c  */
-#line 2081 "../Slice/Grammar.y"
+#line 2085 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4023 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 182:
-
-/* Line 1455 of yacc.c  */
-#line 2084 "../Slice/Grammar.y"
+#line 2088 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4030 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 183:
-
-/* Line 1455 of yacc.c  */
-#line 2087 "../Slice/Grammar.y"
+#line 2091 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4037 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 184:
-
-/* Line 1455 of yacc.c  */
-#line 2090 "../Slice/Grammar.y"
+#line 2094 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4044 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 185:
-
-/* Line 1455 of yacc.c  */
-#line 2093 "../Slice/Grammar.y"
+#line 2097 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4051 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 186:
-
-/* Line 1455 of yacc.c  */
-#line 2096 "../Slice/Grammar.y"
+#line 2100 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4058 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 187:
-
-/* Line 1455 of yacc.c  */
-#line 2099 "../Slice/Grammar.y"
+#line 2103 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4065 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 188:
-
-/* Line 1455 of yacc.c  */
-#line 2102 "../Slice/Grammar.y"
+#line 2106 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4072 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 189:
-
-/* Line 1455 of yacc.c  */
-#line 2105 "../Slice/Grammar.y"
+#line 2109 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4079 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 190:
-
-/* Line 1455 of yacc.c  */
-#line 2108 "../Slice/Grammar.y"
+#line 2112 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4086 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 191:
-
-/* Line 1455 of yacc.c  */
-#line 2111 "../Slice/Grammar.y"
+#line 2115 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4093 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 192:
-
-/* Line 1455 of yacc.c  */
-#line 2114 "../Slice/Grammar.y"
+#line 2118 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4100 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 193:
-
-/* Line 1455 of yacc.c  */
-#line 2117 "../Slice/Grammar.y"
+#line 2121 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4107 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 194:
-
-/* Line 1455 of yacc.c  */
-#line 2120 "../Slice/Grammar.y"
+#line 2124 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4114 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 195:
-
-/* Line 1455 of yacc.c  */
-#line 2123 "../Slice/Grammar.y"
+#line 2127 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4121 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 196:
-
-/* Line 1455 of yacc.c  */
-#line 2126 "../Slice/Grammar.y"
+#line 2130 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4128 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 197:
-
-/* Line 1455 of yacc.c  */
-#line 2129 "../Slice/Grammar.y"
+#line 2133 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4135 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 198:
-
-/* Line 1455 of yacc.c  */
-#line 2132 "../Slice/Grammar.y"
+#line 2136 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4142 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 199:
-
-/* Line 1455 of yacc.c  */
-#line 2135 "../Slice/Grammar.y"
+#line 2139 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4149 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 200:
-
-/* Line 1455 of yacc.c  */
-#line 2138 "../Slice/Grammar.y"
+#line 2142 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4156 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 201:
-
-/* Line 1455 of yacc.c  */
-#line 2141 "../Slice/Grammar.y"
+#line 2145 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4163 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 202:
+#line 2148 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+}
+#line 4170 "Grammar.tab.c" /* yacc.c:1646  */
+    break;
 
-/* Line 1455 of yacc.c  */
-#line 2144 "../Slice/Grammar.y"
+  case 203:
+#line 2151 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4177 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
+  case 204:
+#line 2154 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+}
+#line 4184 "Grammar.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 205:
+#line 2157 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+}
+#line 4191 "Grammar.tab.c" /* yacc.c:1646  */
+    break;
 
 
-/* Line 1455 of yacc.c  */
-#line 4542 "Grammar.tab.c"
+#line 4195 "Grammar.tab.c" /* yacc.c:1646  */
       default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -4549,7 +4213,7 @@ yyreduce:
 
   *++yyvsp = yyval;
 
-  /* Now `shift' the result of the reduction.  Determine what state
+  /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
 
@@ -4564,10 +4228,14 @@ yyreduce:
   goto yynewstate;
 
 
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -4575,37 +4243,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
       {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
-	      YYSTACK_FREE (yymsg);
-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (yymsg);
-	  }
-	else
-	  {
-	    yyerror (YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
       }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -4614,20 +4281,20 @@ yyerrlab:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
+         error, discard it.  */
 
       if (yychar <= YYEOF)
-	{
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
-	}
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
       else
-	{
-	  yydestruct ("Error: discarding",
-		      yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
     }
 
   /* Else will try to reuse lookahead token after shifting the error
@@ -4646,7 +4313,7 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
@@ -4659,35 +4326,37 @@ yyerrorlab:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
   for (;;)
     {
       yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)
-	YYABORT;
+        YYABORT;
 
 
       yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp);
+                  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -4711,7 +4380,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -4723,16 +4392,21 @@ yyexhaustedlab:
 
 yyreturn:
   if (yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
-  /* Do not reclaim the symbols of the rule which action triggered
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   YY_STACK_PRINT (yyss, yyssp);
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
+                  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -4743,13 +4417,7 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;
 }
-
-
-
-/* Line 1675 of yacc.c  */
-#line 2148 "../Slice/Grammar.y"
-
+#line 2161 "../Slice/Grammar.y" /* yacc.c:1906  */
 
diff --git a/cpp/src/Slice/Grammar.h b/cpp/src/Slice/Grammar.h
index 0ee3d141315..66aa4b73ccd 100644
--- a/cpp/src/Slice/Grammar.h
+++ b/cpp/src/Slice/Grammar.h
@@ -1,21 +1,19 @@
+/* A Bison parser, made by GNU Bison 3.0.2.  */
 
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-   
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -28,71 +26,80 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+#ifndef YY_SLICE_GRAMMAR_TAB_H_INCLUDED
+# define YY_SLICE_GRAMMAR_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int slice_debug;
+#endif
 
-/* Tokens.  */
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ICE_MODULE = 258,
-     ICE_CLASS = 259,
-     ICE_INTERFACE = 260,
-     ICE_EXCEPTION = 261,
-     ICE_STRUCT = 262,
-     ICE_SEQUENCE = 263,
-     ICE_DICTIONARY = 264,
-     ICE_ENUM = 265,
-     ICE_OUT = 266,
-     ICE_EXTENDS = 267,
-     ICE_IMPLEMENTS = 268,
-     ICE_THROWS = 269,
-     ICE_VOID = 270,
-     ICE_BYTE = 271,
-     ICE_BOOL = 272,
-     ICE_SHORT = 273,
-     ICE_INT = 274,
-     ICE_LONG = 275,
-     ICE_FLOAT = 276,
-     ICE_DOUBLE = 277,
-     ICE_STRING = 278,
-     ICE_OBJECT = 279,
-     ICE_LOCAL_OBJECT = 280,
-     ICE_LOCAL = 281,
-     ICE_CONST = 282,
-     ICE_FALSE = 283,
-     ICE_TRUE = 284,
-     ICE_IDEMPOTENT = 285,
-     ICE_OPTIONAL = 286,
-     ICE_SCOPE_DELIMITER = 287,
-     ICE_IDENTIFIER = 288,
-     ICE_STRING_LITERAL = 289,
-     ICE_INTEGER_LITERAL = 290,
-     ICE_FLOATING_POINT_LITERAL = 291,
-     ICE_IDENT_OP = 292,
-     ICE_KEYWORD_OP = 293,
-     ICE_OPTIONAL_OP = 294,
-     ICE_METADATA_OPEN = 295,
-     ICE_METADATA_CLOSE = 296,
-     ICE_GLOBAL_METADATA_OPEN = 297,
-     ICE_GLOBAL_METADATA_CLOSE = 298,
-     BAD_CHAR = 299
-   };
+  enum yytokentype
+  {
+    ICE_MODULE = 258,
+    ICE_CLASS = 259,
+    ICE_INTERFACE = 260,
+    ICE_EXCEPTION = 261,
+    ICE_STRUCT = 262,
+    ICE_SEQUENCE = 263,
+    ICE_DICTIONARY = 264,
+    ICE_ENUM = 265,
+    ICE_OUT = 266,
+    ICE_EXTENDS = 267,
+    ICE_IMPLEMENTS = 268,
+    ICE_THROWS = 269,
+    ICE_VOID = 270,
+    ICE_BYTE = 271,
+    ICE_BOOL = 272,
+    ICE_SHORT = 273,
+    ICE_INT = 274,
+    ICE_LONG = 275,
+    ICE_FLOAT = 276,
+    ICE_DOUBLE = 277,
+    ICE_STRING = 278,
+    ICE_OBJECT = 279,
+    ICE_LOCAL_OBJECT = 280,
+    ICE_LOCAL = 281,
+    ICE_CONST = 282,
+    ICE_FALSE = 283,
+    ICE_TRUE = 284,
+    ICE_IDEMPOTENT = 285,
+    ICE_OPTIONAL = 286,
+    ICE_VALUE = 287,
+    ICE_SCOPE_DELIMITER = 288,
+    ICE_IDENTIFIER = 289,
+    ICE_STRING_LITERAL = 290,
+    ICE_INTEGER_LITERAL = 291,
+    ICE_FLOATING_POINT_LITERAL = 292,
+    ICE_IDENT_OP = 293,
+    ICE_KEYWORD_OP = 294,
+    ICE_OPTIONAL_OP = 295,
+    ICE_METADATA_OPEN = 296,
+    ICE_METADATA_CLOSE = 297,
+    ICE_GLOBAL_METADATA_OPEN = 298,
+    ICE_GLOBAL_METADATA_CLOSE = 299,
+    BAD_CHAR = 300
+  };
 #endif
 
-
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
 
+int slice_parse (void);
 
+#endif /* !YY_SLICE_GRAMMAR_TAB_H_INCLUDED  */
diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
index 43d61962ea0..9d04ed64c73 100644
--- a/cpp/src/Slice/Grammar.y
+++ b/cpp/src/Slice/Grammar.y
@@ -40,11 +40,11 @@ slice_error(const char* s)
 
     if (strcmp(s, "parse error") == 0)
     {
-	unit->error("syntax error");
+        unit->error("syntax error");
     }
     else
     {
-	unit->error(s);
+        unit->error(s);
     }
 }
 
@@ -86,6 +86,7 @@ slice_error(const char* s)
 %token ICE_TRUE
 %token ICE_IDEMPOTENT
 %token ICE_OPTIONAL
+%token ICE_VALUE
 
 //
 // Other tokens.
@@ -156,7 +157,7 @@ definitions
     ContainedPtr contained = ContainedPtr::dynamicCast($2);
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
 }
 ';' definitions
@@ -242,9 +243,9 @@ module_def
     ModulePtr module = cont->createModule(ident->v);
     if(module)
     {
-	cont->checkIntroduced(ident->v, module);
-	unit->pushContainer(module);
-	$$ = module;
+        cont->checkIntroduced(ident->v, module);
+        unit->pushContainer(module);
+        $$ = module;
     }
     else
     {
@@ -255,8 +256,8 @@ module_def
 {
     if($3)
     {
-	unit->popContainer();
-	$$ = $3;
+        unit->popContainer();
+        $$ = $3;
     }
     else
     {
@@ -302,8 +303,8 @@ exception_def
     ExceptionPtr ex = cont->createException(ident->v, base, local->v);
     if(ex)
     {
-	cont->checkIntroduced(ident->v, ex);
-	unit->pushContainer(ex);
+        cont->checkIntroduced(ident->v, ex);
+        unit->pushContainer(ex);
     }
     $$ = ex;
 }
@@ -311,7 +312,7 @@ exception_def
 {
     if($4)
     {
-	unit->popContainer();
+        unit->popContainer();
     }
     $$ = $4;
 }
@@ -343,7 +344,7 @@ exception_exports
     ContainedPtr contained = ContainedPtr::dynamicCast($2);
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
 }
 | error ';' exception_exports
@@ -533,8 +534,8 @@ struct_def
     StructPtr st = cont->createStruct(ident->v, local->v);
     if(st)
     {
-	cont->checkIntroduced(ident->v, st);
-	unit->pushContainer(st);
+        cont->checkIntroduced(ident->v, st);
+        unit->pushContainer(st);
     }
     else
     {
@@ -548,7 +549,7 @@ struct_def
 {
     if($3)
     {
-	unit->popContainer();
+        unit->popContainer();
     }
     $$ = $3;
 
@@ -559,7 +560,7 @@ struct_def
     assert(st);
     if(st->dataMembers().empty())
     {
-    	unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy
+        unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy
     }
 }
 ;
@@ -573,7 +574,7 @@ struct_exports
     ContainedPtr contained = ContainedPtr::dynamicCast($2);
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
 }
 | error ';' struct_exports
@@ -736,14 +737,14 @@ class_def
     ClassListTokPtr bases = ClassListTokPtr::dynamicCast($4);
     if(base)
     {
-	bases->v.push_front(base);
+    bases->v.push_front(base);
     }
     ClassDefPtr cl = cont->createClassDef(ident->v, ident->t, false, bases->v, local->v);
     if(cl)
     {
-	cont->checkIntroduced(ident->v, cl);
-	unit->pushContainer(cl);
-	$$ = cl;
+        cont->checkIntroduced(ident->v, cl);
+        unit->pushContainer(cl);
+        $$ = cl;
     }
     else
     {
@@ -754,8 +755,8 @@ class_def
 {
     if($5)
     {
-	unit->popContainer();
-	$$ = $5;
+        unit->popContainer();
+        $$ = $5;
     }
     else
     {
@@ -775,30 +776,30 @@ class_extends
     $$ = 0;
     if(!types.empty())
     {
-	ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
-	if(!cl || cl->isInterface())
-	{
-	    string msg = "`";
-	    msg += scoped->v;
-	    msg += "' is not a class";
-	    unit->error(msg);
-	}
-	else
-	{
-	    ClassDefPtr def = cl->definition();
-	    if(!def)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' has been declared but not defined";
-		unit->error(msg);
-	    }
-	    else
-	    {
-	    	cont->checkIntroduced(scoped->v);
-		$$ = def;
-	    }
-	}
+        ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
+        if(!cl || cl->isInterface())
+        {
+            string msg = "`";
+            msg += scoped->v;
+            msg += "' is not a class";
+            unit->error(msg);
+        }
+        else
+        {
+            ClassDefPtr def = cl->definition();
+            if(!def)
+            {
+                string msg = "`";
+                msg += scoped->v;
+                msg += "' has been declared but not defined";
+                unit->error(msg);
+            }
+            else
+            {
+                cont->checkIntroduced(scoped->v);
+                $$ = def;
+            }
+        }
     }
 }
 |
@@ -829,7 +830,7 @@ class_exports
     ContainedPtr contained = ContainedPtr::dynamicCast($2);
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
 }
 | error ';' class_exports
@@ -1039,17 +1040,17 @@ operation_preamble
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
-	if(op)
-	{
-	    cl->checkIntroduced(name, op);
-	    unit->pushContainer(op);
-	    $$ = op;
-	}
-	else
-	{
-	    $$ = 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
+        if(op)
+        {
+            cl->checkIntroduced(name, op);
+            unit->pushContainer(op);
+            $$ = op;
+        }
+        else
+        {
+            $$ = 0;
+        }
     }
     else
     {
@@ -1063,18 +1064,18 @@ operation_preamble
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
-                                              Operation::Idempotent);
-	if(op)
-	{
-	    cl->checkIntroduced(name, op);
-	    unit->pushContainer(op);
-	    $$ = op;
-	}
-	else
-	{
-	    $$ = 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
+                                                Operation::Idempotent);
+        if(op)
+        {
+            cl->checkIntroduced(name, op);
+            unit->pushContainer(op);
+            $$ = op;
+        }
+        else
+        {
+            $$ = 0;
+        }
     }
     else
     {
@@ -1088,17 +1089,17 @@ operation_preamble
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
-	if(op)
-	{
-	    unit->pushContainer(op);
-	    unit->error("keyword `" + name + "' cannot be used as operation name");
-	    $$ = op; // Dummy
-	}
-	else
-	{
-	    $$ = 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
+        if(op)
+        {
+            unit->pushContainer(op);
+            unit->error("keyword `" + name + "' cannot be used as operation name");
+            $$ = op; // Dummy
+        }
+        else
+        {
+            $$ = 0;
+        }
     }
     else
     {
@@ -1112,22 +1113,22 @@ operation_preamble
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
-                                              Operation::Idempotent);
-	if(op)
-	{
-	    unit->pushContainer(op);
-	    unit->error("keyword `" + name + "' cannot be used as operation name");
-	    $$ = op; // Dummy
-	}
-	else
-	{
-	    return 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
+                                                Operation::Idempotent);
+        if(op)
+        {
+            unit->pushContainer(op);
+            unit->error("keyword `" + name + "' cannot be used as operation name");
+            $$ = op; // Dummy
+        }
+        else
+        {
+            return 0;
+        }
     }
     else
     {
-    	$$ = 0;
+        $$ = 0;
     }
 }
 ;
@@ -1139,8 +1140,8 @@ operation
 {
     if($1)
     {
-	unit->popContainer();
-	$$ = $1;
+        unit->popContainer();
+        $$ = $1;
     }
     else
     {
@@ -1161,7 +1162,7 @@ throws
 {
     if($1)
     {
-	unit->popContainer();
+        unit->popContainer();
     }
     yyerrok;
 }
@@ -1225,9 +1226,9 @@ interface_def
     ClassDefPtr cl = cont->createClassDef(ident->v, -1, true, bases->v, local->v);
     if(cl)
     {
-	cont->checkIntroduced(ident->v, cl);
-	unit->pushContainer(cl);
-	$$ = cl;
+    cont->checkIntroduced(ident->v, cl);
+    unit->pushContainer(cl);
+    $$ = cl;
     }
     else
     {
@@ -1238,12 +1239,12 @@ interface_def
 {
     if($4)
     {
-	unit->popContainer();
-	$$ = $4;
+    unit->popContainer();
+    $$ = $4;
     }
     else
     {
-	$$ = 0;
+    $$ = 0;
     }
 }
 ;
@@ -1259,30 +1260,30 @@ interface_list
     TypeList types = cont->lookupType(scoped->v);
     if(!types.empty())
     {
-	ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
-	if(!cl || !cl->isInterface())
-	{
-	    string msg = "`";
-	    msg += scoped->v;
-	    msg += "' is not an interface";
-	    unit->error(msg);
-	}
-	else
-	{
-	    ClassDefPtr def = cl->definition();
-	    if(!def)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' has been declared but not defined";
-		unit->error(msg);
-	    }
-	    else
-	    {
-	    	cont->checkIntroduced(scoped->v);
-		intfs->v.push_front(def);
-	    }
-	}
+    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
+    if(!cl || !cl->isInterface())
+    {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' is not an interface";
+        unit->error(msg);
+    }
+    else
+    {
+        ClassDefPtr def = cl->definition();
+        if(!def)
+        {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' has been declared but not defined";
+        unit->error(msg);
+        }
+        else
+        {
+            cont->checkIntroduced(scoped->v);
+        intfs->v.push_front(def);
+        }
+    }
     }
     $$ = intfs;
 }
@@ -1294,30 +1295,30 @@ interface_list
     TypeList types = cont->lookupType(scoped->v);
     if(!types.empty())
     {
-	ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
-	if(!cl || !cl->isInterface())
-	{
-	    string msg = "`";
-	    msg += scoped->v;
-	    msg += "' is not an interface";
-	    unit->error(msg); // $$ is a dummy
-	}
-	else
-	{
-	    ClassDefPtr def = cl->definition();
-	    if(!def)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' has been declared but not defined";
-		unit->error(msg); // $$ is a dummy
-	    }
-	    else
-	    {
-	    	cont->checkIntroduced(scoped->v);
-		intfs->v.push_front(def);
-	    }
-	}
+    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
+    if(!cl || !cl->isInterface())
+    {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' is not an interface";
+        unit->error(msg); // $$ is a dummy
+    }
+    else
+    {
+        ClassDefPtr def = cl->definition();
+        if(!def)
+        {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' has been declared but not defined";
+        unit->error(msg); // $$ is a dummy
+        }
+        else
+        {
+            cont->checkIntroduced(scoped->v);
+        intfs->v.push_front(def);
+        }
+    }
     }
     $$ = intfs;
 }
@@ -1326,6 +1327,11 @@ interface_list
     unit->error("illegal inheritance from type Object");
     $$ = new ClassListTok; // Dummy
 }
+| ICE_VALUE
+{
+    unit->error("illegal inheritance from type Value");
+    $$ = new ClassListTok; // Dummy
+}
 ;
 
 // ----------------------------------------------------------------------
@@ -1350,7 +1356,7 @@ interface_exports
     ContainedPtr contained = ContainedPtr::dynamicCast($2);
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+    contained->setMetaData(metaData->v);
     }
 }
 | error ';' interface_exports
@@ -1400,7 +1406,7 @@ exception
     ExceptionPtr exception = cont->lookupException(scoped->v);
     if(!exception)
     {
-	exception = cont->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy
+    exception = cont->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy
     }
     cont->checkIntroduced(scoped->v, exception);
     $$ = exception;
@@ -1497,12 +1503,12 @@ enum_def
     EnumPtr en = EnumPtr::dynamicCast($3);
     if(en)
     {
-	EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast($5);
-	if(enumerators->v.empty())
-	{
-	    unit->error("enum `" + en->name() + "' must have at least one enumerator");
-	}
-	en->setEnumerators(enumerators->v); // Dummy
+    EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast($5);
+    if(enumerators->v.empty())
+    {
+        unit->error("enum `" + en->name() + "' must have at least one enumerator");
+    }
+    en->setEnumerators(enumerators->v); // Dummy
     }
     $$ = $3;
 }
@@ -1544,7 +1550,7 @@ enumerator
     EnumeratorPtr en = cont->createEnumerator(ident->v);
     if(en)
     {
-	ens->v.push_front(en);
+    ens->v.push_front(en);
     }
     $$ = ens;
 }
@@ -1658,8 +1664,8 @@ parameters
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
-	unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
+        ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
+        unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
         StringListTokPtr metaData = StringListTokPtr::dynamicCast($2);
         if(!metaData->v.empty())
         {
@@ -1674,8 +1680,8 @@ parameters
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
-	unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
+        ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
+        unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
         StringListTokPtr metaData = StringListTokPtr::dynamicCast($4);
         if(!metaData->v.empty())
         {
@@ -1691,8 +1697,8 @@ parameters
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
-	unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
+        op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
+        unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
     }
 }
 | parameters ',' out_qualifier meta_data type keyword
@@ -1703,8 +1709,8 @@ parameters
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
-	unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
+        op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
+        unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
     }
 }
 | out_qualifier meta_data type
@@ -1714,8 +1720,8 @@ parameters
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
-	unit->error("missing parameter name");
+        op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
+        unit->error("missing parameter name");
     }
 }
 | parameters ',' out_qualifier meta_data type
@@ -1725,8 +1731,8 @@ parameters
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
-	unit->error("missing parameter name");
+        op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
+        unit->error("missing parameter name");
     }
 }
 ;
@@ -1813,19 +1819,23 @@ type
 {
     $$ = unit->builtin(Builtin::KindLocalObject);
 }
+| ICE_VALUE
+{
+    $$ = unit->builtin(Builtin::KindValue);
+}
 | scoped_name
 {
     StringTokPtr scoped = StringTokPtr::dynamicCast($1);
     ContainerPtr cont = unit->currentContainer();
     if(cont)
     {
-	TypeList types = cont->lookupType(scoped->v);
-	if(types.empty())
-	{
-	    YYERROR; // Can't continue, jump to next yyerrok
-	}
-	cont->checkIntroduced(scoped->v);
-	$$ = types.front();
+        TypeList types = cont->lookupType(scoped->v);
+        if(types.empty())
+        {
+            YYERROR; // Can't continue, jump to next yyerrok
+        }
+        cont->checkIntroduced(scoped->v);
+        $$ = types.front();
     }
     else
     {
@@ -1838,30 +1848,30 @@ type
     ContainerPtr cont = unit->currentContainer();
     if(cont)
     {
-	TypeList types = cont->lookupType(scoped->v);
-	if(types.empty())
-	{
-	    YYERROR; // Can't continue, jump to next yyerrok
-	}
-	for(TypeList::iterator p = types.begin(); p != types.end(); ++p)
-	{
-	    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(*p);
-	    if(!cl)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' must be class or interface";
-		unit->error(msg);
-		YYERROR; // Can't continue, jump to next yyerrok
-	    }
-	    cont->checkIntroduced(scoped->v);
-	    if(cl->isLocal())
-	    {
-		unit->error("cannot create proxy for " + cl->kindOf() + " `" + cl->name() + "'"); // $$ is dummy
-	    }
-	    *p = new Proxy(cl);
-	}
-	$$ = types.front();
+        TypeList types = cont->lookupType(scoped->v);
+        if(types.empty())
+        {
+            YYERROR; // Can't continue, jump to next yyerrok
+        }
+        for(TypeList::iterator p = types.begin(); p != types.end(); ++p)
+        {
+            ClassDeclPtr cl = ClassDeclPtr::dynamicCast(*p);
+            if(!cl)
+            {
+                string msg = "`";
+                msg += scoped->v;
+                msg += "' must be class or interface";
+                unit->error(msg);
+                YYERROR; // Can't continue, jump to next yyerrok
+            }
+            cont->checkIntroduced(scoped->v);
+            if(cl->isLocal())
+            {
+                unit->error("cannot create proxy for " + cl->kindOf() + " `" + cl->name() + "'"); // $$ is dummy
+            }
+            *p = new Proxy(cl);
+        }
+        $$ = types.front();
     }
     else
     {
@@ -1963,9 +1973,9 @@ const_initializer
     }
     else
     {
-	EnumeratorPtr enumerator = EnumeratorPtr::dynamicCast(cl.front());
+        EnumeratorPtr enumerator = EnumeratorPtr::dynamicCast(cl.front());
         ConstPtr constant = ConstPtr::dynamicCast(cl.front());
-	if(enumerator)
+        if(enumerator)
         {
             unit->currentContainer()->checkIntroduced(scoped->v, enumerator);
             def->v.type = enumerator->type();
@@ -1981,17 +1991,17 @@ const_initializer
             def->v.valueAsLiteral = constant->value();
         }
         else
-	{
-	    string msg = "illegal initializer: `" + scoped->v + "' is a";
-	    static const string vowels = "aeiou";
-	    string kindOf = cl.front()->kindOf();
-	    if(vowels.find_first_of(kindOf[0]) != string::npos)
-	    {
-	    	msg += "n";
-	    }
-	    msg += " " + kindOf;
-	    unit->error(msg); // $$ is dummy
-	}
+        {
+            string msg = "illegal initializer: `" + scoped->v + "' is a";
+            static const string vowels = "aeiou";
+            string kindOf = cl.front()->kindOf();
+            if(vowels.find_first_of(kindOf[0]) != string::npos)
+            {
+                msg += "n";
+            }
+            msg += " " + kindOf;
+            unit->error(msg); // $$ is dummy
+        }
     }
     $$ = def;
 }
@@ -2143,6 +2153,9 @@ keyword
 | ICE_OPTIONAL
 {
 }
+| ICE_VALUE
+{
+}
 ;
 
 %%
diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h
index 25d30c8086c..e11ec472a4b 100644
--- a/cpp/src/Slice/GrammarUtil.h
+++ b/cpp/src/Slice/GrammarUtil.h
@@ -48,7 +48,7 @@ typedef ::IceUtil::Handle<ClassIdTok> ClassIdTokPtr;
 // StringTok
 // ----------------------------------------------------------------------
 
-class SLICE_API StringTok : public GrammarBase
+class StringTok : public GrammarBase
 {
 public:
 
@@ -61,7 +61,7 @@ public:
 // StringListTok
 // ----------------------------------------------------------------------
 
-class SLICE_API StringListTok : public GrammarBase
+class StringListTok : public GrammarBase
 {
 public:
 
@@ -73,7 +73,7 @@ public:
 // TypeStringTok
 // ----------------------------------------------------------------------
 
-class SLICE_API TypeStringTok : public GrammarBase
+class TypeStringTok : public GrammarBase
 {
 public:
 
@@ -85,7 +85,7 @@ public:
 // TypeStringListTok
 // ----------------------------------------------------------------------
 
-class SLICE_API TypeStringListTok : public GrammarBase
+class TypeStringListTok : public GrammarBase
 {
 public:
 
@@ -97,7 +97,7 @@ public:
 // IntegerTok
 // ----------------------------------------------------------------------
 
-class SLICE_API IntegerTok : public GrammarBase
+class IntegerTok : public GrammarBase
 {
 public:
 
@@ -110,7 +110,7 @@ public:
 // FloatingTok
 // ----------------------------------------------------------------------
 
-class SLICE_API FloatingTok : public GrammarBase
+class FloatingTok : public GrammarBase
 {
 public:
 
@@ -123,7 +123,7 @@ public:
 // BoolTok
 // ----------------------------------------------------------------------
 
-class SLICE_API BoolTok : public GrammarBase
+class BoolTok : public GrammarBase
 {
 public:
 
@@ -135,7 +135,7 @@ public:
 // ExceptionListTok
 // ----------------------------------------------------------------------
 
-class SLICE_API ExceptionListTok : public GrammarBase
+class ExceptionListTok : public GrammarBase
 {
 public:
 
@@ -147,7 +147,7 @@ public:
 // ClassListTok
 // ----------------------------------------------------------------------
 
-class SLICE_API ClassListTok : public GrammarBase
+class ClassListTok : public GrammarBase
 {
 public:
 
@@ -159,7 +159,7 @@ public:
 // EnumeratorListTok
 // ----------------------------------------------------------------------
 
-class SLICE_API EnumeratorListTok : public GrammarBase
+class EnumeratorListTok : public GrammarBase
 {
 public:
 
@@ -171,7 +171,7 @@ public:
 // ConstDefTok
 // ----------------------------------------------------------------------
 
-class SLICE_API ConstDefTok : public GrammarBase
+class ConstDefTok : public GrammarBase
 {
 public:
 
@@ -183,7 +183,7 @@ public:
 // OptionalDefTok
 // ----------------------------------------------------------------------
 
-class SLICE_API OptionalDefTok : public GrammarBase
+class OptionalDefTok : public GrammarBase
 {
 public:
 
@@ -195,7 +195,7 @@ public:
 // ClassIdTok
 // ----------------------------------------------------------------------
 
-class SLICE_API ClassIdTok : public GrammarBase
+class ClassIdTok : public GrammarBase
 {
 public:
 
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 207b64fa6ea..c4e4061ea39 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -573,7 +573,7 @@ Slice::JavaGenerator::getStaticId(const TypePtr& type, const string& package) co
     BuiltinPtr b = BuiltinPtr::dynamicCast(type);
     ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
 
-    assert((b && b->kind() == Builtin::KindObject) || cl);
+    assert((b && (b->kind() == Builtin::KindObject || b->kind() == Builtin::KindValue)) || cl);
 
     if(b)
     {
@@ -650,6 +650,10 @@ Slice::JavaGenerator::getOptionalFormat(const TypePtr& type)
             assert(false);
             break;
         }
+        case Builtin::KindValue:
+        {
+            return "Ice.OptionalFormat.Class";
+        }
         }
     }
 
@@ -707,7 +711,8 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
         "String",
         "Ice.Object",
         "Ice.ObjectPrx",
-        "java.lang.Object"
+        "java.lang.Object",
+        "Ice.Object" // Ice.Value
     };
     static const char* builtinHolderTable[] =
     {
@@ -721,7 +726,8 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
         "Ice.StringHolder",
         "Ice.ObjectHolder",
         "Ice.ObjectPrxHolder",
-        "Ice.LocalObjectHolder"
+        "Ice.LocalObjectHolder",
+        "Ice.ObjectHolder" // Ice.ValueHolder
     };
     static const char* builtinOptionalTable[] =
     {
@@ -735,6 +741,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
         "???",
         "???",
         "???",
+        "???",
         "???"
     };
 
@@ -765,6 +772,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     break;
                 }
@@ -904,7 +912,8 @@ Slice::JavaGenerator::typeToObjectString(const TypePtr& type,
         "java.lang.String",
         "Ice.Object",
         "Ice.ObjectPrx",
-        "java.lang.Object"
+        "java.lang.Object",
+        "Ice.Object" // Ice.Value
     };
 
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
@@ -1157,37 +1166,38 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                 break;
             }
             case Builtin::KindObject:
+            case Builtin::KindValue:
             {
                 if(marshal)
                 {
                     if(optionalParam)
                     {
-                        out << nl << stream << ".writeObject(" << tag << ", " << v << ");";
+                        out << nl << stream << ".writeValue(" << tag << ", " << v << ");";
                     }
                     else
                     {
-                        out << nl << stream << ".writeObject(" << v << ");";
+                        out << nl << stream << ".writeValue(" << v << ");";
                     }
                 }
                 else
                 {
                     if(optionalParam)
                     {
-                        out << nl << stream << ".readObject(" << tag << ", " << param << ");";
+                        out << nl << stream << ".readValue(" << tag << ", " << param << ");";
                     }
                     else if(holder && mode == OptionalNone)
                     {
-                        out << nl << stream << ".readObject(" << param << ");";
+                        out << nl << stream << ".readValue(" << param << ");";
                     }
                     else
                     {
                         if(patchParams.empty())
                         {
-                            out << nl << stream << ".readObject(new Patcher());";
+                            out << nl << stream << ".readValue(new Patcher());";
                         }
                         else
                         {
-                            out << nl << stream << ".readObject(" << patchParams << ");";
+                            out << nl << stream << ".readValue(" << patchParams << ");";
                         }
                     }
                 }
@@ -1249,20 +1259,20 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
             {
                 if(optionalMapping)
                 {
-                    out << nl << "if(" << v << " != null && " << v << ".isSet() && " << stream << ".writeOpt(" << tag
-                        << ", " << getOptionalFormat(type) << "))";
+                    out << nl << "if(" << v << " != null && " << v << ".isSet() && " << stream << ".writeOptional("
+                        << tag << ", " << getOptionalFormat(type) << "))";
                     out << sb;
                     out << nl << "int __pos = " << stream << ".startSize();";
-                    out << nl << typeS << "Helper.__write(" << stream << ", " << v << ".get());";
+                    out << nl << typeS << "Helper.write(" << stream << ", " << v << ".get());";
                     out << nl << stream << ".endSize(__pos);";
                     out << eb;
                 }
                 else
                 {
-                    out << nl << "if(" << stream << ".writeOpt(" << tag << ", " << getOptionalFormat(type) << "))";
+                    out << nl << "if(" << stream << ".writeOptional(" << tag << ", " << getOptionalFormat(type) << "))";
                     out << sb;
                     out << nl << "int __pos = " << stream << ".startSize();";
-                    out << nl << typeS << "Helper.__write(" << stream << ", " << v << ");";
+                    out << nl << typeS << "Helper.write(" << stream << ", " << v << ");";
                     out << nl << stream << ".endSize(__pos);";
                     out << eb;
                 }
@@ -1270,22 +1280,22 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
             else if(mode == OptionalMember)
             {
                 out << nl << "int __pos = " << stream << ".startSize();";
-                out << nl << typeS << "Helper.__write(" << stream << ", " << v << ");";
+                out << nl << typeS << "Helper.write(" << stream << ", " << v << ");";
                 out << nl << stream << ".endSize(__pos);";
             }
             else
             {
-                out << nl << typeS << "Helper.__write(" << stream << ", " << v << ");";
+                out << nl << typeS << "Helper.write(" << stream << ", " << v << ");";
             }
         }
         else
         {
             if(optionalParam)
             {
-                out << nl << "if(" << stream << ".readOpt(" << tag << ", " << getOptionalFormat(type) << "))";
+                out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getOptionalFormat(type) << "))";
                 out << sb;
                 out << nl << stream << ".skip(4);";
-                out << nl << v << ".set(" << typeS << "Helper.__read(" << stream << "));";
+                out << nl << v << ".set(" << typeS << "Helper.read(" << stream << "));";
                 out << eb;
                 if(mode == OptionalOutParam)
                 {
@@ -1298,11 +1308,11 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
             else if(mode == OptionalMember)
             {
                 out << nl << stream << ".skip(4);";
-                out << nl << v << " = " << typeS << "Helper.__read(" << stream << ");";
+                out << nl << v << " = " << typeS << "Helper.read(" << stream << ");";
             }
             else
             {
-                out << nl << v << " = " << typeS << "Helper.__read(" << stream << ");";
+                out << nl << v << " = " << typeS << "Helper.read(" << stream << ");";
             }
         }
         return;
@@ -1315,11 +1325,11 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
         {
             if(optionalParam)
             {
-                out << nl << stream << ".writeObject(" << tag << ", " << v << ");";
+                out << nl << stream << ".writeValue(" << tag << ", " << v << ");";
             }
             else
             {
-                out << nl << stream << ".writeObject(" << v << ");";
+                out << nl << stream << ".writeValue(" << v << ");";
             }
         }
         else
@@ -1327,9 +1337,9 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
             if(optionalParam)
             {
                 string typeS = typeToString(type, TypeModeIn, package);
-                out << nl << "if(" << stream << ".readOpt(" << tag << ", " << getOptionalFormat(type) << "))";
+                out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getOptionalFormat(type) << "))";
                 out << sb;
-                out << nl << stream << ".readObject(new Ice.OptionalObject(" << v << ", " << typeS << ".class, "
+                out << nl << stream << ".readValue(new Ice.OptionalObject(" << v << ", " << typeS << ".class, "
                     << getStaticId(type, package) << "));";
                 out << eb;
                 if(mode == OptionalOutParam)
@@ -1344,17 +1354,17 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
             {
                 if(holder && mode == OptionalNone)
                 {
-                    out << nl << stream << ".readObject(" << param << ");";
+                    out << nl << stream << ".readValue(" << param << ");";
                 }
                 else
                 {
                     if(patchParams.empty())
                     {
-                        out << nl << stream << ".readObject(new Patcher());";
+                        out << nl << stream << ".readValue(new Patcher());";
                     }
                     else
                     {
-                        out << nl << stream << ".readObject(" << patchParams << ");";
+                        out << nl << stream << ".readValue(" << patchParams << ");";
                     }
                 }
             }
@@ -1375,13 +1385,14 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                 {
                     if(optionalMapping)
                     {
-                        out << nl << "if(" << v << " != null && " << v << ".isSet() && " << stream << ".writeOpt("
+                        out << nl << "if(" << v << " != null && " << v << ".isSet() && " << stream << ".writeOptional("
                             << tag << ", " << getOptionalFormat(type) << "))";
                         val = v + ".get()";
                     }
                     else
                     {
-                        out << nl << "if(" << stream << ".writeOpt(" << tag << ", " << getOptionalFormat(type) << "))";
+                        out << nl << "if(" << stream << ".writeOptional(" << tag << ", " << getOptionalFormat(type)
+                            << "))";
                         val = v;
                     }
                     out << sb;
@@ -1394,13 +1405,13 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                 if(st->isVariableLength())
                 {
                     out << nl << "int __pos = " <<  stream << ".startSize();";
-                    out << nl << typeS << ".__write(" << stream << ", " << val << ");";
+                    out << nl << typeS << ".write(" << stream << ", " << val << ");";
                     out << nl << stream << ".endSize(__pos);";
                 }
                 else
                 {
                     out << nl << stream << ".writeSize(" << st->minWireSize() << ");";
-                    out << nl << typeS << ".__write(" << stream << ", " << val << ");";
+                    out << nl << typeS << ".write(" << stream << ", " << val << ");";
                 }
                 if(optionalParam)
                 {
@@ -1409,14 +1420,14 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
             }
             else
             {
-                out << nl << typeS << ".__write(" << stream << ", " << v << ");";
+                out << nl << typeS << ".write(" << stream << ", " << v << ");";
             }
         }
         else
         {
             if(optionalParam)
             {
-                out << nl << "if(" << stream << ".readOpt(" << tag << ", " << getOptionalFormat(type) << "))";
+                out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getOptionalFormat(type) << "))";
                 out << sb;
 
                 if(st->isVariableLength())
@@ -1452,11 +1463,11 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                 {
                     out << nl << stream << ".skipSize();";
                 }
-                out << nl << v << " = " << typeS << ".__read(" << stream << ", " << v << ");";
+                out << nl << v << " = " << typeS << ".read(" << stream << ", " << v << ");";
             }
             else
             {
-                out << nl << v << " = " << typeS << ".__read(" << stream << ", " << v << ");";
+                out << nl << v << " = " << typeS << ".read(" << stream << ", " << v << ");";
             }
         }
         return;
@@ -1472,32 +1483,32 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
             {
                 if(optionalMapping)
                 {
-                    out << nl << "if(" << v << " != null && " << v << ".isSet() && " << stream << ".writeOpt(" << tag
-                        << ", " << getOptionalFormat(type) << "))";
+                    out << nl << "if(" << v << " != null && " << v << ".isSet() && " << stream << ".writeOptional("
+                        << tag << ", " << getOptionalFormat(type) << "))";
                     out << sb;
-                    out << nl << typeS << ".__write(" << stream << ", " << v << ".get());";
+                    out << nl << typeS << ".write(" << stream << ", " << v << ".get());";
                     out << eb;
                 }
                 else
                 {
-                    out << nl << "if(" << stream << ".writeOpt(" << tag << ", " << getOptionalFormat(type) << "))";
+                    out << nl << "if(" << stream << ".writeOptional(" << tag << ", " << getOptionalFormat(type) << "))";
                     out << sb;
-                    out << nl << typeS << ".__write(" << stream << ", " << v << ");";
+                    out << nl << typeS << ".write(" << stream << ", " << v << ");";
                     out << eb;
                 }
             }
             else
             {
-                out << nl << typeS << ".__write(" << stream << ", " << v << ");";
+                out << nl << typeS << ".write(" << stream << ", " << v << ");";
             }
         }
         else
         {
             if(optionalParam)
             {
-                out << nl << "if(" << stream << ".readOpt(" << tag << ", " << getOptionalFormat(type) << "))";
+                out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getOptionalFormat(type) << "))";
                 out << sb;
-                out << nl << v << ".set(" << typeS << ".__read(" << stream << "));";
+                out << nl << v << ".set(" << typeS << ".read(" << stream << "));";
                 out << eb;
                 if(mode == OptionalOutParam)
                 {
@@ -1509,7 +1520,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
             }
             else
             {
-                out << nl << v << " = " << typeS << ".__read(" << stream << ");";
+                out << nl << v << " = " << typeS << ".read(" << stream << ");";
             }
         }
         return;
@@ -1530,13 +1541,14 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                 {
                     if(optionalMapping)
                     {
-                        out << nl << "if(" << v << " != null && " << v << ".isSet() && " << stream << ".writeOpt("
+                        out << nl << "if(" << v << " != null && " << v << ".isSet() && " << stream << ".writeOptional("
                             << tag << ", " << getOptionalFormat(type) << "))";
                         out << sb;
                     }
                     else
                     {
-                        out << nl << "if(" << stream << ".writeOpt(" << tag << ", " << getOptionalFormat(type) << "))";
+                        out << nl << "if(" << stream << ".writeOptional(" << tag << ", " << getOptionalFormat(type)
+                            << "))";
                         out << sb;
                     }
                 }
@@ -1579,7 +1591,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                 if(optionalParam)
                 {
                     tmpName = "__optDict";
-                    out << nl << "if(" << stream << ".readOpt(" << tag << ", " << getOptionalFormat(type) << "))";
+                    out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getOptionalFormat(type) << "))";
                     out << sb;
                     out << nl << typeS << ' ' << tmpName << ';';
                 }
@@ -1630,7 +1642,8 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
             BuiltinPtr elemBuiltin = BuiltinPtr::dynamicCast(elemType);
 
             if(optionalParam && elemBuiltin && elemBuiltin->kind() != Builtin::KindObject &&
-               elemBuiltin->kind() != Builtin::KindObjectProxy && !hasTypeMetaData(seq, metaData))
+               elemBuiltin->kind() != Builtin::KindObjectProxy && elemBuiltin->kind() != Builtin::KindValue &&
+               !hasTypeMetaData(seq, metaData))
             {
                 static const char* builtinTable[] =
                 {
@@ -1670,6 +1683,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                         }
                         return;
                     }
+                    case Builtin::KindValue:
                     case Builtin::KindObject:
                     case Builtin::KindObjectProxy:
                     case Builtin::KindLocalObject:
@@ -1689,12 +1703,13 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                 {
                     if(optionalMapping)
                     {
-                        out << nl << "if(" << v << " != null && " << v << ".isSet() && " << stream << ".writeOpt("
+                        out << nl << "if(" << v << " != null && " << v << ".isSet() && " << stream << ".writeOptional("
                             << tag << ", " << getOptionalFormat(type) << "))";
                     }
                     else
                     {
-                        out << nl << "if(" << stream << ".writeOpt(" << tag << ", " << getOptionalFormat(type) << "))";
+                        out << nl << "if(" << stream << ".writeOptional(" << tag << ", " << getOptionalFormat(type)
+                            << "))";
                     }
 
                     out << sb;
@@ -1781,7 +1796,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                 if(optionalParam)
                 {
                     tmpName = "__optSeq";
-                    out << nl << "if(" << stream << ".readOpt(" << tag << ", " << getOptionalFormat(type) << "))";
+                    out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getOptionalFormat(type) << "))";
                     out << sb;
                     out << nl << typeS << ' ' << tmpName << ';';
                 }
@@ -1972,14 +1987,14 @@ Slice::JavaGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
             }
 
             BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-            if(ClassDeclPtr::dynamicCast(type) || (b && b->kind() == Builtin::KindObject))
+            if(ClassDeclPtr::dynamicCast(type) || (b && (b->kind() == Builtin::KindObject || b->kind() == Builtin::KindValue)))
             {
                 string keyTypeStr = typeToObjectString(key, TypeModeIn, package);
                 string valueTypeStr = typeToObjectString(value, TypeModeIn, package);
                 writeMarshalUnmarshalCode(out, package, type, OptionalNone, false, 0, arg, false, iter, false,
                                           StringList(),
                                           "new IceInternal.DictionaryPatcher<" + keyTypeStr + ", " + valueTypeStr +
-                                          ">(" + v + ", " + typeS + ".class, \"" + type->typeId() + "\", __key)");
+                                          ">(" + v + ", " + typeS + ".class, __key)");
             }
             else
             {
@@ -1995,7 +2010,8 @@ Slice::JavaGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
             }
         }
         BuiltinPtr builtin = BuiltinPtr::dynamicCast(value);
-        if(!(builtin && builtin->kind() == Builtin::KindObject) && !ClassDeclPtr::dynamicCast(value))
+        if(!(builtin && (builtin->kind() == Builtin::KindObject || builtin->kind() == Builtin::KindValue)) &&
+           !ClassDeclPtr::dynamicCast(value))
         {
             out << nl << "" << v << ".put(__key, __value);";
         }
@@ -2153,6 +2169,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     assert(false);
                     break;
@@ -2263,7 +2280,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
         {
             bool isObject = false;
             ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
-            if((b && b->kind() == Builtin::KindObject) || cl)
+            if((b && (b->kind() == Builtin::KindObject || b->kind() == Builtin::KindValue)) || cl)
             {
                 isObject = true;
             }
@@ -2301,7 +2318,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                 out << nl << v << ".add(null);";
                 ostringstream patchParams;
                 patchParams << "new IceInternal.ListPatcher<" << origContentS << ">(" << v << ", " << origContentS
-                            << ".class, __type" << iter << ", __i" << iter << ')';
+                            << ".class, __i" << iter << ')';
                 writeMarshalUnmarshalCode(out, package, type, OptionalNone, false, 0, "__elem", false, iter,
                                           false, StringList(), patchParams.str());
             }
@@ -2328,7 +2345,9 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
     else
     {
         BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-        if(b && b->kind() != Builtin::KindObject && b->kind() != Builtin::KindObjectProxy)
+        if(b && b->kind() != Builtin::KindObject &&
+                b->kind() != Builtin::KindValue &&
+                b->kind() != Builtin::KindObjectProxy)
         {
             switch(b->kind())
             {
@@ -2428,6 +2447,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                     }
                     break;
                 }
+                case Builtin::KindValue:
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
@@ -2462,7 +2482,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
             {
                 bool isObject = false;
                 ClassDeclPtr cl = ClassDeclPtr::dynamicCast(origContent);
-                if((b && b->kind() == Builtin::KindObject) || cl)
+                if((b && (b->kind() == Builtin::KindObject || b->kind() == Builtin::KindValue)) || cl)
                 {
                     isObject = true;
                 }
@@ -2538,7 +2558,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                 if(isObject)
                 {
                     patchParams << "new IceInternal.SequencePatcher(" << v << ", " << origContentS
-                                << ".class, __type" << iter << ", __i" << iter << ')';
+                                << ".class, __i" << iter << ')';
                     writeMarshalUnmarshalCode(out, package, type, OptionalNone, false, 0, o.str(), false, iter,
                                               false, StringList(), patchParams.str());
                 }
@@ -2553,1193 +2573,6 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
     }
 }
 
-void
-Slice::JavaGenerator::writeStreamMarshalUnmarshalCode(Output& out,
-                                                      const string& package,
-                                                      const TypePtr& type,
-                                                      bool optional,
-                                                      int /*tag*/,
-                                                      const string& param,
-                                                      bool marshal,
-                                                      int& iter,
-                                                      bool holder,
-                                                      const StringList& metaData,
-                                                      const string& patchParams)
-{
-    string stream = marshal ? "__outS" : "__inS";
-    string v;
-    if(holder && !optional)
-    {
-        v = param + ".value";
-    }
-    else
-    {
-        v = param;
-    }
-
-    BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-    if(builtin)
-    {
-        switch(builtin->kind())
-        {
-            case Builtin::KindByte:
-            {
-                if(marshal)
-                {
-                    out << nl << stream << ".writeByte(" << v << ");";
-                }
-                else
-                {
-                    out << nl << v << " = " << stream << ".readByte();";
-                }
-                break;
-            }
-            case Builtin::KindBool:
-            {
-                if(marshal)
-                {
-                    out << nl << stream << ".writeBool(" << v << ");";
-                }
-                else
-                {
-                    out << nl << v << " = " << stream << ".readBool();";
-                }
-                break;
-            }
-            case Builtin::KindShort:
-            {
-                if(marshal)
-                {
-                    out << nl << stream << ".writeShort(" << v << ");";
-                }
-                else
-                {
-                    out << nl << v << " = " << stream << ".readShort();";
-                }
-                break;
-            }
-            case Builtin::KindInt:
-            {
-                if(marshal)
-                {
-                    out << nl << stream << ".writeInt(" << v << ");";
-                }
-                else
-                {
-                    out << nl << v << " = " << stream << ".readInt();";
-                }
-                break;
-            }
-            case Builtin::KindLong:
-            {
-                if(marshal)
-                {
-                    out << nl << stream << ".writeLong(" << v << ");";
-                }
-                else
-                {
-                    out << nl << v << " = " << stream << ".readLong();";
-                }
-                break;
-            }
-            case Builtin::KindFloat:
-            {
-                if(marshal)
-                {
-                    out << nl << stream << ".writeFloat(" << v << ");";
-                }
-                else
-                {
-                    out << nl << v << " = " << stream << ".readFloat();";
-                }
-                break;
-            }
-            case Builtin::KindDouble:
-            {
-                if(marshal)
-                {
-                    out << nl << stream << ".writeDouble(" << v << ");";
-                }
-                else
-                {
-                    out << nl << v << " = " << stream << ".readDouble();";
-                }
-                break;
-            }
-            case Builtin::KindString:
-            {
-                if(marshal)
-                {
-                    out << nl << stream << ".writeString(" << v << ");";
-                }
-                else
-                {
-                    out << nl << v << " = " << stream << ".readString();";
-                }
-                break;
-            }
-            case Builtin::KindObject:
-            {
-                if(marshal)
-                {
-                    out << nl << stream << ".writeObject(" << v << ");";
-                }
-                else
-                {
-                    if(holder && !optional)
-                    {
-                        out << nl << stream << ".readObject(" << param << ");";
-                    }
-                    else
-                    {
-                        if(patchParams.empty())
-                        {
-                            out << nl << stream << ".readObject(new Patcher());";
-                        }
-                        else
-                        {
-                            out << nl << stream << ".readObject(" << patchParams << ");";
-                        }
-                    }
-                }
-                break;
-            }
-            case Builtin::KindObjectProxy:
-            {
-                if(marshal)
-                {
-                    if(optional)
-                    {
-                        out << nl << "int __pos = " <<  stream << ".startSize();";
-                        out << nl << stream << ".writeProxy(" << v << ");";
-                        out << nl << stream << ".endSize(__pos);";
-                    }
-                    else
-                    {
-                        out << nl << stream << ".writeProxy(" << v << ");";
-                    }
-                }
-                else
-                {
-                    if(optional)
-                    {
-                        out << nl << stream << ".skip(4);";
-                    }
-                    out << nl << v << " = " << stream << ".readProxy();";
-                }
-                break;
-            }
-            case Builtin::KindLocalObject:
-            {
-                assert(false);
-                break;
-            }
-        }
-        return;
-    }
-
-    ProxyPtr prx = ProxyPtr::dynamicCast(type);
-    if(prx)
-    {
-        string typeS = typeToString(type, TypeModeIn, package);
-        if(marshal)
-        {
-            if(optional)
-            {
-                out << nl << "int __pos = " <<  stream << ".startSize();";
-                out << nl << typeS << "Helper.write(" << stream << ", " << v << ");";
-                out << nl << stream << ".endSize(__pos);";
-            }
-            else
-            {
-                out << nl << typeS << "Helper.write(" << stream << ", " << v << ");";
-            }
-        }
-        else
-        {
-            if(optional)
-            {
-                out << nl << stream << ".skip(4);";
-            }
-            out << nl << v << " = " << typeS << "Helper.read(" << stream << ");";
-        }
-        return;
-    }
-
-    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
-    if(cl)
-    {
-        if(marshal)
-        {
-            out << nl << stream << ".writeObject(" << v << ");";
-        }
-        else
-        {
-            if(holder && !optional)
-            {
-                out << nl << stream << ".readObject(" << param << ");";
-            }
-            else
-            {
-                if(patchParams.empty())
-                {
-                    out << nl << stream << ".readObject(new Patcher());";
-                }
-                else
-                {
-                    out << nl << stream << ".readObject(" << patchParams << ");";
-                }
-            }
-        }
-        return;
-    }
-
-    StructPtr st = StructPtr::dynamicCast(type);
-    if(st)
-    {
-        string typeS = typeToString(type, TypeModeIn, package);
-        if(marshal)
-        {
-            if(optional)
-            {
-                if(st->isVariableLength())
-                {
-                    out << nl << "int __pos = " <<  stream << ".startSize();";
-                    out << nl << typeS << ".ice_write(" << stream << ", " << v << ");";
-                    out << nl << stream << ".endSize(__pos);";
-                }
-                else
-                {
-                    out << nl << stream << ".writeSize(" << st->minWireSize() << ");";
-                    out << nl << typeS << ".ice_write(" << stream << ", " << v << ");";
-                }
-            }
-            else
-            {
-                out << nl << typeS << ".ice_write(" << stream << ", " << v << ");";
-            }
-        }
-        else
-        {
-            if(optional)
-            {
-                if(st->isVariableLength())
-                {
-                    out << nl << stream << ".skip(4);";
-                }
-                else
-                {
-                    out << nl << stream << ".skipSize();";
-                }
-            }
-            out << nl << v << " = " << typeS << ".ice_read(" << stream << ", " << v << ");";
-        }
-        return;
-    }
-
-    EnumPtr en = EnumPtr::dynamicCast(type);
-    if(en)
-    {
-        string typeS = typeToString(type, TypeModeIn, package);
-        if(marshal)
-        {
-            out << nl << typeS << ".ice_write(" << stream << ", " << v << ");";
-        }
-        else
-        {
-            out << nl << v << " = " << typeS << ".ice_read(" << stream << ");";
-        }
-        return;
-    }
-
-    DictionaryPtr dict = DictionaryPtr::dynamicCast(type);
-    if(dict)
-    {
-        if(optional)
-        {
-            string typeS = typeToString(type, TypeModeIn, package, metaData);
-            TypePtr keyType = dict->keyType();
-            TypePtr valueType = dict->valueType();
-
-            if(marshal)
-            {
-                if(keyType->isVariableLength() || valueType->isVariableLength())
-                {
-                    out << nl << "int __pos = " <<  stream << ".startSize();";
-                    writeStreamDictionaryMarshalUnmarshalCode(out, package, dict, v, marshal, iter, true, metaData);
-                    out << nl << stream << ".endSize(__pos);";
-                }
-                else
-                {
-                    const size_t wireSize = keyType->minWireSize() + valueType->minWireSize();
-                    out << nl << "final int __optSize = " << v << " == null ? 0 : " << v << ".size();";
-                    out << nl << stream << ".writeSize(__optSize > 254 ? __optSize * " << wireSize
-                        << " + 5 : __optSize * " << wireSize << " + 1);";
-                    writeStreamDictionaryMarshalUnmarshalCode(out, package, dict, v, marshal, iter, true, metaData);
-                }
-            }
-            else
-            {
-                if(keyType->isVariableLength() || valueType->isVariableLength())
-                {
-                    out << nl << stream << ".skip(4);";
-                }
-                else
-                {
-                    out << nl << stream << ".skipSize();";
-                }
-
-                writeStreamDictionaryMarshalUnmarshalCode(out, package, dict, v, marshal, iter, true, metaData);
-            }
-        }
-        else
-        {
-            writeStreamDictionaryMarshalUnmarshalCode(out, package, dict, v, marshal, iter, true, metaData);
-        }
-        return;
-    }
-
-    SequencePtr seq = SequencePtr::dynamicCast(type);
-    if(seq)
-    {
-        if(optional)
-        {
-            string typeS = typeToString(type, TypeModeIn, package, metaData);
-            TypePtr elemType = seq->type();
-            BuiltinPtr elemBuiltin = BuiltinPtr::dynamicCast(elemType);
-
-            string ignore;
-
-            if(marshal)
-            {
-                if(elemType->isVariableLength())
-                {
-                    out << nl << "int __pos = " << stream << ".startSize();";
-                    writeStreamSequenceMarshalUnmarshalCode(out, package, seq, v, marshal, iter, true, metaData);
-                    out << nl << stream << ".endSize(__pos);";
-                }
-                else if(findMetaData("java:type:", metaData, ignore) ||
-                        findMetaData("java:type:", seq->getMetaData(), ignore))
-                {
-                    //
-                    // The sequence is an instance of java.util.List<E>, where E is a fixed-size type.
-                    // If the element type is bool or byte, we do NOT write an extra size.
-                    //
-
-                    if(!elemBuiltin ||
-                       (elemBuiltin->kind() != Builtin::KindByte && elemBuiltin->kind() != Builtin::KindBool))
-                    {
-                        out << nl << "final int __optSize = " << v << " == null ? 0 : " << v << ".size();";
-                        const size_t wireSize = elemType->minWireSize();
-
-                        if(wireSize > 1)
-                        {
-                            out << nl << stream << ".writeSize(__optSize > 254 ? __optSize * " << wireSize
-                                << " + 5 : __optSize * " << wireSize << " + 1);";
-                        }
-                        else
-                        {
-                            //
-                            // The element type could be a struct with a wire size of 1.
-                            //
-                            out << nl << stream << ".writeSize(__optSize > 254 ? __optSize + 5 : __optSize + 1);";
-                        }
-                    }
-                    writeStreamSequenceMarshalUnmarshalCode(out, package, seq, v, marshal, iter, true, metaData);
-                }
-                else if(findMetaData("java:protobuf:", seq->getMetaData(), ignore) ||
-                        findMetaData("java:serializable:", seq->getMetaData(), ignore))
-                {
-                    //
-                    // This just writes a byte sequence.
-                    //
-                    writeStreamSequenceMarshalUnmarshalCode(out, package, seq, v, marshal, iter, true, metaData);
-                }
-                else
-                {
-                    //
-                    // At this point we have a regular Java array of a fixed-size type.
-                    //
-
-                    if(!elemBuiltin || (elemBuiltin->kind() != Builtin::KindByte &&
-                       elemBuiltin->kind() != Builtin::KindBool))
-                    {
-                        out << nl << "final int __optSize = " << v << " == null ? 0 : " << v << ".length;";
-                        const size_t wireSize = elemType->minWireSize();
-
-                        if(wireSize > 1)
-                        {
-                            out << nl << stream << ".writeSize(__optSize > 254 ? __optSize * " << wireSize
-                                << " + 5 : __optSize * " << wireSize << " + 1);";
-                        }
-                        else
-                        {
-                            //
-                            // The element type could be a struct with a wire size of 1.
-                            //
-                            out << nl << stream << ".writeSize(__optSize > 254 ? __optSize + 5 : __optSize + 1);";
-                        }
-                    }
-
-                    writeStreamSequenceMarshalUnmarshalCode(out, package, seq, v, marshal, iter, true, metaData);
-                }
-            }
-            else
-            {
-                if(elemType->isVariableLength())
-                {
-                    out << nl << stream << ".skip(4);";
-                }
-                else if(findMetaData("java:type:", metaData, ignore) ||
-                        findMetaData("java:type:", seq->getMetaData(), ignore))
-                {
-                    //
-                    // The sequence is an instance of java.util.List<E>, where E is a fixed-size type.
-                    // If the element type is bool or byte, we do NOT write an extra size.
-                    //
-
-                    if(!elemBuiltin ||
-                       (elemBuiltin->kind() != Builtin::KindByte && elemBuiltin->kind() != Builtin::KindBool))
-                    {
-                        out << nl << stream << ".skipSize();";
-                    }
-                }
-                else if(!findMetaData("java:protobuf:", seq->getMetaData(), ignore) &&
-                        !findMetaData("java:serializable:", seq->getMetaData(), ignore))
-                {
-                    if(!elemBuiltin ||
-                       (elemBuiltin->kind() != Builtin::KindByte && elemBuiltin->kind() != Builtin::KindBool))
-                    {
-                        out << nl << stream << ".skipSize();";
-                    }
-                }
-
-                writeStreamSequenceMarshalUnmarshalCode(out, package, seq, v, marshal, iter, true, metaData);
-            }
-        }
-        else
-        {
-            writeStreamSequenceMarshalUnmarshalCode(out, package, seq, v, marshal, iter, true, metaData);
-        }
-        return;
-    }
-
-    ConstructedPtr constructed = ConstructedPtr::dynamicCast(type);
-    assert(constructed);
-    string typeS = getAbsolute(constructed, package);
-    if(marshal)
-    {
-        out << nl << typeS << "Helper.write(" << stream << ", " << v << ");";
-    }
-    else
-    {
-        out << nl << v << " = " << typeS << "Helper.read(" << stream << ");";
-    }
-}
-
-void
-Slice::JavaGenerator::writeStreamDictionaryMarshalUnmarshalCode(Output& out,
-                                                                const string& package,
-                                                                const DictionaryPtr& dict,
-                                                                const string& param,
-                                                                bool marshal,
-                                                                int& iter,
-                                                                bool useHelper,
-                                                                const StringList& metaData)
-{
-    string stream = marshal ? "__outS" : "__inS";
-    string v = param;
-
-    //
-    // We have to determine whether it's possible to use the
-    // type's generated helper class for this marshal/unmarshal
-    // task. Since the user may have specified a custom type in
-    // metadata, it's possible that the helper class is not
-    // compatible and therefore we'll need to generate the code
-    // in-line instead.
-    //
-    // Specifically, there may be "local" metadata (i.e., from
-    // a data member or parameter definition) that overrides the
-    // original type. We'll compare the mapped types with and
-    // without local metadata to determine whether we can use
-    // the helper.
-    //
-    string instanceType, formalType;
-    getDictionaryTypes(dict, "", metaData, instanceType, formalType);
-    string origInstanceType, origFormalType;
-    getDictionaryTypes(dict, "", StringList(), origInstanceType, origFormalType);
-    if((formalType != origFormalType) || (!marshal && instanceType != origInstanceType))
-    {
-        useHelper = false;
-    }
-
-    //
-    // If we can use the helper, it's easy.
-    //
-    if(useHelper)
-    {
-        string typeS = getAbsolute(dict, package);
-        if(marshal)
-        {
-            out << nl << typeS << "Helper.write(" << stream << ", " << v << ");";
-        }
-        else
-        {
-            out << nl << v << " = " << typeS << "Helper.read(" << stream << ");";
-        }
-        return;
-    }
-
-    TypePtr key = dict->keyType();
-    TypePtr value = dict->valueType();
-
-    string keyS = typeToString(key, TypeModeIn, package);
-    string valueS = typeToString(value, TypeModeIn, package);
-
-    ostringstream o;
-    o << iter;
-    string iterS = o.str();
-    iter++;
-
-    if(marshal)
-    {
-        out << nl << "if(" << v << " == null)";
-        out << sb;
-        out << nl << "__outS.writeSize(0);";
-        out << eb;
-        out << nl << "else";
-        out << sb;
-        out << nl << "__outS.writeSize(" << v << ".size());";
-        string keyObjectS = typeToObjectString(key, TypeModeIn, package);
-        string valueObjectS = typeToObjectString(value, TypeModeIn, package);
-        out << nl << "for(java.util.Map.Entry<" << keyObjectS << ", " << valueObjectS << "> __e : " << v
-            << ".entrySet())";
-        out << sb;
-        for(int i = 0; i < 2; i++)
-        {
-            string arg;
-            TypePtr type;
-            if(i == 0)
-            {
-                arg = "__e.getKey()";
-                type = key;
-            }
-            else
-            {
-                arg = "__e.getValue()";
-                type = value;
-            }
-            writeStreamMarshalUnmarshalCode(out, package, type, false, 0, arg, true, iter, false);
-        }
-        out << eb;
-        out << eb;
-    }
-    else
-    {
-        out << nl << v << " = new " << instanceType << "();";
-        out << nl << "int __sz" << iterS << " = __inS.readSize();";
-        out << nl << "for(int __i" << iterS << " = 0; __i" << iterS << " < __sz" << iterS << "; __i" << iterS << "++)";
-        out << sb;
-        for(int i = 0; i < 2; i++)
-        {
-            string arg;
-            TypePtr type;
-            string typeS;
-            if(i == 0)
-            {
-                arg = "__key";
-                type = key;
-                typeS = keyS;
-            }
-            else
-            {
-                arg = "__value";
-                type = value;
-                typeS = valueS;
-            }
-
-            BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-            string s = typeToString(type, TypeModeIn, package);
-            if(ClassDeclPtr::dynamicCast(type) || (b && b->kind() == Builtin::KindObject))
-            {
-                string keyTypeStr = typeToObjectString(key, TypeModeIn, package);
-                string valueTypeStr = typeToObjectString(value, TypeModeIn, package);
-                writeStreamMarshalUnmarshalCode(out, package, type, false, 0, arg, false, iter, false,
-                                                StringList(), "new IceInternal.DictionaryPatcher<" + keyTypeStr +
-                                                ", " + valueTypeStr + ">(" + v + ", " + s + ".class, \"" +
-                                                type->typeId() + "\", __key)");
-            }
-            else
-            {
-                if(StructPtr::dynamicCast(type))
-                {
-                    out << nl << s << ' ' << arg << " = null;";
-                }
-                else
-                {
-                    out << nl << s << ' ' << arg << ';';
-                }
-                writeStreamMarshalUnmarshalCode(out, package, type, false, 0, arg, false, iter, false);
-            }
-        }
-        BuiltinPtr builtin = BuiltinPtr::dynamicCast(value);
-        if(!(builtin && builtin->kind() == Builtin::KindObject) && !ClassDeclPtr::dynamicCast(value))
-        {
-            out << nl << "" << v << ".put(__key, __value);";
-        }
-        out << eb;
-    }
-}
-
-void
-Slice::JavaGenerator::writeStreamSequenceMarshalUnmarshalCode(Output& out,
-                                                              const string& package,
-                                                              const SequencePtr& seq,
-                                                              const string& param,
-                                                              bool marshal,
-                                                              int& iter,
-                                                              bool useHelper,
-                                                              const StringList& metaData)
-{
-    string stream = marshal ? "__outS" : "__inS";
-    string v = param;
-
-    //
-    // If the sequence is a byte sequence, check if there's the serializable or protobuf metadata to
-    // get rid of these two easy cases first.
-    //
-    BuiltinPtr builtin = BuiltinPtr::dynamicCast(seq->type());
-    if(builtin && builtin->kind() == Builtin::KindByte)
-    {
-        string meta;
-        static const string protobuf = "java:protobuf:";
-        static const string serializable = "java:serializable:";
-        if(seq->findMetaData(serializable, meta))
-        {
-            if(marshal)
-            {
-                out << nl << stream << ".writeSerializable(" << v << ");";
-            }
-            else
-            {
-                string type = typeToString(seq, TypeModeIn, package);
-                out << nl << v << " = (" << type << ")" << stream << ".readSerializable();";
-            }
-            return;
-        }
-        else if(seq->findMetaData(protobuf, meta))
-        {
-            if(marshal)
-            {
-                out << nl << "if(!" << v << ".isInitialized())";
-                out << sb;
-                out << nl << "throw new Ice.MarshalException(\"type not fully initialized\");";
-                out << eb;
-                out << nl << stream << ".writeByteSeq(" << v << ".toByteArray());";
-            }
-            else
-            {
-                string type = meta.substr(protobuf.size());
-                out << nl << "try";
-                out << sb;
-                out << nl << v << " = " << type << ".parseFrom(" << stream << ".readByteSeq());";
-                out << eb;
-                out << nl << "catch(com.google.protobuf.InvalidProtocolBufferException __ex)";
-                out << sb;
-                out << nl << "Ice.MarshalException __mex = new Ice.MarshalException();";
-                out << nl << "__mex.initCause(__ex);";
-                out << nl << "throw __mex;";
-                out << eb;
-            }
-            return;
-        }
-    }
-
-    if(builtin &&
-       (builtin->kind() == Builtin::KindByte || builtin->kind() == Builtin::KindShort ||
-        builtin->kind() == Builtin::KindInt || builtin->kind() == Builtin::KindLong ||
-        builtin->kind() == Builtin::KindFloat || builtin->kind() == Builtin::KindDouble))
-    {
-        string meta;
-        static const string bytebuffer = "java:buffer";
-        if(seq->findMetaData(bytebuffer, meta) || findMetaData(bytebuffer, metaData, meta))
-        {
-            switch(builtin->kind())
-            {
-                case Builtin::KindByte:
-                {
-                    if(marshal)
-                    {
-                        out << nl << stream << ".writeByteBuffer(" << v << ");";
-                    }
-                    else
-                    {
-                        out << nl << v << " = " << stream << ".readByteBuffer();";
-                    }
-                    break;
-                }
-                case Builtin::KindShort:
-                {
-                    if(marshal)
-                    {
-                        out << nl << stream << ".writeShortBuffer(" << v << ");";
-                    }
-                    else
-                    {
-                        out << nl << v << " = " << stream << ".readShortBuffer();";
-                    }
-                    break;
-                }
-                case Builtin::KindInt:
-                {
-                    if(marshal)
-                    {
-                        out << nl << stream << ".writeIntBuffer(" << v << ");";
-                    }
-                    else
-                    {
-                        out << nl << v << " = " << stream << ".readIntBuffer();";
-                    }
-                    break;
-                }
-                case Builtin::KindLong:
-                {
-                    if(marshal)
-                    {
-                        out << nl << stream << ".writeLongBuffer(" << v << ");";
-                    }
-                    else
-                    {
-                        out << nl << v << " = " << stream << ".readLongBuffer();";
-                    }
-                    break;
-                }
-                case Builtin::KindFloat:
-                {
-                    if(marshal)
-                    {
-                        out << nl << stream << ".writeFloatBuffer(" << v << ");";
-                    }
-                    else
-                    {
-                        out << nl << v << " = " << stream << ".readFloatBuffer();";
-                    }
-                    break;
-                }
-                case Builtin::KindDouble:
-                {
-                    if(marshal)
-                    {
-                        out << nl << stream << ".writeDoubleBuffer(" << v << ");";
-                    }
-                    else
-                    {
-                        out << nl << v << " = " << stream << ".readDoubleBuffer();";
-                    }
-                    break;
-                }
-                case Builtin::KindBool:
-                case Builtin::KindString:
-                case Builtin::KindObject:
-                case Builtin::KindObjectProxy:
-                case Builtin::KindLocalObject:
-                {
-                    assert(false);
-                    break;
-                }
-            }
-            return;
-        }
-    }
-
-    //
-    // We have to determine whether it's possible to use the
-    // type's generated helper class for this marshal/unmarshal
-    // task. Since the user may have specified a custom type in
-    // metadata, it's possible that the helper class is not
-    // compatible and therefore we'll need to generate the code
-    // in-line instead.
-    //
-    // Specifically, there may be "local" metadata (i.e., from
-    // a data member or parameter definition) that overrides the
-    // original type. We'll compare the mapped types with and
-    // without local metadata to determine whether we can use
-    // the helper.
-    //
-    string instanceType, formalType;
-    bool customType = getSequenceTypes(seq, "", metaData, instanceType, formalType);
-    string origInstanceType, origFormalType;
-    getSequenceTypes(seq, "", StringList(), origInstanceType, origFormalType);
-    if((formalType != origFormalType) || (!marshal && instanceType != origInstanceType))
-    {
-        useHelper = false;
-    }
-
-    //
-    // If we can use the helper, it's easy.
-    //
-    if(useHelper)
-    {
-        string typeS = getAbsolute(seq, package);
-        if(marshal)
-        {
-            out << nl << typeS << "Helper.write(" << stream << ", " << v << ");";
-        }
-        else
-        {
-            out << nl << v << " = " << typeS << "Helper.read(" << stream << ");";
-        }
-        return;
-    }
-
-    //
-    // Determine sequence depth
-    //
-    int depth = 0;
-    TypePtr origContent = seq->type();
-    SequencePtr s = SequencePtr::dynamicCast(origContent);
-    while(s)
-    {
-        //
-        // Stop if the inner sequence type has a custom, serializable or protobuf type.
-        //
-        if(hasTypeMetaData(s))
-        {
-            break;
-        }
-        depth++;
-        origContent = s->type();
-        s = SequencePtr::dynamicCast(origContent);
-    }
-    string origContentS = typeToString(origContent, TypeModeIn, package);
-
-    TypePtr type = seq->type();
-
-    if(customType)
-    {
-        //
-        // Marshal/unmarshal a custom sequence type.
-        //
-        BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-        string typeS = getAbsolute(seq, package);
-        ostringstream o;
-        o << origContentS;
-        int d = depth;
-        while(d--)
-        {
-            o << "[]";
-        }
-        string cont = o.str();
-        if(marshal)
-        {
-            out << nl << "if(" << v << " == null)";
-            out << sb;
-            out << nl << stream << ".writeSize(0);";
-            out << eb;
-            out << nl << "else";
-            out << sb;
-            out << nl << stream << ".writeSize(" << v << ".size());";
-            string typeS = typeToString(type, TypeModeIn, package);
-            out << nl << "for(" << typeS << " __elem : " << v << ')';
-            out << sb;
-            writeStreamMarshalUnmarshalCode(out, package, type, false, 0, "__elem", true, iter, false);
-            out << eb;
-            out << eb; // else
-        }
-        else
-        {
-            bool isObject = false;
-            ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
-            if((b && b->kind() == Builtin::KindObject) || cl)
-            {
-                isObject = true;
-            }
-            out << nl << v << " = new " << instanceType << "();";
-            out << nl << "final int __len" << iter << " = " << stream << ".readAndCheckSeqSize(" << type->minWireSize()
-                << ");";
-            if(isObject)
-            {
-                if(b)
-                {
-                    out << nl << "final String __type" << iter << " = Ice.ObjectImpl.ice_staticId();";
-                }
-                else
-                {
-                    assert(cl);
-                    if(cl->isInterface())
-                    {
-                        out << nl << "final String __type" << iter << " = "
-                            << getAbsolute(cl, package, "_", "Disp") << ".ice_staticId();";
-                    }
-                    else
-                    {
-                        out << nl << "final String __type" << iter << " = " << origContentS << ".ice_staticId();";
-                    }
-                }
-            }
-            out << nl << "for(int __i" << iter << " = 0; __i" << iter << " < __len" << iter << "; __i" << iter
-                << "++)";
-            out << sb;
-            if(isObject)
-            {
-                //
-                // Add a null value to the list as a placeholder for the element.
-                //
-                out << nl << v << ".add(null);";
-                ostringstream patchParams;
-                patchParams << "new IceInternal.ListPatcher<" << origContentS << ">(" << v << ", " << origContentS
-                            << ".class, __type" << iter << ", __i" << iter << ')';
-                writeStreamMarshalUnmarshalCode(out, package, type, false, 0, "__elem", false, iter, false,
-                                                StringList(), patchParams.str());
-            }
-            else
-            {
-                if(StructPtr::dynamicCast(type))
-                {
-                    out << nl << cont << " __elem = null;";
-                }
-                else
-                {
-                    out << nl << cont << " __elem;";
-                }
-                writeStreamMarshalUnmarshalCode(out, package, type, false, 0, "__elem", false, iter, false);
-            }
-            if(!isObject)
-            {
-                out << nl << v << ".add(__elem);";
-            }
-            out << eb;
-            iter++;
-        }
-    }
-    else
-    {
-        BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-        if(b && b->kind() != Builtin::KindObject && b->kind() != Builtin::KindObjectProxy)
-        {
-            switch(b->kind())
-            {
-                case Builtin::KindByte:
-                {
-                    if(marshal)
-                    {
-                        out << nl << stream << ".writeByteSeq(" << v << ");";
-                    }
-                    else
-                    {
-                        out << nl << v << " = " << stream << ".readByteSeq();";
-                    }
-                    break;
-                }
-                case Builtin::KindBool:
-                {
-                    if(marshal)
-                    {
-                        out << nl << stream << ".writeBoolSeq(" << v << ");";
-                    }
-                    else
-                    {
-                        out << nl << v << " = " << stream << ".readBoolSeq();";
-                    }
-                    break;
-                }
-                case Builtin::KindShort:
-                {
-                    if(marshal)
-                    {
-                        out << nl << stream << ".writeShortSeq(" << v << ");";
-                    }
-                    else
-                    {
-                        out << nl << v << " = " << stream << ".readShortSeq();";
-                    }
-                    break;
-                }
-                case Builtin::KindInt:
-                {
-                    if(marshal)
-                    {
-                        out << nl << stream << ".writeIntSeq(" << v << ");";
-                    }
-                    else
-                    {
-                        out << nl << v << " = " << stream << ".readIntSeq();";
-                    }
-                    break;
-                }
-                case Builtin::KindLong:
-                {
-                    if(marshal)
-                    {
-                        out << nl << stream << ".writeLongSeq(" << v << ");";
-                    }
-                    else
-                    {
-                        out << nl << v << " = " << stream << ".readLongSeq();";
-                    }
-                    break;
-                }
-                case Builtin::KindFloat:
-                {
-                    if(marshal)
-                    {
-                        out << nl << stream << ".writeFloatSeq(" << v << ");";
-                    }
-                    else
-                    {
-                        out << nl << v << " = " << stream << ".readFloatSeq();";
-                    }
-                    break;
-                }
-                case Builtin::KindDouble:
-                {
-                    if(marshal)
-                    {
-                        out << nl << stream << ".writeDoubleSeq(" << v << ");";
-                    }
-                    else
-                    {
-                        out << nl << v << " = " << stream << ".readDoubleSeq();";
-                    }
-                    break;
-                }
-                case Builtin::KindString:
-                {
-                    if(marshal)
-                    {
-                        out << nl << stream << ".writeStringSeq(" << v << ");";
-                    }
-                    else
-                    {
-                        out << nl << v << " = " << stream << ".readStringSeq();";
-                    }
-                    break;
-                }
-                case Builtin::KindObject:
-                case Builtin::KindObjectProxy:
-                case Builtin::KindLocalObject:
-                {
-                    assert(false);
-                    break;
-                }
-            }
-        }
-        else
-        {
-            if(marshal)
-            {
-                out << nl << "if(" << v << " == null)";
-                out << sb;
-                out << nl << stream << ".writeSize(0);";
-                out << eb;
-                out << nl << "else";
-                out << sb;
-                out << nl << stream << ".writeSize(" << v << ".length);";
-                out << nl << "for(int __i" << iter << " = 0; __i" << iter << " < " << v << ".length; __i" << iter
-                    << "++)";
-                out << sb;
-                ostringstream o;
-                o << v << "[__i" << iter << "]";
-                iter++;
-                writeStreamMarshalUnmarshalCode(out, package, type, false, 0, o.str(), true, iter, false);
-                out << eb;
-                out << eb;
-            }
-            else
-            {
-                bool isObject = false;
-                ClassDeclPtr cl = ClassDeclPtr::dynamicCast(origContent);
-                if((b && b->kind() == Builtin::KindObject) || cl)
-                {
-                    isObject = true;
-                }
-                out << nl << "final int __len" << iter << " = " << stream << ".readAndCheckSeqSize("
-                    << type->minWireSize() << ");";
-                if(isObject)
-                {
-                    if(b)
-                    {
-                        out << nl << "final String __type" << iter << " = Ice.ObjectImpl.ice_staticId();";
-                    }
-                    else
-                    {
-                        assert(cl);
-                        if(cl->isInterface())
-                        {
-                            out << nl << "final String __type" << iter << " = "
-                                << getAbsolute(cl, package, "_", "Disp") << ".ice_staticId();";
-                        }
-                        else
-                        {
-                            out << nl << "final String __type" << iter << " = " << origContentS << ".ice_staticId();";
-                        }
-                    }
-                }
-                //
-                // We cannot allocate an array of a generic type, such as
-                //
-                // arr = new Map<String, String>[sz];
-                //
-                // Attempting to compile this code results in a "generic array creation" error
-                // message. This problem can occur when the sequence's element type is a
-                // dictionary, or when the element type is a nested sequence that uses a custom
-                // mapping.
-                //
-                // The solution is to rewrite the code as follows:
-                //
-                // arr = (Map<String, String>[])new Map[sz];
-                //
-                // Unfortunately, this produces an unchecked warning during compilation.
-                //
-                // A simple test is to look for a "<" character in the content type, which
-                // indicates the use of a generic type.
-                //
-                string::size_type pos = origContentS.find('<');
-                if(pos != string::npos)
-                {
-                    string nonGenericType = origContentS.substr(0, pos);
-                    out << nl << v << " = (" << origContentS << "[]";
-                    int d = depth;
-                    while(d--)
-                    {
-                        out << "[]";
-                    }
-                    out << ")new " << nonGenericType << "[__len" << iter << "]";
-                }
-                else
-                {
-                    out << nl << v << " = new " << origContentS << "[__len" << iter << "]";
-                }
-                int d = depth;
-                while(d--)
-                {
-                    out << "[]";
-                }
-                out << ';';
-                out << nl << "for(int __i" << iter << " = 0; __i" << iter << " < __len" << iter << "; __i" << iter
-                    << "++)";
-                out << sb;
-                ostringstream o;
-                o << v << "[__i" << iter << "]";
-                ostringstream patchParams;
-                if(isObject)
-                {
-                    patchParams << "new IceInternal.SequencePatcher(" << v << ", " << origContentS
-                                << ".class, __type" << iter << ", __i" << iter << ')';
-                    writeStreamMarshalUnmarshalCode(out, package, type, false, 0, o.str(), false, iter, false,
-                                                    StringList(), patchParams.str());
-                }
-                else
-                {
-                    writeStreamMarshalUnmarshalCode(out, package, type, false, 0, o.str(), false, iter, false);
-                }
-                out << eb;
-                iter++;
-            }
-        }
-    }
-}
-
 bool
 Slice::JavaGenerator::findMetaData(const string& prefix, const StringList& metaData, string& value)
 {
@@ -4257,6 +3090,11 @@ Slice::JavaGenerator::MetaDataVisitor::getMetaData(const ContainedPtr& cont)
 
                 emitWarning(cont->file(), cont->line(), "ignoring invalid metadata `" + s + "'");
             }
+            else if(s == "delegate")
+            {
+                result.push_back(s);
+                continue;
+            }
 
             _history.insert(s);
         }
@@ -4314,6 +3152,15 @@ Slice::JavaGenerator::MetaDataVisitor::validateType(const SyntaxTreeBasePtr& p,
             //
             emitWarning(file, line, "ignoring invalid metadata `" + *i + "'");
         }
+        else if(i->find("delegate") == 0)
+        {
+            ClassDefPtr cl = ClassDefPtr::dynamicCast(p);
+            if(cl && cl->isDelegate())
+            {
+                continue;
+            }
+            emitWarning(file, line, "ignoring invalid metadata `" + *i + "'");
+        }
     }
 }
 
diff --git a/cpp/src/Slice/JavaUtil.h b/cpp/src/Slice/JavaUtil.h
new file mode 100644
index 00000000000..6473f406e0e
--- /dev/null
+++ b/cpp/src/Slice/JavaUtil.h
@@ -0,0 +1,258 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef JAVA_UTIL_H
+#define JAVA_UTIL_H
+
+#include <Slice/Parser.h>
+#include <IceUtil/OutputUtil.h>
+
+namespace Slice
+{
+
+//
+// Compute Java serialVersionUID for a Slice class
+//
+long
+computeSerialVersionUUID(const ClassDefPtr&);
+
+//
+// Compute Java serialVersionUID for a Slice class
+//
+long
+computeSerialVersionUUID(const ExceptionPtr&);
+
+//
+// Compute Java serialVersionUID for a Slice struct
+//
+long
+computeSerialVersionUUID(const StructPtr&);
+
+class JavaOutput : public ::IceUtilInternal::Output
+{
+public:
+
+    JavaOutput();
+    JavaOutput(std::ostream&);
+    JavaOutput(const char*);
+
+    //
+    // Open a file to hold the source for a Java class. The first
+    // argument is the class name (including an optional leading
+    // package). Intermediate directories will be created as
+    // necessary to open the file in the package. The second
+    // argument specifies a directory prefix in which to locate
+    // the class.
+    //
+    // After successfully opening the file, the function invokes
+    // printHeader() and then emits a "package" statement if
+    // necessary.
+    //
+    void openClass(const std::string&, const std::string&, const std::string& = std::string());
+
+    virtual void printHeader();
+};
+
+class JavaGenerator : private ::IceUtil::noncopyable
+{
+public:
+
+    virtual ~JavaGenerator();
+
+    //
+    // Validate all metadata in the unit with a "java:" prefix.
+    //
+    static void validateMetaData(const UnitPtr&);
+
+    void close();
+
+protected:
+
+    JavaGenerator(const std::string&);
+
+    //
+    // Given the fully-scoped Java class name, create any intermediate
+    // package directories and open the class file,
+    //
+    void open(const std::string&, const std::string&);
+
+    ::IceUtilInternal::Output& output() const;
+
+    //
+    // Check a symbol against any of the Java keywords. If a
+    // match is found, return the symbol with a leading underscore.
+    //
+    std::string fixKwd(const std::string&) const;
+
+    //
+    // Convert a Slice scoped name into a Java name.
+    //
+    std::string convertScopedName(const std::string&,
+                                  const std::string& = std::string(),
+                                  const std::string& = std::string()) const;
+
+
+    //
+    // Returns the package prefix for a give Slice file.
+    //
+    std::string getPackagePrefix(const ContainedPtr&) const;
+
+    //
+    // Returns the Java package of a Contained entity.
+    //
+    std::string getPackage(const ContainedPtr&) const;
+
+    //
+    // Returns the Java name for a Contained entity. If the optional
+    // package argument matches the entity's package name, then the
+    // package is removed from the result.
+    //
+    std::string getAbsolute(const ContainedPtr&,
+                            const std::string& = std::string(),
+                            const std::string& = std::string(),
+                            const std::string& = std::string()) const;
+
+    //
+    // Return the method call necessary to obtain the static type ID for an object type.
+    //
+    std::string getStaticId(const TypePtr&, const std::string&) const;
+
+    //
+    // Determines whether an operation should use the optional mapping.
+    //
+    bool useOptionalMapping(const OperationPtr&);
+
+    //
+    // Returns the optional type corresponding to the given Slice type.
+    //
+    std::string getOptionalFormat(const TypePtr&);
+
+    //
+    // Get the Java name for a type. If an optional scope is provided,
+    // the scope will be removed from the result if possible.
+    //
+    enum TypeMode
+    {
+        TypeModeIn,
+        TypeModeOut,
+        TypeModeMember,
+        TypeModeReturn
+    };
+    std::string typeToString(const TypePtr&, TypeMode, const std::string& = std::string(),
+                             const StringList& = StringList(), bool = true, bool = false) const;
+
+    //
+    // Get the Java object name for a type. For primitive types, this returns the
+    // Java class type (e.g., Integer). For all other types, this function delegates
+    // to typeToString.
+    //
+    std::string typeToObjectString(const TypePtr&, TypeMode, const std::string& = std::string(),
+                                   const StringList& = StringList(), bool = true) const;
+
+    //
+    // Generate code to marshal or unmarshal a type.
+    //
+    enum OptionalMode
+    {
+        OptionalNone,
+        OptionalInParam,
+        OptionalOutParam,
+        OptionalReturnParam,
+        OptionalMember
+    };
+
+    void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const TypePtr&, OptionalMode,
+                                   bool, int, const std::string&, bool, int&, bool = false,
+                                   const StringList& = StringList(), const std::string& patchParams = "");
+
+    //
+    // Generate code to marshal or unmarshal a dictionary type.
+    //
+    void writeDictionaryMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const DictionaryPtr&,
+                                           const std::string&, bool, int&, bool,
+                                           const StringList& = StringList());
+
+    //
+    // Generate code to marshal or unmarshal a sequence type.
+    //
+    void writeSequenceMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const SequencePtr&,
+                                           const std::string&, bool, int&, bool, const StringList& = StringList());
+
+    //
+    // Search metadata for an entry with the given prefix and return the entire string.
+    //
+    static bool findMetaData(const std::string&, const StringList&, std::string&);
+
+    //
+    // Get custom type metadata. If metadata is found, the abstract and
+    // concrete types are extracted and the function returns true. If an
+    // abstract type is not specified, it is set to an empty string.
+    //
+    static bool getTypeMetaData(const StringList&, std::string&, std::string&);
+
+    //
+    // Determine whether a custom type is defined. The function checks the
+    // metadata of the type's original definition, as well as any optional
+    // metadata that typically represents a data member or parameter.
+    //
+    static bool hasTypeMetaData(const TypePtr&, const StringList& = StringList());
+
+    //
+    // Obtain the concrete and abstract types for a dictionary or sequence type.
+    // The functions return true if a custom type was defined and false to indicate
+    // the default mapping was used.
+    //
+    bool getDictionaryTypes(const DictionaryPtr&, const std::string&, const StringList&,
+                            std::string&, std::string&) const;
+    bool getSequenceTypes(const SequencePtr&, const std::string&, const StringList&, std::string&, std::string&) const;
+
+    bool sequenceHasHolder(const SequencePtr&) const;
+
+    virtual JavaOutput* createOutput();
+
+    static const std::string _getSetMetaData;
+
+private:
+
+    class MetaDataVisitor : public ParserVisitor
+    {
+    public:
+
+        virtual bool visitUnitStart(const UnitPtr&);
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitClassDecl(const ClassDeclPtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual void visitOperation(const OperationPtr&);
+        virtual void visitDataMember(const DataMemberPtr&);
+        virtual void visitSequence(const SequencePtr&);
+        virtual void visitDictionary(const DictionaryPtr&);
+        virtual void visitEnum(const EnumPtr&);
+        virtual void visitConst(const ConstPtr&);
+
+    private:
+
+        StringList getMetaData(const ContainedPtr&);
+        void validateType(const SyntaxTreeBasePtr&, const StringList&, const std::string&, const std::string&);
+        void validateGetSet(const SyntaxTreeBasePtr&, const StringList&, const std::string&, const std::string&);
+
+        StringSet _history;
+    };
+
+    friend class JavaGenerator::MetaDataVisitor;
+
+    std::string _dir;
+    ::IceUtilInternal::Output* _out;
+    mutable std::map<std::string, std::string> _filePackagePrefix;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile
deleted file mode 100644
index 0d8441a08e3..00000000000
--- a/cpp/src/Slice/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBFILENAME	= $(call mklibfilename,Slice,$(VERSION))
-SONAME		= $(call mksoname,Slice,$(SOVERSION))
-LIBNAME		= $(call mklibname,Slice)
-TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-
-OBJS		= Checksum.o \
-		  CPlusPlusUtil.o \
-		  CsUtil.o \
-		  DotNetNames.o \
-		  FileTracker.o \
-		  JavaUtil.o \
-		  MD5.o \
-		  MD5I.o \
-		  ObjCUtil.o \
-		  Parser.o \
-		  PHPUtil.o \
-		  Preprocessor.o \
-		  PythonUtil.o \
-		  Python.o \
-		  RubyUtil.o \
-		  Ruby.o \
-		  Scanner.o \
-		  Util.o \
-		  ../Slice/Grammar.o
-
-include $(top_srcdir)/config/Make.rules
-
-
-CPPFLAGS	:= -I.. $(CPPFLAGS) -DSLICE_API_EXPORTS
-BISONFLAGS	:= --name-prefix "slice_" $(BISONFLAGS)
-
-LINKWITH	:= $(BASELIBS) $(MCPP_LIBS)
-ifeq ($(STATICLIBS),yes)
-$(libdir)/$(LIBNAME): $(OBJS)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mklib,$@,$(OBJS))
-else
-$(libdir)/$(LIBFILENAME): $(OBJS) $(MCPP_NUPKG)
-	@mkdir -p $(dir $@)
-	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
-
-$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME)
-	rm -f $@
-	ln -s $(LIBFILENAME) $@
-
-$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME)
-	@mkdir -p $(libdir)$(cpp11libdirsuffix)
-	rm -f $@
-	ln -s $(cpp11sonamedir)$(SONAME) $@
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
-endif
-
diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak
deleted file mode 100644
index d6d9d238de4..00000000000
--- a/cpp/src/Slice/Makefile.mak
+++ /dev/null
@@ -1,87 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME		= $(top_srcdir)\lib\slice$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\slice$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-BISON_FLEX_OBJS = .\Grammar.obj \
-                  .\Scanner.obj
-
-OBJS		= .\Checksum.obj \
-		  .\CPlusPlusUtil.obj \
-		  .\CsUtil.obj \
-		  .\DotNetNames.obj \
-		  .\FileTracker.obj \
-		  .\JavaUtil.obj \
-		  .\MD5.obj \
-		  .\MD5I.obj \
-		  .\Parser.obj \
-		  .\PHPUtil.obj \
-		  .\Preprocessor.obj \
-		  .\PythonUtil.obj \
-		  .\Python.obj \
-		  .\RubyUtil.obj \
-		  .\Util.obj \
-		  .\Ruby.obj \
-		  $(BISON_FLEX_OBJS)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-$(OBJS)		: $(MCPP_NUPKG)
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DSLICE_API_EXPORTS  -DWIN32_LEAN_AND_MEAN
-BISONFLAGS	= --name-prefix "slice_" $(BISONFLAGS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = Slice.res
-
-!if "$(STATICLIBS)" == "yes"
-
-$(DLLNAME):
-
-$(LIBNAME): $(OBJS)
-	$(AR) $(ARFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@
-
-!else
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) Slice.res
-	$(LINK) $(BASE):0x21000000 $(LD_DLLFLAGS) $(MCPP_LDFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) $(MCPP_LIBS) \
-		$(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-		$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-!endif
-
-clean::
-	-del /q Slice.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/Slice/Makefile.mk b/cpp/src/Slice/Makefile.mk
new file mode 100644
index 00000000000..52475a320a9
--- /dev/null
+++ b/cpp/src/Slice/Makefile.mk
@@ -0,0 +1,20 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_libraries	:= Slice
+
+Slice_targetdir		:= $(libdir)
+Slice_libs		:= mcpp
+
+# Always enable the static configuration for the Slice library and never
+# install it
+Slice_always_enable_configs 	:= static
+Slice_install_configs	    	:= none
+
+projects += $(project)
diff --git a/cpp/src/Slice/PHPUtil.h b/cpp/src/Slice/PHPUtil.h
new file mode 100644
index 00000000000..e98130e9345
--- /dev/null
+++ b/cpp/src/Slice/PHPUtil.h
@@ -0,0 +1,50 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef SLICE_PHP_UTIL_H
+#define SLICE_PHP_UTIL_H
+
+#include <Slice/Parser.h>
+
+namespace Slice
+{
+namespace PHP
+{
+
+//
+// Convert a scoped name into a PHP name.
+//
+std::string scopedToName(const std::string&, bool);
+
+//
+// Check the given identifier against PHP's list of reserved words. If it matches
+// a reserved word, then an escaped version is returned with a leading underscore.
+//
+std::string fixIdent(const std::string&);
+
+//
+// Get the fully-qualified name of the given definition. If a suffix is provided,
+// it is prepended to the definition's unqualified name. If the nameSuffix
+// is provided, it is appended to the container's name.
+//
+// COMPILERFIX: MSVC 6 seems to have a problem with const std::string
+// = std::string(), const std::string = std::string().
+//
+std::string getAbsolute(const Slice::ContainedPtr&, bool, const std::string& = "", const std::string& = "");
+
+//
+// Since PHP uses the backslash character as the namespace separator, we have
+// to escape backslash characters when they appear in a string literal.
+//
+std::string escapeName(const std::string&);
+
+}
+}
+
+#endif
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 8ee39d6e8bb..502d20677be 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -258,6 +258,11 @@ Slice::Builtin::typeId() const
             return "::Ice::LocalObject";
             break;
         }
+        case KindValue:
+        {
+            return "::Ice::Value";
+            break;
+        }
     }
     assert(false);
     return ""; // Keep the compiler happy.
@@ -266,7 +271,7 @@ Slice::Builtin::typeId() const
 bool
 Slice::Builtin::usesClasses() const
 {
-    return _kind == KindObject;
+    return _kind == KindObject || _kind == KindValue;
 }
 
 size_t
@@ -283,7 +288,8 @@ Slice::Builtin::minWireSize() const
         8, // KindDouble
         1, // KindString: at least one byte for an empty string.
         1, // KindObject: at least one byte (to marshal an index instead of an instance).
-        2  // KindObjectProxy: at least an empty identity for a nil proxy, that is, 2 bytes.
+        2, // KindObjectProxy: at least an empty identity for a nil proxy, that is, 2 bytes.
+        1  // KindValue: at least one byte (to marshal an index instead of an instance).
     };
 
     assert(_kind != KindLocalObject);
@@ -293,7 +299,7 @@ Slice::Builtin::minWireSize() const
 bool
 Slice::Builtin::isVariableLength() const
 {
-    return _kind == KindString || _kind == KindObject || _kind == KindObjectProxy;
+    return _kind == KindString || _kind == KindObject || _kind == KindObjectProxy || _kind == KindValue;
 }
 
 Builtin::Kind
@@ -320,7 +326,8 @@ const char* Slice::Builtin::builtinTable[] =
         "string",
         "Object",
         "Object*",
-        "LocalObject"
+        "LocalObject",
+        "Value"
     };
 
 Slice::Builtin::Builtin(const UnitPtr& unit, Kind kind) :
@@ -876,17 +883,6 @@ Slice::Container::createSequence(const string& name, const TypePtr& type, const
 {
     checkIdentifier(name);
 
-    if(_unit->profile() == IceE && !local)
-    {
-        BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-        if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(type))
-        {
-            string msg = "Sequence `" + name + "' cannot contain object values.";
-            _unit->error(msg);
-            return 0;
-        }
-    }
-
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
     {
@@ -942,17 +938,6 @@ Slice::Container::createDictionary(const string& name, const TypePtr& keyType, c
 {
     checkIdentifier(name);
 
-    if(_unit->profile() == IceE && !local)
-    {
-        BuiltinPtr builtin = BuiltinPtr::dynamicCast(valueType);
-        if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(valueType))
-        {
-            string msg = "Dictionary `" + name + "' cannot contain object values.";
-            _unit->error(msg);
-            return 0;
-        }
-    }
-
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
     {
@@ -1178,16 +1163,8 @@ Slice::Container::lookupType(const string& scoped, bool printError)
     return lookupTypeNoBuiltin(scoped, printError);
 }
 
-//
-// TODO: Hack to keep binary compatibility with Ice 3.6.0, fix properly in Ice 3.7
-//
-namespace
-{
-bool ignoreUndefined = false;
-}
-
 TypeList
-Slice::Container::lookupTypeNoBuiltin(const string& scoped, bool printError)
+Slice::Container::lookupTypeNoBuiltin(const string& scoped, bool printError, bool ignoreUndefined)
 {
     //
     // Remove whitespace.
@@ -1304,12 +1281,7 @@ Slice::Container::lookupTypeNoBuiltin(const string& scoped, bool printError)
         ContainedPtr contained = ContainedPtr::dynamicCast(this);
         if(contained)
         {
-            if(typeError)
-            {
-                ignoreUndefined = true;
-            }
-            results = contained->container()->lookupTypeNoBuiltin(sc, printError);
-            ignoreUndefined = false;
+            results = contained->container()->lookupTypeNoBuiltin(sc, printError, typeError || ignoreUndefined);
         }
         else if(!typeError)
         {
@@ -1610,7 +1582,7 @@ Slice::Container::hasLocalClassDefsWithAsync() const
         ClassDefPtr cl = ClassDefPtr::dynamicCast(*p);
         if(cl && cl->isLocal())
         {
-            if(cl->hasMetaData("async"))
+            if(cl->hasMetaData("async-oneway"))
             {
                 return true;
             }
@@ -1618,7 +1590,7 @@ Slice::Container::hasLocalClassDefsWithAsync() const
             OperationList ol = cl->operations();
             for(OperationList::const_iterator q = ol.begin(); q != ol.end(); ++q)
             {
-                if((*q)->hasMetaData("async"))
+                if((*q)->hasMetaData("async-oneway"))
                 {
                     return true;
                 }
@@ -1677,7 +1649,26 @@ Slice::Container::hasNonLocalExceptions() const
     return false;
 }
 
+bool
+Slice::Container::hasExceptions() const
+{
+    for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
+    {
+        ExceptionPtr q = ExceptionPtr::dynamicCast(*p);
+        if(q)
+        {
+            return true;
+        }
+
+        ContainerPtr container = ContainerPtr::dynamicCast(*p);
+        if(container && container->hasExceptions())
+        {
+            return true;
+        }
+    }
 
+    return false;
+}
 
 bool
 Slice::Container::hasClassDecls() const
@@ -1775,6 +1766,66 @@ Slice::Container::hasClassDefs() const
 }
 
 bool
+Slice::Container::hasLocalClassDefs() const
+{
+    for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
+    {
+        ClassDefPtr cl = ClassDefPtr::dynamicCast(*p);
+        if(cl && cl->isLocal())
+        {
+            return true;
+        }
+
+        ContainerPtr container = ContainerPtr::dynamicCast(*p);
+        if(container && container->hasLocalClassDefs())
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool
+Slice::Container::hasNonLocalInterfaceDefs() const
+{
+    for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
+    {
+        ClassDefPtr cl = ClassDefPtr::dynamicCast(*p);
+        if(cl && !cl->isLocal() && (cl->isInterface() || !cl->allOperations().empty()))
+        {
+            return true;
+        }
+
+        ContainerPtr container = ContainerPtr::dynamicCast(*p);
+        if(container && container->hasNonLocalInterfaceDefs())
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool
+Slice::Container::hasValueDefs() const
+{
+    for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
+    {
+        ClassDefPtr cl = ClassDefPtr::dynamicCast(*p);
+        if(cl && !cl->isLocal() && !cl->isInterface())
+        {
+            return true;
+        }
+
+        ContainerPtr container = ContainerPtr::dynamicCast(*p);
+        if(container && container->hasValueDefs())
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool
 Slice::Container::hasOnlyClassDecls() const
 {
     for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
@@ -2575,6 +2626,7 @@ Slice::Container::validateConstant(const string& name, const TypePtr& type, cons
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     assert(false);
                     break;
@@ -3199,28 +3251,6 @@ Slice::ClassDef::createDataMember(const string& name, const TypePtr& type, bool
 {
     checkIdentifier(name);
 
-    if(_unit->profile() == IceE)
-    {
-        if(!isLocal())
-        {
-            BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-            if((builtin && builtin->kind() == Builtin::KindObject))
-            {
-                string msg = "Class data member `" + name + "' cannot be a value object.";
-                _unit->error(msg);
-                return 0;
-            }
-
-            ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(type);
-            if(classDecl != 0 && !classDecl->isLocal())
-            {
-                string msg = "Class data member `" + name + "' cannot be a value object.";
-                _unit->error(msg);
-                return 0;
-            }
-        }
-    }
-
     assert(!isInterface());
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
@@ -3456,7 +3486,9 @@ Slice::ClassDef::classDataMembers() const
         if(q)
         {
             BuiltinPtr builtin = BuiltinPtr::dynamicCast(q->type());
-            if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(q->type()))
+            if((builtin && builtin->kind() == Builtin::KindObject) ||
+               (builtin && builtin->kind() == Builtin::KindValue) ||
+               ClassDeclPtr::dynamicCast(q->type()))
             {
                 result.push_back(q);
             }
@@ -3645,6 +3677,11 @@ Slice::ClassDef::compactId() const
     return _compactId;
 }
 
+bool
+Slice::ClassDef::isDelegate() const
+{
+    return isLocal() && isInterface() && hasMetaData("delegate") && allOperations().size() == 1;
+}
 Slice::ClassDef::ClassDef(const ContainerPtr& container, const string& name, int id, bool intf, const ClassList& bases,
                           bool local) :
     SyntaxTreeBase(container->unit()),
@@ -3739,28 +3776,6 @@ Slice::Exception::createDataMember(const string& name, const TypePtr& type, bool
 {
     checkIdentifier(name);
 
-    if(_unit->profile() == IceE)
-    {
-        if(!isLocal())
-        {
-            BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-            if((builtin && builtin->kind() == Builtin::KindObject))
-            {
-                string msg = "Exception data member `" + name + "' cannot be a value object.";
-                _unit->error(msg);
-                return 0;
-            }
-
-            ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(type);
-            if(classDecl != 0 && !classDecl->isLocal())
-            {
-                string msg = "Exception data member `" + name + "' cannot be a value object.";
-                _unit->error(msg);
-                return 0;
-            }
-        }
-    }
-
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
     {
@@ -3925,7 +3940,9 @@ Slice::Exception::classDataMembers() const
         if(q)
         {
             BuiltinPtr builtin = BuiltinPtr::dynamicCast(q->type());
-            if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(q->type()))
+            if((builtin && builtin->kind() == Builtin::KindObject) ||
+               (builtin && builtin->kind() == Builtin::KindValue) ||
+               ClassDeclPtr::dynamicCast(q->type()))
             {
                 result.push_back(q);
             }
@@ -4093,29 +4110,6 @@ Slice::Struct::createDataMember(const string& name, const TypePtr& type, bool op
                                 const SyntaxTreeBasePtr& defaultValueType, const string& defaultValue,
                                 const string& defaultLiteral)
 {
-    checkIdentifier(name);
-
-    if(_unit->profile() == IceE)
-    {
-        if(!isLocal())
-        {
-            BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-            if((builtin && builtin->kind() == Builtin::KindObject))
-            {
-                string msg = "Struct data member `" + name + "' cannot be a value object.";
-                _unit->error(msg);
-                return 0;
-            }
-            ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(type);
-            if(classDecl != 0 && !classDecl->isLocal())
-            {
-                string msg = "Struct data member `" + name + "' cannot be a value object.";
-                _unit->error(msg);
-                return 0;
-            }
-        }
-    }
-
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
     {
@@ -4230,7 +4224,9 @@ Slice::Struct::classDataMembers() const
         if(q)
         {
             BuiltinPtr builtin = BuiltinPtr::dynamicCast(q->type());
-            if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(q->type()))
+            if((builtin && builtin->kind() == Builtin::KindObject) ||
+               (builtin && builtin->kind() == Builtin::KindValue) ||
+               ClassDeclPtr::dynamicCast(q->type()))
             {
                 result.push_back(q);
             }
@@ -4569,6 +4565,7 @@ Slice::Dictionary::legalKeyType(const TypePtr& type, bool& containsSequence)
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
             case Builtin::KindLocalObject:
+            case Builtin::KindValue:
             {
                 return false;
                 break;
@@ -4946,29 +4943,6 @@ Slice::Operation::createParamDecl(const string& name, const TypePtr& type, bool
 {
     checkIdentifier(name);
 
-    if(_unit->profile() == IceE)
-    {
-        ClassDefPtr cl = ClassDefPtr::dynamicCast(this->container());
-        assert(cl);
-        if(!cl->isLocal())
-        {
-            BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-            if((builtin && builtin->kind() == Builtin::KindObject))
-            {
-                string msg = "Object `" + name + "' cannot be passed by value.";
-                _unit->error(msg);
-                return 0;
-            }
-            ClassDeclPtr classDecl =  ClassDeclPtr::dynamicCast(type);
-            if(classDecl != 0 && !classDecl->isLocal())
-            {
-                string msg = "Object `" + name + "' cannot be passed by value.";
-                _unit->error(msg);
-                return 0;
-            }
-        }
-    }
-
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
     {
@@ -5356,26 +5330,6 @@ Slice::Operation::Operation(const ContainerPtr& container,
     _returnTag(returnTag),
     _mode(mode)
 {
-    if(_unit->profile() == IceE)
-    {
-        ClassDefPtr cl = ClassDefPtr::dynamicCast(this->container());
-        assert(cl);
-        if(!cl->isLocal())
-        {
-            BuiltinPtr builtin = BuiltinPtr::dynamicCast(returnType);
-            if((builtin && builtin->kind() == Builtin::KindObject))
-            {
-                string msg = "Method `" + name + "' cannot return an object by value.";
-                _unit->error(msg);
-            }
-            ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(returnType);
-            if(classDecl != 0 && !classDecl->isLocal())
-            {
-                string msg = "Method `" + name + "' cannot return an object by value.";
-                _unit->error(msg);
-            }
-        }
-    }
 }
 
 // ----------------------------------------------------------------------
@@ -6038,6 +5992,11 @@ Slice::Unit::usesNonLocals() const
         return true;
     }
 
+    if(_builtins.find(Builtin::KindValue) != _builtins.end())
+    {
+        return true;
+    }
+
     return false;
 }
 
diff --git a/cpp/src/Slice/Parser.h b/cpp/src/Slice/Parser.h
new file mode 100644
index 00000000000..ece0c696e02
--- /dev/null
+++ b/cpp/src/Slice/Parser.h
@@ -0,0 +1,1101 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef SLICE_PARSER_H
+#define SLICE_PARSER_H
+
+#include <IceUtil/Shared.h>
+#include <IceUtil/Handle.h>
+#include <string>
+#include <vector>
+#include <list>
+#include <stack>
+#include <map>
+#include <set>
+#include <stdio.h>
+
+
+namespace Slice
+{
+
+#if defined(_WIN32) && !defined(__MINGW32__)
+
+const IceUtil::Int64 Int32Max =  0x7fffffffi64;
+const IceUtil::Int64 Int32Min = -Int32Max - 1i64;
+
+#else
+
+#   if defined(INT32_MIN) && defined(INT32_MAX)
+
+const IceUtil::Int64 Int32Max =  INT32_MAX;
+const IceUtil::Int64 Int32Min =  INT32_MIN;
+
+#   else
+
+const IceUtil::Int64 Int32Max =  0x7fffffffLL;
+const IceUtil::Int64 Int32Min = -Int32Max - 1LL;
+
+#   endif
+
+#endif
+
+const IceUtil::Int64 Int16Max =  0x7fff;
+const IceUtil::Int64 Int16Min = -Int16Max - 1;
+const IceUtil::Int64 ByteMax = 0xff;
+const IceUtil::Int64 ByteMin = 0x00;
+
+enum FeatureProfile
+{
+    Ice,
+    IceE
+};
+
+enum NodeType
+{
+    Dummy,
+    Real
+};
+
+//
+// Format preference for classes and exceptions.
+//
+enum FormatType
+{
+    DefaultFormat,    // No preference was specified.
+    CompactFormat,    // Minimal format.
+    SlicedFormat      // Full format.
+};
+
+class GrammarBase;
+class SyntaxTreeBase;
+class Type;
+class Builtin;
+class Contained;
+class Container;
+class Module;
+class Constructed;
+class ClassDecl;
+class ClassDef;
+class Proxy;
+class Exception;
+class Struct;
+class Operation;
+class ParamDecl;
+class DataMember;
+class Sequence;
+class Dictionary;
+class Enum;
+class Enumerator;
+class Const;
+class Unit;
+class CICompare;
+class DerivedToBaseCompare;
+class ModulePartialCompare;
+
+typedef ::IceUtil::Handle<GrammarBase> GrammarBasePtr;
+typedef ::IceUtil::Handle<SyntaxTreeBase> SyntaxTreeBasePtr;
+typedef ::IceUtil::Handle<Type> TypePtr;
+typedef ::IceUtil::Handle<Builtin> BuiltinPtr;
+typedef ::IceUtil::Handle<Contained> ContainedPtr;
+typedef ::IceUtil::Handle<Container> ContainerPtr;
+typedef ::IceUtil::Handle<Module> ModulePtr;
+typedef ::IceUtil::Handle<Constructed> ConstructedPtr;
+typedef ::IceUtil::Handle<ClassDecl> ClassDeclPtr;
+typedef ::IceUtil::Handle<ClassDef> ClassDefPtr;
+typedef ::IceUtil::Handle<Proxy> ProxyPtr;
+typedef ::IceUtil::Handle<Exception> ExceptionPtr;
+typedef ::IceUtil::Handle<Struct> StructPtr;
+typedef ::IceUtil::Handle<Operation> OperationPtr;
+typedef ::IceUtil::Handle<ParamDecl> ParamDeclPtr;
+typedef ::IceUtil::Handle<DataMember> DataMemberPtr;
+typedef ::IceUtil::Handle<Sequence> SequencePtr;
+typedef ::IceUtil::Handle<Dictionary> DictionaryPtr;
+typedef ::IceUtil::Handle<Enum> EnumPtr;
+typedef ::IceUtil::Handle<Enumerator> EnumeratorPtr;
+typedef ::IceUtil::Handle<Const> ConstPtr;
+typedef ::IceUtil::Handle<Unit> UnitPtr;
+
+typedef std::list<TypePtr> TypeList;
+typedef std::list<ExceptionPtr> ExceptionList;
+typedef std::set<std::string> StringSet;
+typedef std::list<std::string> StringList;
+typedef std::pair<TypePtr, std::string> TypeString;
+typedef std::list<TypeString> TypeStringList;
+typedef std::list<ContainedPtr> ContainedList;
+typedef std::list<ModulePtr> ModuleList;
+typedef std::list<ConstructedPtr> ConstructedList;
+typedef std::list<ClassDefPtr> ClassList;
+typedef std::list<ExceptionPtr> ExceptionList;
+typedef std::list<StructPtr> StructList;
+typedef std::list<SequencePtr> SequenceList;
+typedef std::list<DictionaryPtr> DictionaryList;
+typedef std::list<EnumPtr> EnumList;
+typedef std::list<ConstPtr> ConstList;
+typedef std::list<OperationPtr> OperationList;
+typedef std::list<DataMemberPtr> DataMemberList;
+typedef std::list<ParamDeclPtr> ParamDeclList;
+typedef std::list<EnumeratorPtr> EnumeratorList;
+
+struct ConstDef
+{
+    TypePtr type;
+    SyntaxTreeBasePtr value;
+    std::string valueAsString;
+    std::string valueAsLiteral;
+};
+
+struct OptionalDef
+{
+    TypePtr type;
+    std::string name;
+    bool optional;
+    int tag;
+};
+
+// ----------------------------------------------------------------------
+// CICompare -- function object to do case-insensitive string comparison.
+// ----------------------------------------------------------------------
+
+class CICompare : public std::binary_function<std::string, std::string, bool>
+{
+public:
+
+    bool operator()(const std::string&, const std::string&) const;
+};
+
+#if defined(__SUNPRO_CC)
+bool cICompare(const std::string&, const std::string&);
+#endif
+
+// ----------------------------------------------------------------------
+// DerivedToBaseCompare -- function object to do sort exceptions into
+// most-derived to least-derived order.
+// ----------------------------------------------------------------------
+
+class DerivedToBaseCompare : public std::binary_function<std::string, std::string, bool>
+{
+public:
+
+    bool operator()(const ExceptionPtr&, const ExceptionPtr&) const;
+};
+
+#if defined(__SUNPRO_CC)
+bool derivedToBaseCompare(const ExceptionPtr&, const ExceptionPtr&);
+#endif
+
+// ----------------------------------------------------------------------
+// ParserVisitor
+// ----------------------------------------------------------------------
+
+class ParserVisitor
+{
+public:
+
+    virtual ~ParserVisitor() { }
+    virtual bool visitUnitStart(const UnitPtr&) { return true; }
+    virtual void visitUnitEnd(const UnitPtr&) { }
+    virtual bool visitModuleStart(const ModulePtr&) { return true; }
+    virtual void visitModuleEnd(const ModulePtr&) { }
+    virtual void visitClassDecl(const ClassDeclPtr&) { }
+    virtual bool visitClassDefStart(const ClassDefPtr&) { return true; }
+    virtual void visitClassDefEnd(const ClassDefPtr&) { }
+    virtual bool visitExceptionStart(const ExceptionPtr&) { return true; }
+    virtual void visitExceptionEnd(const ExceptionPtr&) { }
+    virtual bool visitStructStart(const StructPtr&) { return true; }
+    virtual void visitStructEnd(const StructPtr&) { }
+    virtual void visitOperation(const OperationPtr&) { }
+    virtual void visitParamDecl(const ParamDeclPtr&) { }
+    virtual void visitDataMember(const DataMemberPtr&) { }
+    virtual void visitSequence(const SequencePtr&) { }
+    virtual void visitDictionary(const DictionaryPtr&) { }
+    virtual void visitEnum(const EnumPtr&) { }
+    virtual void visitConst(const ConstPtr&) { }
+};
+
+// ----------------------------------------------------------------------
+// DefinitionContext
+// ----------------------------------------------------------------------
+
+class DefinitionContext : public ::IceUtil::SimpleShared
+{
+public:
+
+    DefinitionContext(int, const StringList&);
+
+    std::string filename() const;
+    int includeLevel() const;
+    bool seenDefinition() const;
+
+    void setFilename(const std::string&);
+    void setSeenDefinition();
+
+    bool hasMetaData() const;
+    void setMetaData(const StringList&);
+    std::string findMetaData(const std::string&) const;
+    StringList getMetaData() const;
+
+private:
+
+    int _includeLevel;
+    StringList _metaData;
+    std::string _filename;
+    bool _seenDefinition;
+};
+typedef ::IceUtil::Handle<DefinitionContext> DefinitionContextPtr;
+
+// ----------------------------------------------------------------------
+// GrammarBase
+// ----------------------------------------------------------------------
+
+class GrammarBase : public ::IceUtil::SimpleShared
+{
+};
+
+// ----------------------------------------------------------------------
+// SyntaxTreeBase
+// ----------------------------------------------------------------------
+
+class SyntaxTreeBase : public GrammarBase
+{
+public:
+
+    virtual void destroy();
+    UnitPtr unit() const;
+    DefinitionContextPtr definitionContext() const; // May be nil
+    virtual void visit(ParserVisitor*, bool);
+
+protected:
+
+    SyntaxTreeBase(const UnitPtr&);
+
+    UnitPtr _unit;
+    DefinitionContextPtr _definitionContext;
+};
+
+// ----------------------------------------------------------------------
+// Type
+// ----------------------------------------------------------------------
+
+class Type : public virtual SyntaxTreeBase
+{
+public:
+
+    virtual bool isLocal() const = 0;
+    virtual std::string typeId() const = 0;
+    virtual bool usesClasses() const = 0;
+    virtual size_t minWireSize() const = 0;
+    virtual bool isVariableLength() const = 0;
+
+protected:
+
+    Type(const UnitPtr&);
+};
+
+// ----------------------------------------------------------------------
+// Builtin
+// ----------------------------------------------------------------------
+
+class Builtin : public virtual Type
+{
+public:
+
+    enum Kind
+    {
+        KindByte,
+        KindBool,
+        KindShort,
+        KindInt,
+        KindLong,
+        KindFloat,
+        KindDouble,
+        KindString,
+        KindObject,
+        KindObjectProxy,
+        KindLocalObject,
+        KindValue
+    };
+
+    virtual bool isLocal() const;
+    virtual std::string typeId() const;
+    virtual bool usesClasses() const;
+    virtual size_t minWireSize() const;
+    virtual bool isVariableLength() const;
+
+    Kind kind() const;
+    std::string kindAsString() const;
+
+    static const char* builtinTable[];
+
+protected:
+
+    Builtin(const UnitPtr&, Kind);
+    friend class Unit;
+
+    Kind _kind;
+};
+
+// ----------------------------------------------------------------------
+// Contained
+// ----------------------------------------------------------------------
+
+class Contained : public virtual SyntaxTreeBase
+{
+public:
+
+    ContainerPtr container() const;
+    std::string name() const;
+    std::string scoped() const;
+    std::string scope() const;
+    std::string flattenedScope() const;
+    std::string file() const;
+    std::string line() const;
+    std::string comment() const;
+
+    int includeLevel() const;
+    void updateIncludeLevel();
+
+    bool hasMetaData(const std::string&) const;
+    bool findMetaData(const std::string&, std::string&) const;
+    std::list<std::string> getMetaData() const;
+    void setMetaData(const std::list<std::string>&);
+    void addMetaData(const std::string&); // TODO: remove this method once "cs:" and "vb:" are hard errors.
+
+    static FormatType parseFormatMetaData(const std::list<std::string>&);
+
+    enum ContainedType
+    {
+        ContainedTypeSequence,
+        ContainedTypeDictionary,
+        ContainedTypeEnum,
+        ContainedTypeEnumerator,
+        ContainedTypeModule,
+        ContainedTypeClass,
+        ContainedTypeException,
+        ContainedTypeStruct,
+        ContainedTypeOperation,
+        ContainedTypeParamDecl,
+        ContainedTypeDataMember,
+        ContainedTypeConstant
+    };
+    virtual ContainedType containedType() const = 0;
+
+    virtual bool uses(const ContainedPtr&) const = 0;
+    virtual std::string kindOf() const = 0;
+
+    bool operator<(const Contained&) const;
+    bool operator==(const Contained&) const;
+    bool operator!=(const Contained&) const;
+
+protected:
+
+    Contained(const ContainerPtr&, const std::string&);
+    friend class Container;
+
+    ContainerPtr _container;
+    std::string _name;
+    std::string _scoped;
+    std::string _file;
+    std::string _line;
+    std::string _comment;
+    int _includeLevel;
+    std::list<std::string> _metaData;
+};
+
+// ----------------------------------------------------------------------
+// Container
+// ----------------------------------------------------------------------
+
+class Container : public virtual SyntaxTreeBase
+{
+public:
+
+    virtual void destroy();
+    ModulePtr createModule(const std::string&);
+    ClassDefPtr createClassDef(const std::string&, int, bool, const ClassList&, bool);
+    ClassDeclPtr createClassDecl(const std::string&, bool, bool, bool = true);
+    ExceptionPtr createException(const std::string&, const ExceptionPtr&, bool, NodeType = Real);
+    StructPtr createStruct(const std::string&, bool, NodeType = Real);
+    SequencePtr createSequence(const std::string&, const TypePtr&, const StringList&, bool, NodeType = Real);
+    DictionaryPtr createDictionary(const std::string&, const TypePtr&, const StringList&, const TypePtr&,
+                                   const StringList&, bool, NodeType = Real);
+    EnumPtr createEnum(const std::string&, bool, NodeType = Real);
+    EnumeratorPtr createEnumerator(const std::string&);
+    EnumeratorPtr createEnumerator(const std::string&, int);
+    ConstPtr createConst(const std::string, const TypePtr&, const StringList&, const SyntaxTreeBasePtr&,
+                         const std::string&, const std::string&, NodeType = Real);
+    TypeList lookupType(const std::string&, bool = true);
+    TypeList lookupTypeNoBuiltin(const std::string&, bool = true, bool = false);
+    ContainedList lookupContained(const std::string&, bool = true);
+    ExceptionPtr lookupException(const std::string&, bool = true);
+    UnitPtr unit() const;
+    ModuleList modules() const;
+    ClassList classes() const;
+    ExceptionList exceptions() const;
+    StructList structs() const;
+    SequenceList sequences() const;
+    DictionaryList dictionaries() const;
+    EnumList enums() const;
+    ConstList consts() const;
+    ContainedList contents() const;
+    bool hasNonLocalClassDecls() const;
+    bool hasNonLocalClassDefs() const;
+    bool hasLocalClassDefsWithAsync() const;
+    bool hasNonLocalSequences() const;
+    bool hasNonLocalExceptions() const;
+    bool hasExceptions() const;
+    bool hasDictionaries() const;
+    bool hasOnlyDictionaries(DictionaryList&) const;
+    bool hasClassDecls() const;
+    bool hasClassDefs() const;
+    bool hasLocalClassDefs() const;
+    bool hasNonLocalInterfaceDefs() const;
+    bool hasValueDefs() const;
+    bool hasOnlyClassDecls() const;
+    bool hasAbstractClassDefs() const;
+    bool hasNonLocalDataOnlyClasses() const;
+    bool hasOtherConstructedOrExceptions() const; // Exceptions or constructed types other than classes.
+    bool hasContentsWithMetaData(const std::string&) const;
+    bool hasAsyncOps() const;
+    bool hasNonLocalContained(Contained::ContainedType) const;
+    std::string thisScope() const;
+    void mergeModules();
+    void sort();
+    void sortContents(bool);
+    virtual void visit(ParserVisitor*, bool);
+    void containerRecDependencies(std::set<ConstructedPtr>&); // Internal operation, don't use directly.
+
+    bool checkIntroduced(const std::string&, ContainedPtr = 0);
+    bool nameIsLegal(const std::string&, const char *);
+    bool checkForGlobalDef(const std::string&, const char *);
+
+protected:
+
+    Container(const UnitPtr&);
+
+    void checkIdentifier(const std::string&) const;
+    bool checkInterfaceAndLocal(const std::string&, bool, bool, bool, bool, bool);
+    bool checkGlobalMetaData(const StringList&, const StringList&);
+    bool validateConstant(const std::string&, const TypePtr&, const SyntaxTreeBasePtr&, const std::string&, bool);
+    EnumeratorPtr validateEnumerator(const std::string&);
+
+    ContainedList _contents;
+    std::map<std::string, ContainedPtr, CICompare> _introducedMap;
+};
+
+// ----------------------------------------------------------------------
+// Module
+// ----------------------------------------------------------------------
+
+class Module : public virtual Container, public virtual Contained
+{
+public:
+
+    virtual ContainedType containedType() const;
+    virtual bool uses(const ContainedPtr&) const;
+    virtual std::string kindOf() const;
+    virtual void visit(ParserVisitor*, bool);
+
+protected:
+
+    Module(const ContainerPtr&, const std::string&);
+    friend class Container;
+};
+
+// ----------------------------------------------------------------------
+// Constructed
+// ----------------------------------------------------------------------
+
+class Constructed : public virtual Type, public virtual Contained
+{
+public:
+
+    virtual bool isLocal() const;
+    virtual std::string typeId() const;
+    virtual bool isVariableLength() const = 0;
+    ConstructedList dependencies();
+    virtual void recDependencies(std::set<ConstructedPtr>&) = 0; // Internal operation, don't use directly.
+
+protected:
+
+    Constructed(const ContainerPtr&, const std::string&, bool);
+
+    bool _local;
+};
+
+// ----------------------------------------------------------------------
+// ClassDecl
+// ----------------------------------------------------------------------
+
+class ClassDecl : public virtual Constructed
+{
+public:
+
+    virtual void destroy();
+    ClassDefPtr definition() const;
+    bool isInterface() const;
+    virtual ContainedType containedType() const;
+    virtual bool uses(const ContainedPtr&) const;
+    virtual bool usesClasses() const;
+    virtual size_t minWireSize() const;
+    virtual bool isVariableLength() const;
+    virtual void visit(ParserVisitor*, bool);
+    virtual std::string kindOf() const;
+    virtual void recDependencies(std::set<ConstructedPtr>&); // Internal operation, don't use directly.
+
+    static void checkBasesAreLegal(const std::string&, bool, bool, const ClassList&, const UnitPtr&);
+
+protected:
+
+    ClassDecl(const ContainerPtr&, const std::string&, bool, bool);
+    friend class Container;
+    friend class ClassDef;
+
+    ClassDefPtr _definition;
+    bool _interface;
+
+private:
+
+    typedef std::list<ClassList> GraphPartitionList;
+    typedef std::list<StringList> StringPartitionList;
+
+    static bool isInList(const GraphPartitionList&, const ClassDefPtr);
+    static void addPartition(GraphPartitionList&, GraphPartitionList::reverse_iterator, const ClassDefPtr);
+    static StringPartitionList toStringPartitionList(const GraphPartitionList&);
+    static void checkPairIntersections(const StringPartitionList&, const std::string&, const UnitPtr&);
+};
+
+// ----------------------------------------------------------------------
+// Operation
+// ----------------------------------------------------------------------
+
+class Operation : public virtual Contained, public virtual Container
+{
+public:
+
+    //
+    // Note: The order of definitions here *must* match the order of
+    // definitions of ::Ice::OperationMode in slice/Ice/Current.ice!
+    //
+    enum Mode
+    {
+        Normal,
+        Nonmutating,
+        Idempotent
+    };
+
+    TypePtr returnType() const;
+    bool returnIsOptional() const;
+    int returnTag() const;
+    Mode mode() const;
+    Mode sendMode() const;
+    ParamDeclPtr createParamDecl(const std::string&, const TypePtr&, bool, bool, int);
+    ParamDeclList parameters() const;
+    ExceptionList throws() const;
+    void setExceptionList(const ExceptionList&);
+    virtual ContainedType containedType() const;
+    virtual bool uses(const ContainedPtr&) const;
+    bool sendsClasses(bool) const;
+    bool returnsClasses(bool) const;
+    bool returnsData() const;
+    bool sendsOptionals() const;
+    int attributes() const;
+    FormatType format() const;
+    virtual std::string kindOf() const;
+    virtual void visit(ParserVisitor*, bool);
+
+protected:
+
+    Operation(const ContainerPtr&, const std::string&, const TypePtr&, bool, int, Mode);
+    friend class ClassDef;
+
+    TypePtr _returnType;
+    bool _returnIsOptional;
+    int _returnTag;
+    ExceptionList _throws;
+    Mode _mode;
+};
+
+// ----------------------------------------------------------------------
+// ClassDef
+// ----------------------------------------------------------------------
+
+//
+// Note: For the purpose of this parser, a class definition is not
+// considered to be a type, but a class declaration is. And each class
+// definition has at least one class declaration (but not vice versa),
+// so if you need the class as a "constructed type", use the
+// declaration() operation to navigate to the class declaration.
+//
+class ClassDef : public virtual Container, public virtual Contained
+{
+public:
+
+    virtual void destroy();
+    OperationPtr createOperation(const std::string&, const TypePtr&, bool, int, Operation::Mode = Operation::Normal);
+    DataMemberPtr createDataMember(const std::string&, const TypePtr&, bool, int, const SyntaxTreeBasePtr&,
+                                   const std::string&, const std::string&);
+    ClassDeclPtr declaration() const;
+    ClassList bases() const;
+    ClassList allBases() const;
+    OperationList operations() const;
+    OperationList allOperations() const;
+    DataMemberList dataMembers() const;
+    DataMemberList orderedOptionalDataMembers() const;
+    DataMemberList allDataMembers() const;
+    DataMemberList classDataMembers() const;
+    DataMemberList allClassDataMembers() const;
+    bool canBeCyclic() const;
+    bool isAbstract() const;
+    bool isInterface() const;
+    bool isA(const std::string&) const;
+    virtual bool isLocal() const;
+    bool hasDataMembers() const;
+    bool hasOperations() const;
+    bool hasDefaultValues() const;
+    bool inheritsMetaData(const std::string&) const;
+    virtual ContainedType containedType() const;
+    virtual bool uses(const ContainedPtr&) const;
+    virtual std::string kindOf() const;
+    virtual void visit(ParserVisitor*, bool);
+    int compactId() const;
+    bool isDelegate() const;
+
+protected:
+
+    ClassDef(const ContainerPtr&, const std::string&, int, bool, const ClassList&, bool);
+    friend class Container;
+
+    ClassDeclPtr _declaration;
+    bool _interface;
+    bool _hasDataMembers;
+    bool _hasOperations;
+    ClassList _bases;
+    bool _local;
+    int _compactId;
+};
+
+// ----------------------------------------------------------------------
+// Proxy
+// ----------------------------------------------------------------------
+
+class Proxy : public virtual Type
+{
+public:
+
+    virtual bool isLocal() const;
+    virtual std::string typeId() const;
+    virtual bool usesClasses() const;
+    virtual size_t minWireSize() const;
+    virtual bool isVariableLength() const;
+
+    ClassDeclPtr _class() const;
+
+    Proxy(const ClassDeclPtr&);
+
+protected:
+
+    ClassDeclPtr __class;
+};
+
+// ----------------------------------------------------------------------
+// Exception
+// ----------------------------------------------------------------------
+
+// No inheritance from Constructed, as this is not a Type
+class Exception : public virtual Container, public virtual Contained
+{
+public:
+
+    virtual void destroy();
+    DataMemberPtr createDataMember(const std::string&, const TypePtr&, bool, int, const SyntaxTreeBasePtr&,
+                                   const std::string&, const std::string&);
+    DataMemberList dataMembers() const;
+    DataMemberList orderedOptionalDataMembers() const;
+    DataMemberList allDataMembers() const;
+    DataMemberList classDataMembers() const;
+    DataMemberList allClassDataMembers() const;
+    ExceptionPtr base() const;
+    ExceptionList allBases() const;
+    virtual bool isBaseOf(const ExceptionPtr&) const;
+    virtual bool isLocal() const;
+    virtual ContainedType containedType() const;
+    virtual bool uses(const ContainedPtr&) const;
+    bool usesClasses(bool) const;
+    bool hasDefaultValues() const;
+    bool inheritsMetaData(const std::string&) const;
+    virtual std::string kindOf() const;
+    virtual void visit(ParserVisitor*, bool);
+
+protected:
+
+    Exception(const ContainerPtr&, const std::string&, const ExceptionPtr&, bool);
+    friend class Container;
+
+    ExceptionPtr _base;
+    bool _local;
+};
+
+// ----------------------------------------------------------------------
+// Struct
+// ----------------------------------------------------------------------
+
+class Struct : public virtual Container, public virtual Constructed
+{
+public:
+
+    DataMemberPtr createDataMember(const std::string&, const TypePtr&, bool, int, const SyntaxTreeBasePtr&,
+                                   const std::string&, const std::string&);
+    DataMemberList dataMembers() const;
+    DataMemberList classDataMembers() const;
+    virtual ContainedType containedType() const;
+    virtual bool uses(const ContainedPtr&) const;
+    virtual bool usesClasses() const;
+    virtual size_t minWireSize() const;
+    virtual bool isVariableLength() const;
+    bool hasDefaultValues() const;
+    virtual std::string kindOf() const;
+    virtual void visit(ParserVisitor*, bool);
+    virtual void recDependencies(std::set<ConstructedPtr>&); // Internal operation, don't use directly.
+
+protected:
+
+    Struct(const ContainerPtr&, const std::string&, bool);
+    friend class Container;
+};
+
+// ----------------------------------------------------------------------
+// Sequence
+// ----------------------------------------------------------------------
+
+class Sequence : public virtual Constructed
+{
+public:
+
+    TypePtr type() const;
+    StringList typeMetaData() const;
+    virtual ContainedType containedType() const;
+    virtual bool uses(const ContainedPtr&) const;
+    virtual bool usesClasses() const;
+    virtual size_t minWireSize() const;
+    virtual bool isVariableLength() const;
+    virtual std::string kindOf() const;
+    virtual void visit(ParserVisitor*, bool);
+    virtual void recDependencies(std::set<ConstructedPtr>&); // Internal operation, don't use directly.
+
+protected:
+
+    Sequence(const ContainerPtr&, const std::string&, const TypePtr&, const StringList&, bool);
+    friend class Container;
+
+    TypePtr _type;
+    StringList _typeMetaData;
+};
+
+// ----------------------------------------------------------------------
+// Dictionary
+// ----------------------------------------------------------------------
+
+class Dictionary : public virtual Constructed
+{
+public:
+
+    TypePtr keyType() const;
+    TypePtr valueType() const;
+    StringList keyMetaData() const;
+    StringList valueMetaData() const;
+    virtual ContainedType containedType() const;
+    virtual bool uses(const ContainedPtr&) const;
+    virtual bool usesClasses() const;
+    virtual size_t minWireSize() const;
+    virtual bool isVariableLength() const;
+    virtual std::string kindOf() const;
+    virtual void visit(ParserVisitor*, bool);
+    virtual void recDependencies(std::set<ConstructedPtr>&); // Internal operation, don't use directly.
+
+    static bool legalKeyType(const TypePtr&, bool&);
+
+protected:
+
+    Dictionary(const ContainerPtr&, const std::string&, const TypePtr&, const StringList&, const TypePtr&,
+               const StringList&, bool);
+    friend class Container;
+
+    TypePtr _keyType;
+    TypePtr _valueType;
+    StringList _keyMetaData;
+    StringList _valueMetaData;
+};
+
+// ----------------------------------------------------------------------
+// Enum
+// ----------------------------------------------------------------------
+
+class Enum : public virtual Constructed
+{
+public:
+
+    virtual void destroy();
+    EnumeratorList getEnumerators();
+    void setEnumerators(const EnumeratorList&);
+    bool explicitValue() const;
+    int minValue() const;
+    int maxValue() const;
+    virtual ContainedType containedType() const;
+    virtual bool uses(const ContainedPtr&) const;
+    virtual bool usesClasses() const;
+    virtual size_t minWireSize() const;
+    virtual bool isVariableLength() const;
+    virtual std::string kindOf() const;
+    virtual void visit(ParserVisitor*, bool);
+    virtual void recDependencies(std::set<ConstructedPtr>&); // Internal operation, don't use directly.
+
+protected:
+
+    Enum(const ContainerPtr&, const std::string&, bool);
+    friend class Container;
+
+    EnumeratorList _enumerators;
+    bool _explicitValue;
+    IceUtil::Int64 _minValue;
+    IceUtil::Int64 _maxValue;
+};
+
+// ----------------------------------------------------------------------
+// Enumerator
+// ----------------------------------------------------------------------
+
+class Enumerator : public virtual Contained
+{
+public:
+
+    EnumPtr type() const;
+    virtual bool uses(const ContainedPtr&) const;
+    virtual ContainedType containedType() const;
+    virtual std::string kindOf() const;
+
+    bool explicitValue() const;
+    int value() const;
+
+protected:
+
+    Enumerator(const ContainerPtr&, const std::string&);
+    Enumerator(const ContainerPtr&, const std::string&, int);
+    friend class Container;
+    friend class Enum;
+
+    EnumPtr _type;
+    bool _explicitValue;
+    int _value;
+};
+
+// ----------------------------------------------------------------------
+// Const
+// ----------------------------------------------------------------------
+
+class Const : public virtual Contained
+{
+public:
+
+    TypePtr type() const;
+    StringList typeMetaData() const;
+    SyntaxTreeBasePtr valueType() const;
+    std::string value() const;
+    std::string literal() const;
+    virtual bool uses(const ContainedPtr&) const;
+    virtual ContainedType containedType() const;
+    virtual std::string kindOf() const;
+    virtual void visit(ParserVisitor*, bool);
+
+protected:
+
+    Const(const ContainerPtr&, const std::string&, const TypePtr&, const StringList&, const SyntaxTreeBasePtr&,
+          const std::string&, const std::string&);
+    friend class Container;
+
+    TypePtr _type;
+    StringList _typeMetaData;
+    SyntaxTreeBasePtr _valueType;
+    std::string _value;
+    std::string _literal;
+};
+
+// ----------------------------------------------------------------------
+// ParamDecl
+// ----------------------------------------------------------------------
+
+class ParamDecl : public virtual Contained
+{
+public:
+
+    TypePtr type() const;
+    bool isOutParam() const;
+    bool optional() const;
+    int tag() const;
+    virtual ContainedType containedType() const;
+    virtual bool uses(const ContainedPtr&) const;
+    virtual std::string kindOf() const;
+    virtual void visit(ParserVisitor*, bool);
+
+protected:
+
+    ParamDecl(const ContainerPtr&, const std::string&, const TypePtr&, bool, bool, int);
+    friend class Operation;
+
+    TypePtr _type;
+    bool _isOutParam;
+    bool _optional;
+    int _tag;
+};
+
+// ----------------------------------------------------------------------
+// DataMember
+// ----------------------------------------------------------------------
+
+class DataMember : public virtual Contained
+{
+public:
+
+    TypePtr type() const;
+    bool optional() const;
+    int tag() const;
+    std::string defaultValue() const;
+    std::string defaultLiteral() const;
+    SyntaxTreeBasePtr defaultValueType() const;
+    virtual ContainedType containedType() const;
+    virtual bool uses(const ContainedPtr&) const;
+    virtual std::string kindOf() const;
+    virtual void visit(ParserVisitor*, bool);
+
+
+protected:
+
+    DataMember(const ContainerPtr&, const std::string&, const TypePtr&, bool, int, const SyntaxTreeBasePtr&,
+               const std::string&, const std::string&);
+    friend class ClassDef;
+    friend class Struct;
+    friend class Exception;
+
+    TypePtr _type;
+    bool _optional;
+    int _tag;
+    SyntaxTreeBasePtr _defaultValueType;
+    std::string _defaultValue;
+    std::string _defaultLiteral;
+};
+
+// ----------------------------------------------------------------------
+// Unit
+// ----------------------------------------------------------------------
+
+class Unit : public virtual Container
+{
+public:
+
+    static UnitPtr createUnit(bool, bool, bool, bool, const StringList& = StringList());
+
+    bool ignRedefs() const;
+    bool allowIcePrefix() const;
+    bool allowUnderscore() const;
+
+    void setComment(const std::string&);
+    std::string currentComment(); // Not const, as this function removes the current comment.
+    std::string currentFile() const;
+    std::string topLevelFile() const;
+    int currentLine() const;
+
+    void nextLine();
+    bool scanPosition(const char*);
+    int currentIncludeLevel() const;
+
+    void addGlobalMetaData(const StringList&);
+
+    void setSeenDefinition();
+
+    void error(const char*); // Not const, because error count is increased.
+    void error(const std::string&); // Ditto.
+
+    void warning(const char*) const;
+    void warning(const std::string&) const;
+
+    ContainerPtr currentContainer() const;
+    void pushContainer(const ContainerPtr&);
+    void popContainer();
+
+    DefinitionContextPtr currentDefinitionContext() const;
+    void pushDefinitionContext();
+    void popDefinitionContext();
+    DefinitionContextPtr findDefinitionContext(const std::string&) const;
+
+    void addContent(const ContainedPtr&);
+    void removeContent(const ContainedPtr&);
+    ContainedList findContents(const std::string&) const;
+    ClassList findDerivedClasses(const ClassDefPtr&) const;
+    ExceptionList findDerivedExceptions(const ExceptionPtr&) const;
+    ContainedList findUsedBy(const ContainedPtr&) const;
+
+    void addTypeId(int, const std::string&);
+    std::string getTypeId(int);
+
+    bool usesNonLocals() const;
+    bool usesConsts() const;
+
+    FeatureProfile profile() const;
+
+    //
+    // Returns the path names of the files included directly by the top-level file.
+    //
+    StringList includeFiles() const;
+
+    //
+    // Returns the path names of all files parsed by this unit.
+    //
+    StringList allFiles() const;
+
+    int parse(const std::string&, FILE*, bool, FeatureProfile profile = Ice);
+
+    virtual void destroy();
+    virtual void visit(ParserVisitor*, bool);
+
+    BuiltinPtr builtin(Builtin::Kind); // Not const, as builtins are created on the fly. (Lazy initialization.)
+
+    void addTopLevelModule(const std::string&, const std::string&);
+    std::set<std::string> getTopLevelModules(const std::string&) const;
+
+private:
+
+    Unit(bool, bool, bool, bool, const StringList&);
+    static void eraseWhiteSpace(::std::string&);
+
+    bool _ignRedefs;
+    bool _all;
+    bool _allowIcePrefix;
+    bool _allowUnderscore;
+    StringList _defaultGlobalMetaData;
+    int _errors;
+    std::string _currentComment;
+    int _currentLine;
+    int _currentIncludeLevel;
+    std::string _currentFile;
+    std::string _topLevelFile;
+    std::stack<DefinitionContextPtr> _definitionContextStack;
+    StringList _includeFiles;
+    std::stack<ContainerPtr> _containerStack;
+    std::map<Builtin::Kind, BuiltinPtr> _builtins;
+    std::map<std::string, ContainedList> _contentMap;
+    FeatureProfile _featureProfile;
+    std::map<std::string, DefinitionContextPtr> _definitionContextMap;
+    std::map<int, std::string> _typeIds;
+    std::map< std::string, std::set<std::string> > _fileTopLevelModules;
+};
+
+extern Unit* unit; // The current parser for bison/flex
+
+}
+
+#endif
diff --git a/cpp/src/Slice/Preprocessor.h b/cpp/src/Slice/Preprocessor.h
new file mode 100644
index 00000000000..80f8acf4d66
--- /dev/null
+++ b/cpp/src/Slice/Preprocessor.h
@@ -0,0 +1,60 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef PREPROCESSOR_H
+#define PREPROCESSOR_H
+
+#include <IceUtil/Shared.h>
+#include <IceUtil/Handle.h>
+#include <vector>
+
+namespace Slice
+{
+
+class Preprocessor;
+typedef IceUtil::Handle<Preprocessor> PreprocessorPtr;
+
+class Preprocessor : public IceUtil::SimpleShared
+{
+public:
+
+    static PreprocessorPtr create(const std::string&, const std::string&, const std::vector<std::string>&);
+
+    ~Preprocessor();
+
+    FILE* preprocess(bool, const std::string& = "");
+    bool close();
+
+    enum Language { CPlusPlus, Java, CSharp, Python, Ruby, PHP, JavaScript, JavaScriptJSON, ObjC, SliceXML };
+
+    bool printMakefileDependencies(std::ostream&, Language, const std::vector<std::string>&, const std::string& = "",
+                                   const std::string& = "cpp", const std::string& = "");
+
+    std::string getBaseName();
+
+    static std::string addQuotes(const std::string&);
+    static std::string normalizeIncludePath(const std::string&);
+
+private:
+
+    Preprocessor(const std::string&, const std::string&, const std::vector<std::string>&);
+
+    bool checkInputFile();
+
+    const std::string _path;
+    const std::string _fileName;
+    const std::string _shortFileName;
+    const std::vector<std::string> _args;
+    std::string _cppFile;
+    FILE* _cppHandle;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp
index 0caebc4ef4d..89a459979fd 100644
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/Slice/PythonUtil.cpp
@@ -13,7 +13,7 @@
 #include <IceUtil/IceUtil.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/InputUtil.h>
-#include <IceUtil/Unicode.h>
+#include <IceUtil/StringConverter.h>
 #include <climits>
 #include <iterator>
 
@@ -734,7 +734,7 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
         _out << nl << "uncheckedCast = staticmethod(uncheckedCast)";
 
 
-	//
+        //
         // ice_staticId
         //
         _out << sp << nl << "def ice_staticId():";
@@ -743,7 +743,7 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
         _out.dec();
         _out << nl << "ice_staticId = staticmethod(ice_staticId)";
 
-	_out.dec();
+        _out.dec();
 
         _out << sp << nl << "_M_" << prxType << " = IcePy.defineProxy('" << scoped << "', " << prxName << ")";
     }
@@ -1064,9 +1064,9 @@ Slice::Python::CodeVisitor::visitExceptionStart(const ExceptionPtr& p)
     _out << sp << nl << "__repr__ = __str__";
 
     //
-    // _ice_name
+    // _ice_id
     //
-    _out << sp << nl << "_ice_name = '" << scoped.substr(2) << "'";
+    _out << sp << nl << "_ice_id = '" << scoped << "'";
 
     _out.dec();
 
@@ -1613,6 +1613,7 @@ Slice::Python::CodeVisitor::writeType(const TypePtr& p)
                 break;
             }
             case Builtin::KindObject:
+            case Builtin::KindValue:
             {
                 _out << "IcePy._t_Object";
                 break;
@@ -1676,6 +1677,7 @@ Slice::Python::CodeVisitor::writeInitializer(const DataMemberPtr& m)
                 _out << "''";
                 break;
             }
+            case Builtin::KindValue:
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
             case Builtin::KindLocalObject:
@@ -1895,22 +1897,7 @@ Slice::Python::CodeVisitor::writeConstantValue(const TypePtr& type, const Syntax
                                 vector<unsigned int> u32buffer;
                                 u32buffer.push_back(static_cast<unsigned int>(v));
 
-                                vector<unsigned char> u8buffer;
-                                IceUtilInternal::ConversionResult result = convertUTF32ToUTF8(u32buffer, u8buffer, IceUtil::lenientConversion);
-                                switch(result)
-                                {
-                                    case conversionOK:
-                                        break;
-                                    case sourceExhausted:
-                                        throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source exhausted");
-                                    case sourceIllegal:
-                                        throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source illegal");
-                                    default:
-                                    {
-                                        assert(0);
-                                        throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
-                                    }
-                                }
+                                vector<unsigned char> u8buffer = fromUTF32(u32buffer);
 
                                 ostringstream s;
                                 for(vector<unsigned char>::const_iterator q = u8buffer.begin(); q != u8buffer.end(); ++q)
@@ -1983,6 +1970,7 @@ Slice::Python::CodeVisitor::writeConstantValue(const TypePtr& type, const Syntax
                 _out << "\"";                                       // Closing "
                 break;
             }
+            case Slice::Builtin::KindValue:
             case Slice::Builtin::KindObject:
             case Slice::Builtin::KindObjectProxy:
             case Slice::Builtin::KindLocalObject:
diff --git a/cpp/src/Slice/PythonUtil.h b/cpp/src/Slice/PythonUtil.h
new file mode 100644
index 00000000000..807fcfa1561
--- /dev/null
+++ b/cpp/src/Slice/PythonUtil.h
@@ -0,0 +1,64 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef SLICE_PYTHON_UTIL_H
+#define SLICE_PYTHON_UTIL_H
+
+#include <Slice/Parser.h>
+#include <IceUtil/OutputUtil.h>
+
+namespace Slice
+{
+namespace Python
+{
+
+//
+// Generate Python code for a translation unit.
+//
+void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtilInternal::Output&);
+
+//
+// Convert a scoped name into a Python name.
+//
+std::string scopedToName(const std::string&);
+
+//
+// Check the given identifier against Python's list of reserved words. If it matches
+// a reserved word, then an escaped version is returned with a leading underscore.
+//
+std::string fixIdent(const std::string&);
+
+//
+// Return the package specified in the global metadata for the given definition,
+// or an empty string if no metadata was found.
+//
+std::string getPackageMetadata(const Slice::ContainedPtr&);
+
+//
+// Get the fully-qualified name of the given definition, including any
+// package defined via metadata. If a suffix is provided, it is
+// prepended to the definition's unqualified name. If the nameSuffix
+// is provided, it is appended to the containers name.
+//
+// COMPILERFIX: MSVC 6 seems to have a problem with const std::string
+// = std::string(), const std::string = std::string().
+//
+std::string getAbsolute(const Slice::ContainedPtr&, const std::string& = "", const std::string& = "");
+
+//
+// Emit a comment header.
+//
+void printHeader(IceUtilInternal::Output&);
+
+int compile(int, char*[]);
+
+}
+}
+
+#endif
diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp
index 6364e88133e..d561c8db755 100644
--- a/cpp/src/Slice/RubyUtil.cpp
+++ b/cpp/src/Slice/RubyUtil.cpp
@@ -12,7 +12,7 @@
 #include <Slice/Util.h>
 #include <IceUtil/Functional.h>
 #include <IceUtil/InputUtil.h>
-#include <IceUtil/Unicode.h>
+#include <IceUtil/StringConverter.h>
 #include <iterator>
 
 using namespace std;
@@ -551,7 +551,7 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
         _out.dec();
         _out << nl << "end";
 
-	_out << nl << "def " << name << "Prx.ice_staticId()";
+        _out << nl << "def " << name << "Prx.ice_staticId()";
         _out.inc();
         _out << nl << "'" << scoped << "'";
         _out.dec();
@@ -871,7 +871,7 @@ Slice::Ruby::CodeVisitor::visitExceptionStart(const ExceptionPtr& p)
     //
     _out << sp << nl << "def to_s";
     _out.inc();
-    _out << nl << "'" << scoped.substr(2) << "'";
+    _out << nl << "'" << scoped << "'";
     _out.dec();
     _out << nl << "end";
 
@@ -1322,6 +1322,7 @@ Slice::Ruby::CodeVisitor::writeType(const TypePtr& p)
                 _out << "::Ice::T_string";
                 break;
             }
+            case Builtin::KindValue:
             case Builtin::KindObject:
             {
                 _out << "::Ice::T_Object";
@@ -1382,6 +1383,7 @@ Slice::Ruby::CodeVisitor::getInitializer(const DataMemberPtr& m)
             {
                 return "''";
             }
+            case Builtin::KindValue:
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
             case Builtin::KindLocalObject:
@@ -1506,22 +1508,7 @@ Slice::Ruby::CodeVisitor::writeConstantValue(const TypePtr& type, const SyntaxTr
                                 vector<unsigned int> u32buffer;
                                 u32buffer.push_back(static_cast<unsigned int>(v));
 
-                                vector<unsigned char> u8buffer;
-                                IceUtilInternal::ConversionResult result = convertUTF32ToUTF8(u32buffer, u8buffer, IceUtil::lenientConversion);
-                                switch(result)
-                                {
-                                    case conversionOK:
-                                        break;
-                                    case sourceExhausted:
-                                        throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source exhausted");
-                                    case sourceIllegal:
-                                        throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source illegal");
-                                    default:
-                                    {
-                                        assert(0);
-                                        throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
-                                    }
-                                }
+                                vector<unsigned char> u8buffer = fromUTF32(u32buffer);
 
                                 ostringstream s;
                                 for(vector<unsigned char>::const_iterator q = u8buffer.begin(); q != u8buffer.end(); ++q)
@@ -1595,6 +1582,7 @@ Slice::Ruby::CodeVisitor::writeConstantValue(const TypePtr& type, const SyntaxTr
                 break;
             }
 
+            case Slice::Builtin::KindValue:
             case Slice::Builtin::KindObject:
             case Slice::Builtin::KindObjectProxy:
             case Slice::Builtin::KindLocalObject:
diff --git a/cpp/src/Slice/RubyUtil.h b/cpp/src/Slice/RubyUtil.h
new file mode 100644
index 00000000000..3acae195d9c
--- /dev/null
+++ b/cpp/src/Slice/RubyUtil.h
@@ -0,0 +1,54 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef SLICE_RUBY_UTIL_H
+#define SLICE_RUBY_UTIL_H
+
+#include <Slice/Parser.h>
+#include <IceUtil/OutputUtil.h>
+
+namespace Slice
+{
+namespace Ruby
+{
+
+//
+// Generate Ruby code for a translation unit.
+//
+void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtilInternal::Output&);
+
+//
+// Check the given identifier against Ruby's list of reserved words. If it matches
+// a reserved word, then an escaped version is returned with a leading underscore.
+//
+enum IdentStyle
+{
+    IdentNormal,
+    IdentToUpper, // Mapped identifier must begin with an upper-case letter.
+    IdentToLower  // Mapped identifier must begin with a lower-case letter.
+};
+std::string fixIdent(const std::string&, IdentStyle);
+
+//
+// Get the fully-qualified name of the given definition. If a prefix is provided,
+// it is prepended to the definition's unqualified name.
+//
+std::string getAbsolute(const Slice::ContainedPtr&, IdentStyle, const std::string& = std::string());
+
+//
+// Emit a comment header.
+//
+void printHeader(IceUtilInternal::Output&);
+
+int compile(int, char*[]);
+
+}
+}
+
+#endif
diff --git a/cpp/src/Slice/Scanner.cpp b/cpp/src/Slice/Scanner.cpp
index fc2fc290dac..27d362e04c9 100644
--- a/cpp/src/Slice/Scanner.cpp
+++ b/cpp/src/Slice/Scanner.cpp
@@ -564,7 +564,7 @@ char *slice_text;
 //
 // **********************************************************************
 
-#include <Slice/GrammarUtil.h>	// Before Grammer.h, so that YYSTYPE is defined
+#include <Slice/GrammarUtil.h>  // Before Grammer.h, so that YYSTYPE is defined
 #include <Slice/Grammar.h>
 #include <IceUtil/InputUtil.h>
 
@@ -607,7 +607,7 @@ char *slice_text;
 #      define slice_wrap() 1
 #   endif
 #   ifdef ICE_64
-#       pragma error_messages(off,truncwarn)      
+#       pragma error_messages(off,truncwarn)
 #   endif
 #endif
 
@@ -620,7 +620,7 @@ namespace Slice
 //
 // Definitions for the case-insensitive keyword-token map.
 //
-typedef std::map<std::string, int, Slice::CICompare> StringTokenMap;
+typedef std::map<std::string, int> StringTokenMap;
 static StringTokenMap keywordMap;
 
 void initScanner();
@@ -628,7 +628,7 @@ int checkKeyword(string&);
 
 }
 
-#define	YY_USER_INIT initScanner();
+#define YY_USER_INIT initScanner();
 
 
 
@@ -973,11 +973,11 @@ YY_RULE_SETUP
     int c;
     do
     {
-	c = yyinput();
-	if(c == '\n')
-	{
-	    unit->nextLine();
-	}
+        c = yyinput();
+        if(c == '\n')
+        {
+            unit->nextLine();
+        }
     }
     while(c != '\n' && c != EOF);
 }
@@ -991,38 +991,38 @@ YY_RULE_SETUP
     string comment = slice_text + 2;
     while(true)
     {
-	int c = yyinput();
-	if(c == '\n')
-	{
-	    comment += static_cast<char>(c);
-	    unit->nextLine();
-	}
-	else if(c == '*')
-	{
-	    int next = yyinput();
-	    if(next == '/')
-	    {
-		break;
-	    }
-	    else
-	    {
-		comment += static_cast<char>(c);
-		unput(next);
-	    }
-	}
-	else if(c == EOF)
-	{
-	    unit->warning("EOF in comment");
-	    break;
-	}
-	else
-	{
-	    comment += static_cast<char>(c);
-	}
+        int c = yyinput();
+        if(c == '\n')
+        {
+            comment += static_cast<char>(c);
+            unit->nextLine();
+        }
+        else if(c == '*')
+        {
+            int next = yyinput();
+            if(next == '/')
+            {
+                break;
+            }
+            else
+            {
+                comment += static_cast<char>(c);
+                unput(next);
+            }
+        }
+        else if(c == EOF)
+        {
+            unit->warning("EOF in comment");
+            break;
+        }
+        else
+        {
+            comment += static_cast<char>(c);
+        }
     }
     if(!comment.empty() && comment[0] == '*')
     {
-	unit->setComment(comment);
+        unit->setComment(comment);
     }
 }
 	YY_BREAK
@@ -1396,11 +1396,11 @@ YY_RULE_SETUP
     *yylvalp = itp;
     if(!IceUtilInternal::stringToInt64(string(slice_text), itp->v))
     {
-	assert(itp->v != 0);
-	string msg = "integer constant `";
-	msg += slice_text;
-	msg += "' out of range";
-	unit->error(msg);
+        assert(itp->v != 0);
+        string msg = "integer constant `";
+        msg += slice_text;
+        msg += "' out of range";
+        unit->error(msg);
     }
     return ICE_INTEGER_LITERAL;
 }
@@ -1418,22 +1418,22 @@ YY_RULE_SETUP
     char lastChar = literal[literal.size() - 1];
     if(lastChar == 'f' || lastChar == 'F')
     {
-    	literal = literal.substr(0, literal.size() - 1);	// Clobber trailing 'f' or 'F' suffix
+        literal = literal.substr(0, literal.size() - 1);    // Clobber trailing 'f' or 'F' suffix
     }
     ftp->v = strtod(literal.c_str(), 0);
     if((ftp->v == HUGE_VAL || ftp->v == -HUGE_VAL) && errno == ERANGE)
     {
-	string msg = "floating-point constant `";
-	msg += slice_text;
-	msg += "' too large (overflow)";
-	unit->error(msg);
+        string msg = "floating-point constant `";
+        msg += slice_text;
+        msg += "' too large (overflow)";
+        unit->error(msg);
     }
     else if(ftp->v == 0 && errno == ERANGE)
     {
-	string msg = "floating-point constant `";
-	msg += slice_text;
-	msg += "' too small (underflow)";
-	unit->error(msg);
+        string msg = "floating-point constant `";
+        msg += slice_text;
+        msg += "' too small (underflow)";
+    unit->error(msg);
     }
     return ICE_FLOATING_POINT_LITERAL;
 }
@@ -1444,14 +1444,14 @@ YY_RULE_SETUP
 #line 561 "Scanner.l"
 {
     // Ignore white-space
-    
+
     if(unit->currentLine() != 0)
     {
         BEGIN(MAINSCAN);
     }
     if(slice_text[0] == '\n')
     {
-	unit->nextLine();
+        unit->nextLine();
     }
 }
 	YY_BREAK
@@ -1460,7 +1460,7 @@ YY_RULE_SETUP
 #line 574 "Scanner.l"
 {
     // Ignore UTF-8 BOM, rule only active when parsing start of file.
-    
+
     BEGIN(MAINSCAN);
 }
 	YY_BREAK
@@ -1471,14 +1471,14 @@ YY_RULE_SETUP
     BEGIN(MAINSCAN);
     if(slice_text[0] < 32 || slice_text[0] > 126)
     {
-	stringstream s;
-	s << "illegal input character: '\\";
-	s.width(3);
-	s.fill('0');
-	s << oct << static_cast<int>(static_cast<unsigned char>(slice_text[0]));
-	s << "'";
-	unit->error(s.str());
-	return BAD_CHAR;
+        stringstream s;
+        s << "illegal input character: '\\";
+        s.width(3);
+        s.fill('0');
+        s << oct << static_cast<int>(static_cast<unsigned char>(slice_text[0]));
+        s << "'";
+        unit->error(s.str());
+        return BAD_CHAR;
     }
     return slice_text[0];
 }
@@ -2531,6 +2531,7 @@ initScanner()
     keywordMap["true"] = ICE_TRUE;
     keywordMap["idempotent"] = ICE_IDEMPOTENT;
     keywordMap["optional"] = ICE_OPTIONAL;
+    keywordMap["Value"] = ICE_VALUE;
 }
 
 //
@@ -2546,15 +2547,15 @@ checkKeyword(string& id)
     StringTokenMap::const_iterator pos = keywordMap.find(id);
     if(pos != keywordMap.end())
     {
-    	if(pos->first != id)
-	{
-	    string msg;
-	    msg = "illegal identifier: `" + id + "' differs from keyword `";
-	    msg += pos->first + "' only in capitalization";
-	    unit->error(msg);
-	    id = pos->first;
-	}
-	return pos->second;
+        if(pos->first != id)
+        {
+            string msg;
+            msg = "illegal identifier: `" + id + "' differs from keyword `";
+            msg += pos->first + "' only in capitalization";
+            unit->error(msg);
+            id = pos->first;
+        }
+        return pos->second;
     }
     return ICE_IDENTIFIER;
 }
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 9054c1e90ed..a9c381b7260 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -9,7 +9,7 @@
 //
 // **********************************************************************
 
-#include <Slice/GrammarUtil.h>	// Before Grammer.h, so that YYSTYPE is defined
+#include <Slice/GrammarUtil.h>  // Before Grammer.h, so that YYSTYPE is defined
 #include <Slice/Grammar.h>
 #include <IceUtil/InputUtil.h>
 
@@ -52,7 +52,7 @@
 #      define slice_wrap() 1
 #   endif
 #   ifdef ICE_64
-#       pragma error_messages(off,truncwarn)      
+#       pragma error_messages(off,truncwarn)
 #   endif
 #endif
 
@@ -65,7 +65,7 @@ namespace Slice
 //
 // Definitions for the case-insensitive keyword-token map.
 //
-typedef std::map<std::string, int, Slice::CICompare> StringTokenMap;
+typedef std::map<std::string, int> StringTokenMap;
 static StringTokenMap keywordMap;
 
 void initScanner();
@@ -73,7 +73,7 @@ int checkKeyword(string&);
 
 }
 
-#define	YY_USER_INIT initScanner();
+#define YY_USER_INIT initScanner();
 
 %}
 
@@ -82,11 +82,11 @@ int checkKeyword(string&);
 %option prefix="slice_"
 %option outfile="lex.yy.c"
 
-identifier		\\?[[:alpha:]_][[:alnum:]_]*
-integer_constant	(\+|-)?((0[0-7]+)|(0x[[:xdigit:]]+)|([[:digit:]]+))
-fractional_constant	(\+|-)?(([[:digit:]]*\.[[:digit:]]+)|([[:digit:]]+\.))
-exponent_part		(e|E)(\+|-)?[[:digit:]]+
-floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{exponent_part}))[fF]?
+identifier      \\?[[:alpha:]_][[:alnum:]_]*
+integer_constant    (\+|-)?((0[0-7]+)|(0x[[:xdigit:]]+)|([[:digit:]]+))
+fractional_constant (\+|-)?(([[:digit:]]*\.[[:digit:]]+)|([[:digit:]]+\.))
+exponent_part       (e|E)(\+|-)?[[:digit:]]+
+floating_literal    (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{exponent_part}))[fF]?
 
 %s BOMSCAN
 %s MAINSCAN
@@ -127,11 +127,11 @@ floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e
     int c;
     do
     {
-	c = yyinput();
-	if(c == '\n')
-	{
-	    unit->nextLine();
-	}
+        c = yyinput();
+        if(c == '\n')
+        {
+            unit->nextLine();
+        }
     }
     while(c != '\n' && c != EOF);
 }
@@ -142,38 +142,38 @@ floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e
     string comment = yytext + 2;
     while(true)
     {
-	int c = yyinput();
-	if(c == '\n')
-	{
-	    comment += static_cast<char>(c);
-	    unit->nextLine();
-	}
-	else if(c == '*')
-	{
-	    int next = yyinput();
-	    if(next == '/')
-	    {
-		break;
-	    }
-	    else
-	    {
-		comment += static_cast<char>(c);
-		unput(next);
-	    }
-	}
-	else if(c == EOF)
-	{
-	    unit->warning("EOF in comment");
-	    break;
-	}
-	else
-	{
-	    comment += static_cast<char>(c);
-	}
+        int c = yyinput();
+        if(c == '\n')
+        {
+            comment += static_cast<char>(c);
+            unit->nextLine();
+        }
+        else if(c == '*')
+        {
+            int next = yyinput();
+            if(next == '/')
+            {
+                break;
+            }
+            else
+            {
+                comment += static_cast<char>(c);
+                unput(next);
+            }
+        }
+        else if(c == EOF)
+        {
+            unit->warning("EOF in comment");
+            break;
+        }
+        else
+        {
+            comment += static_cast<char>(c);
+        }
     }
     if(!comment.empty() && comment[0] == '*')
     {
-	unit->setComment(comment);
+        unit->setComment(comment);
     }
 }
 
@@ -519,11 +519,11 @@ floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e
     *yylvalp = itp;
     if(!IceUtilInternal::stringToInt64(string(yytext), itp->v))
     {
-	assert(itp->v != 0);
-	string msg = "integer constant `";
-	msg += yytext;
-	msg += "' out of range";
-	unit->error(msg);
+        assert(itp->v != 0);
+        string msg = "integer constant `";
+        msg += yytext;
+        msg += "' out of range";
+        unit->error(msg);
     }
     return ICE_INTEGER_LITERAL;
 }
@@ -538,42 +538,42 @@ floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e
     char lastChar = literal[literal.size() - 1];
     if(lastChar == 'f' || lastChar == 'F')
     {
-    	literal = literal.substr(0, literal.size() - 1);	// Clobber trailing 'f' or 'F' suffix
+        literal = literal.substr(0, literal.size() - 1);    // Clobber trailing 'f' or 'F' suffix
     }
     ftp->v = strtod(literal.c_str(), 0);
     if((ftp->v == HUGE_VAL || ftp->v == -HUGE_VAL) && errno == ERANGE)
     {
-	string msg = "floating-point constant `";
-	msg += yytext;
-	msg += "' too large (overflow)";
-	unit->error(msg);
+        string msg = "floating-point constant `";
+        msg += yytext;
+        msg += "' too large (overflow)";
+        unit->error(msg);
     }
     else if(ftp->v == 0 && errno == ERANGE)
     {
-	string msg = "floating-point constant `";
-	msg += yytext;
-	msg += "' too small (underflow)";
-	unit->error(msg);
+        string msg = "floating-point constant `";
+        msg += yytext;
+        msg += "' too small (underflow)";
+    unit->error(msg);
     }
     return ICE_FLOATING_POINT_LITERAL;
 }
 
 [[:space:]] {
     // Ignore white-space
-    
+
     if(unit->currentLine() != 0)
     {
         BEGIN(MAINSCAN);
     }
     if(yytext[0] == '\n')
     {
-	unit->nextLine();
+        unit->nextLine();
     }
 }
 
 <BOMSCAN>^"\357\273\277" {
     // Ignore UTF-8 BOM, rule only active when parsing start of file.
-    
+
     BEGIN(MAINSCAN);
 }
 
@@ -581,14 +581,14 @@ floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e
     BEGIN(MAINSCAN);
     if(yytext[0] < 32 || yytext[0] > 126)
     {
-	stringstream s;
-	s << "illegal input character: '\\";
-	s.width(3);
-	s.fill('0');
-	s << oct << static_cast<int>(static_cast<unsigned char>(yytext[0]));
-	s << "'";
-	unit->error(s.str());
-	return BAD_CHAR;
+        stringstream s;
+        s << "illegal input character: '\\";
+        s.width(3);
+        s.fill('0');
+        s << oct << static_cast<int>(static_cast<unsigned char>(yytext[0]));
+        s << "'";
+        unit->error(s.str());
+        return BAD_CHAR;
     }
     return yytext[0];
 }
@@ -633,6 +633,7 @@ initScanner()
     keywordMap["true"] = ICE_TRUE;
     keywordMap["idempotent"] = ICE_IDEMPOTENT;
     keywordMap["optional"] = ICE_OPTIONAL;
+    keywordMap["Value"] = ICE_VALUE;
 }
 
 //
@@ -648,15 +649,15 @@ checkKeyword(string& id)
     StringTokenMap::const_iterator pos = keywordMap.find(id);
     if(pos != keywordMap.end())
     {
-    	if(pos->first != id)
-	{
-	    string msg;
-	    msg = "illegal identifier: `" + id + "' differs from keyword `";
-	    msg += pos->first + "' only in capitalization";
-	    unit->error(msg);
-	    id = pos->first;
-	}
-	return pos->second;
+        if(pos->first != id)
+        {
+            string msg;
+            msg = "illegal identifier: `" + id + "' differs from keyword `";
+            msg += pos->first + "' only in capitalization";
+            unit->error(msg);
+            id = pos->first;
+        }
+        return pos->second;
     }
     return ICE_IDENTIFIER;
 }
diff --git a/cpp/src/Slice/Util.cpp b/cpp/src/Slice/SliceUtil.cpp
index 66d142b5897..e0c490fa937 100644
--- a/cpp/src/Slice/Util.cpp
+++ b/cpp/src/Slice/SliceUtil.cpp
@@ -154,8 +154,9 @@ Slice::fullPath(const string& path)
 }
 
 string
-Slice::changeInclude(const string& path, const vector<string>& includePaths)
+Slice::changeInclude(const string& p, const vector<string>& includePaths)
 {
+    string path = normalizePath(p);
     //
     // Compare each include path against the included file and select
     // the path that produces the shortest relative filename.
diff --git a/cpp/src/Slice/Util.h b/cpp/src/Slice/Util.h
new file mode 100644
index 00000000000..a2ec69a87a2
--- /dev/null
+++ b/cpp/src/Slice/Util.h
@@ -0,0 +1,51 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef SLICE_UTIL_H
+#define SLICE_UTIL_H
+
+#include <Slice/Parser.h>
+#include <IceUtil/OutputUtil.h>
+
+#include <ostream>
+#include <fstream>
+
+namespace Slice
+{
+
+std::string fullPath(const std::string&);
+std::string changeInclude(const std::string&, const std::vector<std::string>&);
+void setErrorStream(std::ostream&);
+std::ostream& getErrorStream();
+void emitError(const std::string&, int, const std::string&);
+void emitWarning(const std::string&, int, const std::string&);
+void emitError(const std::string&, const std::string&, const std::string&);
+void emitWarning(const std::string&, const std::string&, const std::string&);
+void emitRaw(const char*);
+std::vector<std::string> filterMcppWarnings(const std::string&);
+void printGeneratedHeader(IceUtilInternal::Output& out, const std::string&, const std::string& commentStyle = "//");
+
+class DependOutputUtil : IceUtil::noncopyable
+{
+public:
+
+    DependOutputUtil(std::string& file);
+    ~DependOutputUtil();
+    void cleanup();
+    std::ostream& os();
+
+private:
+
+    const std::string _file;
+    std::ofstream _os;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Slice/msbuild/slice.vcxproj b/cpp/src/Slice/msbuild/slice.vcxproj
new file mode 100644
index 00000000000..56da4105e54
--- /dev/null
+++ b/cpp/src/Slice/msbuild/slice.vcxproj
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}</ProjectGuid>
+    <RootNamespace>Slice</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <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" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Checksum.h" />
+    <ClInclude Include="..\CPlusPlusUtil.h" />
+    <ClInclude Include="..\FileTracker.h" />
+    <ClInclude Include="..\JavaUtil.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" />
+    <ClInclude Include="..\Grammar.h" />
+    <ClInclude Include="..\GrammarUtil.h" />
+    <ClInclude Include="..\MD5.h" />
+    <ClInclude Include="..\MD5I.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets" />
+</Project>
\ No newline at end of file
diff --git a/cpp/src/Slice/msbuild/slice.vcxproj.filters b/cpp/src/Slice/msbuild/slice.vcxproj.filters
new file mode 100644
index 00000000000..09e0f16cb50
--- /dev/null
+++ b/cpp/src/Slice/msbuild/slice.vcxproj.filters
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{86EEC4C6-451D-4E42-AC48-87773B310643}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{8A6EAD0B-649C-4B94-9B49-C2D08D61A8A5}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{F4629E6B-3ADA-4290-96D5-68BA0E7D068D}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Checksum.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CPlusPlusUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\FileTracker.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Grammar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\JavaUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\MD5.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\MD5I.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\PHPUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Preprocessor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Python.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\PythonUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Ruby.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\RubyUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Scanner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\SliceUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Grammar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GrammarUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\MD5.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\MD5I.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Checksum.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CPlusPlusUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\FileTracker.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\JavaUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Parser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Preprocessor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\RubyUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\PHPUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\PythonUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/IceGrid/DBTypes.ice b/cpp/src/icegriddb/DBTypes.ice
index 6729a6bf434..6729a6bf434 100644
--- a/cpp/src/IceGrid/DBTypes.ice
+++ b/cpp/src/icegriddb/DBTypes.ice
diff --git a/cpp/src/icegriddb/IceGridDB.cpp b/cpp/src/icegriddb/IceGridDB.cpp
new file mode 100644
index 00000000000..55fc370fa8f
--- /dev/null
+++ b/cpp/src/icegriddb/IceGridDB.cpp
@@ -0,0 +1,556 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceUtil/Options.h>
+#include <Ice/Application.h>
+#include <IceDB/IceDB.h>
+#include <IceGrid/Admin.h>
+#include <IceGrid/DBTypes.h>
+#include <IceUtil/DisableWarnings.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceGrid;
+
+namespace
+{
+
+bool skipReplicaGroupFilter = false;
+
+class ServerDescriptorI : public IceGrid::ServerDescriptor
+{
+public:
+
+    ServerDescriptorI(const string& serverVersion) :
+        _serverVersion(serverVersion)
+    {
+    }
+
+protected:
+
+    virtual void ice_postUnmarshal()
+    {
+        iceVersion = _serverVersion;
+    }
+
+private:
+
+    string _serverVersion;
+};
+
+class IceBoxDescriptorI : public IceGrid::IceBoxDescriptor
+{
+public:
+
+    IceBoxDescriptorI(const string& serverVersion) :
+        _serverVersion(serverVersion)
+    {
+    }
+
+protected:
+
+    virtual void ice_postUnmarshal()
+    {
+        iceVersion = _serverVersion;
+    }
+
+private:
+
+    string _serverVersion;
+};
+
+class ValueFactoryI : public Ice::ValueFactory
+{
+public:
+
+    ValueFactoryI(const string& serverVersion) :
+        _serverVersion(serverVersion)
+    {
+    }
+
+    virtual ObjectPtr create(const string& type)
+    {
+        if(type == "::IceGrid::ServerDescriptor")
+        {
+            return new ServerDescriptorI(_serverVersion);
+        }
+        else if(type == "::IceGrid::IceBoxDescriptor")
+        {
+            return new IceBoxDescriptorI(_serverVersion);
+        }
+        return 0;
+    }
+
+private:
+
+    string _serverVersion;
+};
+
+}
+
+
+//
+// This custom version of the StreamReader allows us to customize the
+// reading of ReplicaGroupDescriptor
+//
+namespace Ice
+{
+
+template<>
+struct StreamReader<IceGrid::ReplicaGroupDescriptor, Ice::InputStream>
+{
+    static void read(Ice::InputStream* is, IceGrid::ReplicaGroupDescriptor& v)
+    {
+        // cerr << "Custom read" << endl;
+        is->read(v.id);
+        is->read(v.loadBalancing);
+        is->read(v.proxyOptions);
+        is->read(v.objects);
+        is->read(v.description);
+        if(!skipReplicaGroupFilter)
+        {
+            is->read(v.filter);
+        }
+    }
+};
+}
+
+
+class Client : public Application
+{
+public:
+
+    void usage();
+    virtual int run(int, char*[]);
+};
+
+#ifdef _WIN32
+
+int
+wmain(int argc, wchar_t* argv[])
+
+#else
+
+int
+main(int argc, char* argv[])
+
+#endif
+{
+    Client app;
+    return app.main(argc, argv);
+}
+
+void
+Client::usage()
+{
+    cerr << "Usage: " << appName() << " <options>\n";
+    cerr <<
+        "Options:\n"
+        "-h, --help             Show this message.\n"
+        "-v, --version          Display version.\n"
+        "--import FILE          Import database from FILE.\n"
+        "--export FILE          Export database to FILE.\n"
+        "--dbhome DIR           Source or target database environment.\n"
+        "--dbpath DIR           Source or target database environment.\n"
+        "--mapsize VALUE        Set LMDB map size in MB (optional, import only).\n"
+        "--server-version VER   Set Ice version for IceGrid servers (optional, import only).\n"
+        "-d, --debug            Print debug messages.\n"
+        ;
+}
+
+int
+Client::run(int argc, char* argv[])
+{
+    IceUtilInternal::Options opts;
+    opts.addOpt("h", "help");
+    opts.addOpt("v", "version");
+    opts.addOpt("d", "debug");
+    opts.addOpt("", "import", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "export", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "dbhome", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "dbpath", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "mapsize", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "server-version", IceUtilInternal::Options::NeedArg);
+
+    vector<string> args;
+    try
+    {
+        args = opts.parse(argc, const_cast<const char**>(argv));
+    }
+    catch(const IceUtilInternal::BadOptException& e)
+    {
+        cerr << argv[0] << ": " << e.reason << endl;
+        usage();
+        return EXIT_FAILURE;
+    }
+    if(!args.empty())
+    {
+        cerr << argv[0] << ": too many arguments" << endl;
+        usage();
+        return EXIT_FAILURE;
+    }
+
+    if(opts.isSet("help"))
+    {
+        usage();
+        return EXIT_SUCCESS;
+    }
+
+    if(opts.isSet("version"))
+    {
+        cout << ICE_STRING_VERSION << endl;
+        return EXIT_SUCCESS;
+    }
+
+    if(!(opts.isSet("import") ^ opts.isSet("export")))
+    {
+        cerr << argv[0] << ": either --import or --export must be set" << endl;
+        usage();
+        return EXIT_FAILURE;
+    }
+
+    if(!(opts.isSet("dbhome") ^ opts.isSet("dbpath")))
+    {
+        cerr << argv[0] << ": set the database environment directory with either --dbhome or --dbpath" << endl;
+        usage();
+        return EXIT_FAILURE;
+    }
+
+    bool debug = opts.isSet("debug");
+    bool import = opts.isSet("import");
+    string dbFile = opts.optArg(import ? "import" : "export");
+    string dbPath;
+    if(opts.isSet("dbhome"))
+    {
+        dbPath = opts.optArg("dbhome");
+    }
+    else
+    {
+        dbPath = opts.optArg("dbpath");
+    }
+
+    string mapSizeStr = opts.optArg("mapsize");
+    size_t mapSize = IceDB::getMapSize(atoi(mapSizeStr.c_str()));
+    string serverVersion = opts.optArg("server-version");
+
+    try
+    {
+        IceGrid::AllData data;
+
+        IceDB::IceContext dbContext;
+        dbContext.communicator = communicator();
+        dbContext.encoding.major = 1;
+        dbContext.encoding.minor = 1;
+
+        if(import)
+        {
+            cout << "Importing database to directory `" << dbPath << "' from file `" << dbFile << "'" << endl;
+
+            if(!IceUtilInternal::directoryExists(dbPath))
+            {
+                cerr << argv[0] << ": output directory does not exist: " << dbPath << endl;
+                return EXIT_FAILURE;
+            }
+
+            if(!IceUtilInternal::isEmptyDirectory(dbPath))
+            {
+                cerr << argv[0] << ": output directory is not empty: " << dbPath << endl;
+                return EXIT_FAILURE;
+            }
+
+            ifstream fs(dbFile.c_str(), ios::binary);
+            if(fs.fail())
+            {
+                cerr << argv[0] << ": could not open input file: " << strerror(errno) << endl;
+                return EXIT_FAILURE;
+            }
+            fs.unsetf(ios::skipws);
+
+            fs.seekg(0, ios::end);
+            streampos fileSize = fs.tellg();
+
+            if(!fileSize)
+            {
+                fs.close();
+                cerr << argv[0] << ": empty input file" << endl;
+                return EXIT_FAILURE;
+            }
+
+            fs.seekg(0, ios::beg);
+
+            vector<Ice::Byte> buf;
+            buf.reserve(static_cast<size_t>(fileSize));
+            buf.insert(buf.begin(), istream_iterator<Ice::Byte>(fs), istream_iterator<Ice::Byte>());
+
+            fs.close();
+
+            if(!serverVersion.empty())
+            {
+                ValueFactoryPtr factory = new ValueFactoryI(serverVersion);
+                communicator()->getValueFactoryManager()->add(factory, "::IceGrid::ServerDescriptor");
+                communicator()->getValueFactoryManager()->add(factory, "::IceGrid::IceBoxDescriptor");
+            }
+
+            Ice::InputStream stream(communicator(), dbContext.encoding, buf);
+
+            string type;
+            int version;
+
+            stream.read(type);
+            if(type != "IceGrid")
+            {
+                cerr << argv[0] << ": incorrect input file type: " << type << endl;
+                return EXIT_FAILURE;
+            }
+            stream.read(version);
+            if(version / 100 == 305)
+            {
+                if(debug)
+                {
+                    cout << "Reading Ice 3.5.x data" << endl;
+                }
+                skipReplicaGroupFilter = true;
+            }
+            stream.read(data);
+
+            {
+                IceDB::Env env(dbPath, 5, mapSize);
+                IceDB::ReadWriteTxn txn(env);
+
+                if(debug)
+                {
+                    cout << "Writing Applications Map:" << endl;
+                }
+
+                IceDB::Dbi<string, ApplicationInfo, IceDB::IceContext, Ice::OutputStream>
+                    apps(txn, "applications", dbContext, MDB_CREATE);
+
+                for(ApplicationInfoSeq::const_iterator p = data.applications.begin(); p != data.applications.end(); ++p)
+                {
+                    if(debug)
+                    {
+                        cout << "  NAME = " << p->descriptor.name << endl;
+                    }
+                    apps.put(txn, p->descriptor.name, *p);
+                }
+
+                if(debug)
+                {
+                    cout << "Writing Adapters Map:" << endl;
+                }
+
+                IceDB::Dbi<string, AdapterInfo, IceDB::IceContext, Ice::OutputStream>
+                    adpts(txn, "adapters", dbContext, MDB_CREATE);
+
+                for(AdapterInfoSeq::const_iterator p = data.adapters.begin(); p != data.adapters.end(); ++p)
+                {
+                    if(debug)
+                    {
+                        cout << "  NAME = " << p->id << endl;
+                    }
+                    adpts.put(txn, p->id, *p);
+                }
+
+                if(debug)
+                {
+                    cout << "Writing Objects Map:" << endl;
+                }
+
+                IceDB::Dbi<Identity, ObjectInfo, IceDB::IceContext, Ice::OutputStream>
+                    objs(txn, "objects", dbContext, MDB_CREATE);
+
+                for(ObjectInfoSeq::const_iterator p = data.objects.begin(); p != data.objects.end(); ++p)
+                {
+                    if(debug)
+                    {
+                        cout << "  NAME = " << communicator()->identityToString(p->proxy->ice_getIdentity()) << endl;
+                    }
+                    objs.put(txn, p->proxy->ice_getIdentity(), *p);
+                }
+
+                if(debug)
+                {
+                    cout << "Writing Internal Objects Map:" << endl;
+                }
+
+                IceDB::Dbi<Identity, ObjectInfo, IceDB::IceContext, Ice::OutputStream>
+                    internalObjs(txn, "internal-objects", dbContext, MDB_CREATE);
+
+                for(ObjectInfoSeq::const_iterator p = data.internalObjects.begin(); p != data.internalObjects.end();
+                    ++p)
+                {
+                    if(debug)
+                    {
+                        cout << "  NAME = " << communicator()->identityToString(p->proxy->ice_getIdentity()) << endl;
+                    }
+                    internalObjs.put(txn, p->proxy->ice_getIdentity(), *p);
+                }
+
+                if(debug)
+                {
+                    cout << "Writing Serials Map:" << endl;
+                }
+
+                IceDB::Dbi<string, Long, IceDB::IceContext, Ice::OutputStream>
+                    srls(txn, "serials", dbContext, MDB_CREATE);
+
+                for(StringLongDict::const_iterator p = data.serials.begin(); p != data.serials.end(); ++p)
+                {
+                    if(debug)
+                    {
+                        cout << "  NAME = " << p->first << endl;
+                    }
+                    srls.put(txn, p->first, p->second);
+                }
+
+                txn.commit();
+                env.close();
+            }
+        }
+        else
+        {
+            cout << "Exporting database from directory `" << dbPath << "' to file `" << dbFile << "'" << endl;
+
+            {
+                IceDB::Env env(dbPath, 5);
+                IceDB::ReadOnlyTxn txn(env);
+
+                if(debug)
+                {
+                    cout << "Reading Application Map:" << endl;
+                }
+
+                IceDB::Dbi<string, IceGrid::ApplicationInfo, IceDB::IceContext, Ice::OutputStream>
+                    applications(txn, "applications", dbContext, 0);
+
+                string name;
+                ApplicationInfo application;
+                IceDB::ReadOnlyCursor<string, IceGrid::ApplicationInfo, IceDB::IceContext, Ice::OutputStream>
+                    appCursor(applications, txn);
+                while(appCursor.get(name, application, MDB_NEXT))
+                {
+                    if(debug)
+                    {
+                        cout << "  APPLICATION = " << name << endl;
+                    }
+                    data.applications.push_back(application);
+                }
+                appCursor.close();
+
+                if(debug)
+                {
+                    cout << "Reading Adapter Map:" << endl;
+                }
+
+                IceDB::Dbi<string, IceGrid::AdapterInfo, IceDB::IceContext, Ice::OutputStream>
+                    adapters(txn, "adapters", dbContext, 0);
+
+                AdapterInfo adapter;
+                IceDB::ReadOnlyCursor<string, IceGrid::AdapterInfo, IceDB::IceContext, Ice::OutputStream>
+                    adapterCursor(adapters, txn);
+                while(adapterCursor.get(name, adapter, MDB_NEXT))
+                {
+                    if(debug)
+                    {
+                        cout << "  ADAPTER = " << name << endl;
+                    }
+                    data.adapters.push_back(adapter);
+                }
+                adapterCursor.close();
+
+                if(debug)
+                {
+                    cout << "Reading Object Map:" << endl;
+                }
+
+                IceDB::Dbi<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream>
+                    objects(txn, "objects", dbContext, 0);
+
+                Identity id;
+                ObjectInfo object;
+                IceDB::ReadOnlyCursor<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream>
+                    objCursor(objects, txn);
+                while(objCursor.get(id, object, MDB_NEXT))
+                {
+                    if(debug)
+                    {
+                        cout << "  IDENTITY = " << communicator()->identityToString(id) << endl;
+                    }
+                    data.objects.push_back(object);
+                }
+                objCursor.close();
+
+                if(debug)
+                {
+                    cout << "Reading Internal Object Map:" << endl;
+                }
+
+                IceDB::Dbi<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream>
+                    internalObjects(txn, "internal-objects", dbContext, 0);
+
+                IceDB::ReadOnlyCursor<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream>
+                    iobjCursor(internalObjects, txn);
+                while(iobjCursor.get(id, object, MDB_NEXT))
+                {
+                    if(debug)
+                    {
+                        cout << "  IDENTITY = " << communicator()->identityToString(id) << endl;
+                    }
+                    data.internalObjects.push_back(object);
+                }
+                iobjCursor.close();
+
+                if(debug)
+                {
+                    cout << "Reading Serials Map:" << endl;
+                }
+
+                IceDB::Dbi<string, Long, IceDB::IceContext, Ice::OutputStream>
+                    serials(txn, "serials", dbContext, 0);
+
+                Long serial;
+                IceDB::ReadOnlyCursor<string, Long, IceDB::IceContext, Ice::OutputStream>
+                    serialCursor(serials, txn);
+                while(serialCursor.get(name, serial, MDB_NEXT))
+                {
+                    if(debug)
+                    {
+                        cout << "  NAME = " << name << endl;
+                    }
+                    data.serials.insert(std::make_pair(name, serial));
+                }
+                serialCursor.close();
+
+                txn.rollback();
+                env.close();
+            }
+
+            Ice::OutputStream stream(communicator(), dbContext.encoding);
+            stream.write("IceGrid");
+            stream.write(ICE_INT_VERSION);
+            stream.write(data);
+
+            ofstream fs(dbFile.c_str(), ios::binary);
+            if(fs.fail())
+            {
+                cerr << argv[0] << ": could not open output file: " << strerror(errno) << endl;
+                return EXIT_FAILURE;
+            }
+            fs.write(reinterpret_cast<const char*>(stream.b.begin()), stream.b.size());
+            fs.close();
+        }
+    }
+    catch(const IceUtil::Exception& ex)
+    {
+        cerr << argv[0] << ": " << (import ? "import" : "export") << " failed:\n" << ex << endl;
+        return EXIT_FAILURE;
+    }
+
+    return EXIT_SUCCESS;
+}
diff --git a/cpp/src/IceGrid/IceGridDB.rc b/cpp/src/icegriddb/IceGridDB.rc
index 151020205e0..6dc1d0ee657 100644
--- a/cpp/src/IceGrid/IceGridDB.rc
+++ b/cpp/src/icegriddb/IceGridDB.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGridDB\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "icegriddb\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "icegriddb.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/icegriddb/Makefile.mk b/cpp/src/icegriddb/Makefile.mk
new file mode 100644
index 00000000000..e021aeda53f
--- /dev/null
+++ b/cpp/src/icegriddb/Makefile.mk
@@ -0,0 +1,24 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_programs             :=  icegriddb
+$(project)_generated_includedir := $(project)/generated/IceGrid
+$(project)_sliceflags           := -Isrc --include-dir IceGrid
+
+$(project)/IceGridDB.cpp: $(includedir)/generated/IceGrid/Admin.h
+$(project)/generated/DBTypes.cpp: $(includedir)/generated/IceGrid/Admin.h
+
+icegriddb_targetdir       := $(bindir)
+icegriddb_dependencies    := Ice IceDB Glacier2
+icegriddb_libs            := lmdb
+icegriddb_sources         := $(addprefix $(slicedir)/IceGrid/,Descriptor.ice Exception.ice) \
+                             $(addprefix $(currentdir)/,IceGridDB.cpp DBTypes.ice)
+
+
+projects += $(project)
diff --git a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj
new file mode 100644
index 00000000000..2ab0f884902
--- /dev/null
+++ b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{369524F4-D374-44F4-BCFD-408934595701}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+    <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_BUILDING_SRC;ICE_BUILDING_ICE_GRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_BUILDING_SRC;ICE_BUILDING_ICE_GRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_BUILDING_SRC;ICE_BUILDING_ICE_GRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_BUILDING_SRC;ICE_BUILDING_ICE_GRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <PropertyGroup Label="IceBuilder">
+    <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories>
+    <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir>
+    <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude>
+    <IceBuilderAdditionalOptions>
+    </IceBuilderAdditionalOptions>
+  </PropertyGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\IceGridDB.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\slice\IceGrid\Descriptor.ice" />
+    <IceBuilder Include="..\..\..\..\slice\IceGrid\Exception.ice" />
+    <IceBuilder Include="..\DBTypes.ice" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\IceGridDB.cpp" />
+    <ClCompile Include="Win32\Debug\DBTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\DBTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\DBTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\DBTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Descriptor.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Exception.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Win32\Debug\IceGrid\DBTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\DBTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\DBTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\DBTypes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\Descriptor.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\Exception.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" />
+    <Import Project="..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj.filters b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj.filters
new file mode 100644
index 00000000000..20bf3556d94
--- /dev/null
+++ b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj.filters
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{e3d25d41-3e52-4964-8e84-4ce37cb83981}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{c743dc6e-8e2f-4067-870a-6d1e4930c630}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Slice Files">
+      <UniqueIdentifier>{96ddd6f9-a71a-461e-9753-7391b51ad784}</UniqueIdentifier>
+      <Extensions>ice</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{af3a05d4-5202-43a9-8749-6bbb3c22dd39}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Win32">
+      <UniqueIdentifier>{72f48222-0cd5-4420-a6bd-a67707e45d57}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Debug">
+      <UniqueIdentifier>{72f5e49c-a604-4e12-9d72-d376e56be990}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32">
+      <UniqueIdentifier>{f1e7fbaa-97f9-45f1-88b9-15db2db381d2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Debug">
+      <UniqueIdentifier>{89e3a2c9-f4a9-472f-9e9f-7c271ec83e16}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64">
+      <UniqueIdentifier>{386cabcd-9670-4513-85cd-f2682220cd45}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Debug">
+      <UniqueIdentifier>{ffafaf39-d3d9-4c8b-b473-fd3258856c39}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64">
+      <UniqueIdentifier>{fba428ae-251c-4bbd-ad0d-1f407ca3122e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Debug">
+      <UniqueIdentifier>{711c84fb-a785-4eb8-8ac6-1c7cb6684321}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Win32\Release">
+      <UniqueIdentifier>{497591bb-e562-4041-aa4c-54fc8ce00904}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Win32\Release">
+      <UniqueIdentifier>{29000537-409b-47a5-bdc9-5dc7379b7bdf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\x64\Release">
+      <UniqueIdentifier>{e67b0a51-472c-4c23-b4e2-ca8457eee30f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\x64\Release">
+      <UniqueIdentifier>{4be136e0-8460-4786-ac93-aad5796cab91}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceGridDB.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <IceBuilder Include="..\..\..\..\slice\IceGrid\Descriptor.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\..\..\..\slice\IceGrid\Exception.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+    <IceBuilder Include="..\DBTypes.ice">
+      <Filter>Slice Files</Filter>
+    </IceBuilder>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\IceGridDB.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Descriptor.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Descriptor.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Descriptor.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Descriptor.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\Exception.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\Exception.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\Exception.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\Exception.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Debug\DBTypes.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\DBTypes.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\DBTypes.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\DBTypes.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Win32\Debug\IceGrid\Descriptor.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\Descriptor.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\Descriptor.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\Descriptor.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceGrid\Exception.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\Exception.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\Exception.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\Exception.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Debug\IceGrid\DBTypes.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Debug\IceGrid\DBTypes.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Win32\Release\IceGrid\DBTypes.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="x64\Release\IceGrid\DBTypes.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/icegriddb/msbuild/packages.config b/cpp/src/icegriddb/msbuild/packages.config
new file mode 100644
index 00000000000..156dcc9c14e
--- /dev/null
+++ b/cpp/src/icegriddb/msbuild/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="lmdb.v120" version="0.9.18.0" targetFramework="native" />
+  <package id="lmdb.v140" version="0.9.18.0" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/cpp/src/iceserviceinstall/.depend.mak b/cpp/src/iceserviceinstall/.depend.mak
deleted file mode 100755
index 13cdc98eb9c..00000000000
--- a/cpp/src/iceserviceinstall/.depend.mak
+++ /dev/null
@@ -1,263 +0,0 @@
-
-ServiceInstaller.obj: \
-	ServiceInstaller.cpp \
-    "ServiceInstaller.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
-
-Install.obj: \
-	Install.cpp \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\CommunicatorF.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\Plugin.h" \
-    "$(includedir)\Ice\LoggerF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Proxy.h" \
-    "$(includedir)\Ice\ProxyFactoryF.h" \
-    "$(includedir)\Ice\ConnectionIF.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
-    "$(includedir)\Ice\EndpointF.h" \
-    "$(includedir)\Ice\EndpointTypes.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ReferenceF.h" \
-    "$(includedir)\Ice\BatchRequestQueueF.h" \
-    "$(includedir)\Ice\AsyncResult.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\AsyncResultF.h" \
-    "$(includedir)\Ice\ObserverHelper.h" \
-    "$(includedir)\Ice\Instrumentation.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\BatchRequestInterceptor.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\GCObject.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Ice\Incoming.h" \
-    "$(includedir)\Ice\ServantLocatorF.h" \
-    "$(includedir)\Ice\ServantManagerF.h" \
-    "$(includedir)\Ice\ResponseHandlerF.h" \
-    "$(includedir)\Ice\IncomingAsync.h" \
-    "$(includedir)\Ice\Properties.h" \
-    "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\LoggerUtil.h" \
-    "$(includedir)\Ice\RemoteLogger.h" \
-    "$(includedir)\Ice\FactoryTableInit.h" \
-    "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\Communicator.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "$(includedir)\Ice\LocatorF.h" \
-    "$(includedir)\Ice\PluginF.h" \
-    "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\CommunicatorAsync.h" \
-    "$(includedir)\Ice\ObjectAdapter.h" \
-    "$(includedir)\Ice\Endpoint.h" \
-    "$(includedir)\Ice\ServantLocator.h" \
-    "$(includedir)\Ice\SlicedData.h" \
-    "$(includedir)\Ice\OutgoingAsync.h" \
-    "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
-    "$(includedir)\Ice\Application.h" \
-    "$(includedir)\Ice\Connection.h" \
-    "$(includedir)\Ice\ConnectionAsync.h" \
-    "$(includedir)\Ice\Functional.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\Ice\Stream.h" \
-    "$(includedir)\Ice\ImplicitContext.h" \
-    "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\SliceChecksums.h" \
-    "$(includedir)\Ice\SliceChecksumDict.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\Ice\RegisterPlugins.h" \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "ServiceInstaller.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\UUID.h" \
diff --git a/cpp/src/iceserviceinstall/IceServiceInstall.rc b/cpp/src/iceserviceinstall/IceServiceInstall.rc
index d31407c2274..a5046e09b39 100644
--- a/cpp/src/iceserviceinstall/IceServiceInstall.rc
+++ b/cpp/src/iceserviceinstall/IceServiceInstall.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Install Ice Services as Windows Services\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "iceserviceinstall\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "iceserviceinstall.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/iceserviceinstall/Makefile.mak b/cpp/src/iceserviceinstall/Makefile.mak
deleted file mode 100755
index 54462ff919d..00000000000
--- a/cpp/src/iceserviceinstall/Makefile.mak
+++ /dev/null
@@ -1,51 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-TOOL		= $(top_srcdir)\bin\iceserviceinstall.exe
-
-TARGETS         = $(TOOL)
-
-OBJS            = .\ServiceInstaller.obj \
-                  .\Install.obj
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-LINKWITH	= /MANIFEST /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" \
-                  authz.lib advapi32.lib $(LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS       = /pdb:$(TOOL:.exe=.pdb)
-!endif
-
-RES_FILE        = IceServiceInstall.res
-
-$(TOOL): $(OBJS) IceServiceInstall.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest $(EXTRA_MANIFEST) -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	del /q $(TOOL:.exe=.*)
-	del /q IceServiceInstall.res
-
-install:: all
-	copy $(TOOL) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(TOOL:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.cpp b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
index 8d470d422e9..ee44f425cf3 100644
--- a/cpp/src/iceserviceinstall/ServiceInstaller.cpp
+++ b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
@@ -150,14 +150,14 @@ IceServiceInstaller::install(const PropertiesPtr& properties)
             throw "The IceGrid registry service can't depend on itself";
         }
 
-        string registryDataDir = fixDirSeparator(_serviceProperties->getProperty("IceGrid.Registry.Data"));
+        string registryDataDir = fixDirSeparator(_serviceProperties->getProperty("IceGrid.Registry.LMDB.Path"));
         if(registryDataDir == "")
         {
-            throw "IceGrid.Registry.Data must be set in " + _configFile;
+            throw "IceGrid.Registry.LMDB.Path must be set in " + _configFile;
         }
         if(!IceUtilInternal::isAbsolutePath(registryDataDir))
         {
-            throw "'" + registryDataDir + "' is a relative path; IceGrid.Registry.Data must be an absolute path";
+            throw "'" + registryDataDir + "' is a relative path; IceGrid.Registry.LMDB.Path must be an absolute path";
         }
 
         if(!mkdir(registryDataDir))
@@ -205,7 +205,7 @@ IceServiceInstaller::install(const PropertiesPtr& properties)
     {
         grantPermissions(_configFile);
     }
-    
+
     string eventLog = properties->getProperty("EventLog");
     if(eventLog == "")
     {
@@ -439,30 +439,31 @@ IceServiceInstaller::initializeSid(const string& name)
 {
     {
         DWORD sidSize = 32;
-        _sidBuffer.reset(new IceUtil::Byte[sidSize]);
+        _sidBuffer.resize(sidSize);
 
         DWORD domainNameSize = 32;
-        IceUtil::ScopedArray<wchar_t> domainName(new wchar_t[domainNameSize]);
+        wstring domainName(domainNameSize, wchar_t());
 
         //
         // We don't support to use a string converter with this tool, so don't need to
         // use string converters in calls to stringToWstring.
         //
         SID_NAME_USE nameUse;
-        while(LookupAccountNameW(0, IceUtil::stringToWstring(name).c_str(), _sidBuffer.get(), &sidSize, domainName.get(),
-              &domainNameSize, &nameUse) == false)
+        while(LookupAccountNameW(0, IceUtil::stringToWstring(name).c_str(),
+                                 _sidBuffer.data(), &sidSize,
+                                 const_cast<wchar_t*>(domainName.data()), &domainNameSize, &nameUse) == false)
         {
             DWORD res = GetLastError();
 
             if(res == ERROR_INSUFFICIENT_BUFFER)
             {
-                _sidBuffer.reset(new IceUtil::Byte[sidSize]);
-                domainName.reset(new wchar_t[domainNameSize]);
+                _sidBuffer.resize(sidSize);
+                domainName.resize(domainNameSize);
                 continue;
             }
             throw "Could not retrieve Security ID for " + name + ": " + IceUtilInternal::errorToString(res);
         }
-        _sid = reinterpret_cast<SID*>(_sidBuffer.get());
+        _sid = reinterpret_cast<SID*>(_sidBuffer.data());
     }
 
     //
@@ -576,18 +577,18 @@ IceServiceInstaller::grantPermissions(const string& path, SE_OBJECT_TYPE type, b
         }
 
         LUID unusedId = { 0 };
-        
+
         if(!AuthzInitializeContextFromSid(0, _sid, manager, 0, unusedId, 0, &clientContext))
         {
             throw "AuthzInitializeContextFromSid failed: " + IceUtilInternal::lastErrorToString();
         }
 
-        AUTHZ_ACCESS_REQUEST accessRequest = { 0 }; 
+        AUTHZ_ACCESS_REQUEST accessRequest = { 0 };
         accessRequest.DesiredAccess = MAXIMUM_ALLOWED;
         accessRequest.PrincipalSelfSid = 0;
         accessRequest.ObjectTypeList = 0;
         accessRequest.ObjectTypeListLength = 0;
-        accessRequest.OptionalArguments = 0; 
+        accessRequest.OptionalArguments = 0;
 
         ACCESS_MASK accessMask = 0;
         DWORD accessUnused = 0;
@@ -650,7 +651,7 @@ IceServiceInstaller::grantPermissions(const string& path, SE_OBJECT_TYPE type, b
             {
                 ea.grfInheritance = NO_INHERITANCE;
             }
-            
+
             TRUSTEE_W trustee;
             BuildTrusteeWithSidW(&trustee, _sid);
             ea.Trustee = trustee;
@@ -663,7 +664,7 @@ IceServiceInstaller::grantPermissions(const string& path, SE_OBJECT_TYPE type, b
             {
                 throw "Could not modify ACL for " + path + ": " + IceUtilInternal::errorToString(res);
             }
-            
+
             res = SetNamedSecurityInfoW(const_cast<wchar_t*>(IceUtil::stringToWstring(path).c_str()), type,
                                         DACL_SECURITY_INFORMATION, 0, 0, newAcl, 0);
             if(res != ERROR_SUCCESS)
@@ -856,7 +857,7 @@ IceServiceInstaller::removeSource(const string& source) const
             // use string converters in calls to stringToWstring.
             //
             LONG delRes = RegDeleteKeyW(HKEY_LOCAL_MACHINE,
-                                        IceUtil::stringToWstring(createSource(source, 
+                                        IceUtil::stringToWstring(createSource(source,
                                             IceUtil::wstringToString(subkey))).c_str());
             if(delRes == ERROR_SUCCESS)
             {
@@ -935,18 +936,19 @@ IceServiceInstaller::getIceDLLPath(const string& imagePath) const
     //
     int majorVersion = (ICE_INT_VERSION / 10000);
     int minorVersion = (ICE_INT_VERSION / 100) - majorVersion * 100;
+    int patchVersion = ICE_INT_VERSION % 100;
+
     ostringstream os;
     os << majorVersion * 10 + minorVersion;
-
-    int patchVersion = ICE_INT_VERSION % 100;
-    if(patchVersion > 50)
+    if(patchVersion >= 60)
     {
-        os << 'b';
-        if(patchVersion >= 52)
-        {
-            os << (patchVersion - 50);
-        }
+        os << 'b' << (patchVersion - 60);
     }
+    else if(patchVersion >= 50)
+    {
+        os << 'a' << (patchVersion - 50);
+    }
+
     string version = os.str();
 
     string result = imagePathDir + '\\' + "ice" + version + ".dll";
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.h b/cpp/src/iceserviceinstall/ServiceInstaller.h
index b9a2119538a..d1874b9624f 100644
--- a/cpp/src/iceserviceinstall/ServiceInstaller.h
+++ b/cpp/src/iceserviceinstall/ServiceInstaller.h
@@ -17,7 +17,7 @@
 class IceServiceInstaller
 {
 public:
-    
+
     static const int icegridregistry = 0;
     static const int icegridnode = 1;
     static const int glacier2router = 2;
@@ -66,7 +66,7 @@ private:
     std::string _glacier2InstanceName;
 
     SID* _sid;
-    IceUtil::ScopedArray<IceUtil::Byte> _sidBuffer;
+    std::vector<IceUtil::Byte> _sidBuffer;
 
     std::string _sidName;
 
diff --git a/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj b/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj
new file mode 100644
index 00000000000..edf45e07bc0
--- /dev/null
+++ b/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0E22B627-F1A6-4771-89DE-9E45FD51F124}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Link>
+      <AdditionalDependencies>authz.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Link>
+      <AdditionalDependencies>authz.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Link>
+      <AdditionalDependencies>authz.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link>
+      <AdditionalDependencies>authz.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Install.cpp" />
+    <ClCompile Include="..\ServiceInstaller.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\ServiceInstaller.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\IceServiceInstall.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj.filters b/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj.filters
new file mode 100644
index 00000000000..f884ccdd28c
--- /dev/null
+++ b/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj.filters
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{1b120631-b32a-4d05-9b40-370c74824fe8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{1ed46f53-6f73-47f5-afe9-661197801735}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{d498706d-1ed6-48c1-9e7e-4efa035f3b62}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Install.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ServiceInstaller.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\ServiceInstaller.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\IceServiceInstall.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
diff --git a/cpp/src/slice2confluence/.gitignore b/cpp/src/slice2confluence/.gitignore
deleted file mode 100644
index 3a412ca89c7..00000000000
--- a/cpp/src/slice2confluence/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp
index 32786fed6fe..a1176f7cc37 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.cpp
+++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp
@@ -51,7 +51,7 @@ Confluence::ConfluenceOutput::ConfluenceOutput(const char* s) :
 }
 
 void
-Confluence::ConfluenceOutput::print(const char* s)
+Confluence::ConfluenceOutput::print(const string& s)
 {
     if(_se)
     {
@@ -62,7 +62,7 @@ Confluence::ConfluenceOutput::print(const char* s)
     if(_escape)
     {
         string escaped = escape(s);
-        OutputBase::print(escaped.c_str());
+        OutputBase::print(escaped);
     }
     else
     {
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.h b/cpp/src/slice2confluence/ConfluenceOutput.h
index 90d02809368..a97577c39c5 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.h
+++ b/cpp/src/slice2confluence/ConfluenceOutput.h
@@ -15,59 +15,59 @@ namespace Confluence
 class ConfluenceOutput : public IceUtilInternal::OutputBase
 {
 public:
-    
+
     ConfluenceOutput();
     ConfluenceOutput(std::ostream&);
     ConfluenceOutput(const char*);
-    
+
     virtual ~ConfluenceOutput(){};
-    
-    virtual void print(const char*); // Print a string.
-    
+
+    virtual void print(const std::string&); // Print a string.
+
     virtual void newline(); // Print newline.
-    
+
     void startElement(const std::string&); // Start an element.
     void endElement(); // End an element.
     void attr(const std::string&, const std::string&); // Add an attribute to an element.
-    
+
     std::string convertCommentHTML(std::string comment);
     std::string escapeComment(std::string comment);
-    
+
     std::string getAnchorMarkup(const std::string&, const std::string& = "");
     std::string getLinkMarkup(const std::string&, const std::string& = "", const std::string& = "", const std::string& = "");
     std::string getImageMarkup(const std::string&, const std::string& = "");
     std::string getNavMarkup(const std::string&, const std::string&);
-    
+
     void startEscapes();
     void endEscapes();
-    
+
     std::string currentElement() const;
-    
+
     /**
      * Wrap sections in these markers to prevent them from being confluence-escaped.
      * The regular confluence-escaping process will remove these markers.
      */
     const static std::string TEMP_ESCAPER_START; // wrap sections
     const static std::string TEMP_ESCAPER_END; // wrap sections
-    
+
     /**
      * Gets the start and end positions of all TEMP_ESCAPED sections of the given string.
      */
     std::list<std::pair<unsigned int,unsigned int> > getMarkerLimits(const std::string&);
-    
+
     std::string removeMarkers(std::string);
-    
+
 private:
-    
+
     std::string escape(const ::std::string&) const;
-    
+
     std::stack<std::string> _elementStack;
-    
+
     bool _se;
     bool _text;
-    
+
     bool _escape;
-    
+
     std::string _listMarkers;
     std::string _commentListMarkers;
 };
@@ -114,13 +114,13 @@ operator<<(ConfluenceOutput& o, const EndElement&)
 class StartElement
 {
 public:
-    
+
     StartElement(const std::string&);
-    
+
     const std::string& getName() const;
-    
+
 private:
-    
+
     const std::string _name;
 };
 
@@ -137,14 +137,14 @@ operator<<(ConfluenceOutput& o, const StartElement& e)
 class Attribute
 {
 public:
-    
+
     Attribute(const ::std::string&, const ::std::string&);
-    
+
     const ::std::string& getName() const;
     const ::std::string& getValue() const;
-    
+
 private:
-    
+
     const ::std::string _name;
     const ::std::string _value;
 };
diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp
index 88eda488445..f62bd1f6fb8 100644
--- a/cpp/src/slice2confluence/Gen.cpp
+++ b/cpp/src/slice2confluence/Gen.cpp
@@ -1392,14 +1392,14 @@ Slice::GeneratorBase::getLinkPath(const SyntaxTreeBasePtr& p, const ContainerPtr
     {
         // Intra-package links need package name, unlike with html dir structure
         EnumeratorPtr enumerator = EnumeratorPtr::dynamicCast(p);
-	if(enumerator)
-	{
-	    target = toStringList(enumerator->type());
-	}
-	else
-	{
-	    target = getContainer(p);
-	}
+    if(enumerator)
+    {
+        target = toStringList(enumerator->type());
+    }
+    else
+    {
+        target = getContainer(p);
+    }
         path = "";
         while (!target.empty()) {
             if (!path.empty()) {
diff --git a/cpp/src/slice2confluence/Main.cpp b/cpp/src/slice2confluence/Main.cpp
index 2d7b4d9219d..b812be5cd7a 100644
--- a/cpp/src/slice2confluence/Main.cpp
+++ b/cpp/src/slice2confluence/Main.cpp
@@ -24,7 +24,7 @@ using namespace IceUtil;
 namespace
 {
 
-IceUtil::Mutex* mutex = 0;
+IceUtil::Mutex* globalMutex = 0;
 bool interrupted = false;
 
 class Init
@@ -33,13 +33,13 @@ public:
 
     Init()
     {
-        mutex = new IceUtil::Mutex;
+        globalMutex = new IceUtil::Mutex;
     }
 
     ~Init()
     {
-        delete mutex;
-        mutex = 0;
+        delete globalMutex;
+        globalMutex = 0;
     }
 };
 
@@ -72,7 +72,7 @@ splitCommas(string& str)
 void
 interruptedCallback(int signal)
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex);
 
     interrupted = true;
 }
@@ -310,7 +310,7 @@ compile(int argc, char* argv[])
         }
 
         {
-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex);
 
             if(interrupted)
             {
@@ -352,7 +352,7 @@ compile(int argc, char* argv[])
     p->destroy();
 
     {
-        IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+        IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex);
 
         if(interrupted)
         {
diff --git a/cpp/src/slice2confluence/Makefile b/cpp/src/slice2confluence/Makefile
deleted file mode 100644
index 2bef9175f5d..00000000000
--- a/cpp/src/slice2confluence/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-NAME		= $(bindir)/slice2confluence
-
-TARGETS		= $(NAME)
-
-OBJS		= ConfluenceOutput.o \
-		  Gen.o \
-		  Main.o
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. $(CPPFLAGS)
-
-$(NAME): $(OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK)
-
-install:: all
-	$(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
diff --git a/cpp/src/slice2confluence/Makefile.mak b/cpp/src/slice2confluence/Makefile.mak
deleted file mode 100644
index 4213b5f2bca..00000000000
--- a/cpp/src/slice2confluence/Makefile.mak
+++ /dev/null
@@ -1,51 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2confluence.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= .\ConfluenceOutput.obj \
-		  .\Gen.obj \
-		  .\Main.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-RES_FILE        = Slice2Confluence.res
-
-$(NAME): $(OBJS) Slice2Confluence.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \
-		$(BASELIBS) $(RES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-		$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Confluence.res
-
-install:: all
-	copy $(NAME) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(NAME:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/slice2confluence/Slice2Confluence.rc b/cpp/src/slice2confluence/Slice2Confluence.rc
index 1b4dfed0ab8..d4eeb2b1115 100644
--- a/cpp/src/slice2confluence/Slice2Confluence.rc
+++ b/cpp/src/slice2confluence/Slice2Confluence.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to Confluence Markup Translator\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "slice2confluence\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2confluence.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cpp/.depend.mak b/cpp/src/slice2cpp/.depend.mak
deleted file mode 100755
index 0a91fe2b2af..00000000000
--- a/cpp/src/slice2cpp/.depend.mak
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Gen.obj: \
-	Gen.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "Gen.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\Slice\CPlusPlusUtil.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Slice\Checksum.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-
-Main.obj: \
-	Main.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Slice\Preprocessor.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "Gen.h" \
diff --git a/cpp/src/slice2cpp/.gitignore b/cpp/src/slice2cpp/.gitignore
deleted file mode 100644
index 720f44c7047..00000000000
--- a/cpp/src/slice2cpp/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 6da3a90e809..0220ecce9e3 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -14,7 +14,8 @@
 #include <IceUtil/Functional.h>
 #include <IceUtil/Iterator.h>
 #include <IceUtil/InputUtil.h>
-#include <IceUtil/Unicode.h>
+#include <IceUtil/StringConverter.h>
+#include <IceUtil/StringUtil.h>
 #include <Slice/Checksum.h>
 #include <Slice/FileTracker.h>
 
@@ -31,8 +32,58 @@ using namespace IceUtilInternal;
 namespace
 {
 
+bool
+isConstexprType(const TypePtr& type)
+{
+    BuiltinPtr bp = BuiltinPtr::dynamicCast(type);
+    if(bp)
+    {
+        switch(bp->kind())
+        {
+            case Builtin::KindByte:
+            case Builtin::KindBool:
+            case Builtin::KindShort:
+            case Builtin::KindInt:
+            case Builtin::KindLong:
+            case Builtin::KindFloat:
+            case Builtin::KindDouble:
+            case Builtin::KindValue:
+            case Builtin::KindObject:
+            case Builtin::KindObjectProxy:
+            {
+                return true;
+            }
+            default:
+            {
+                return false;
+            }
+        }
+    }
+    else if(EnumPtr::dynamicCast(type) || ProxyPtr::dynamicCast(type) || ClassDeclPtr::dynamicCast(type))
+    {
+        return true;
+    }
+    else
+    {
+        StructPtr s = StructPtr::dynamicCast(type);
+        if(s)
+        {
+            DataMemberList members = s->dataMembers();
+            for(DataMemberList::const_iterator i = members.begin(); i != members.end(); ++i)
+            {
+                if(!isConstexprType((*i)->type()))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+}
+
 string
-u32CodePoint(unsigned int value)
+u32CodePoint(unsigned int value, bool cpp11)
 {
     ostringstream s;
     //
@@ -40,7 +91,7 @@ u32CodePoint(unsigned int value)
     // With VC++ < 140 characters in the range of 0 to 0x9f cannot be represented
     // with a universal character name (UCN).
     //
-    if(value <= 0x9f)
+    if(!cpp11 && value <= 0x9f)
     {
         switch(value)
         {
@@ -80,28 +131,13 @@ u32CodePoint(unsigned int value)
 }
 
 void
-writeU8Buffer(const vector<unsigned char>& u8buffer, ::IceUtilInternal::Output& out)
+writeU8Buffer(const vector<unsigned char>& u8buffer, ::IceUtilInternal::Output& out, bool cpp11)
 {
-    vector<unsigned int> u32buffer;
-    IceUtilInternal::ConversionResult result = convertUTF8ToUTF32(u8buffer, u32buffer, IceUtil::lenientConversion);
-    switch(result)
-    {
-        case conversionOK:
-            break;
-        case sourceExhausted:
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source exhausted");
-        case sourceIllegal:
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source illegal");
-        default:
-        {
-            assert(0);
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
-        }
-    }
+    vector<unsigned int> u32buffer = toUTF32(u8buffer);
 
     for(vector<unsigned int>::const_iterator c = u32buffer.begin(); c != u32buffer.end(); ++c)
     {
-        out << u32CodePoint(*c);
+        out << u32CodePoint(*c, cpp11);
     }
 }
 
@@ -124,7 +160,7 @@ getDeprecateSymbol(const ContainedPtr& p1, const ContainedPtr& p2)
 
 void
 writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const SyntaxTreeBasePtr& valueType,
-                   const string& value, int useWstring, const StringList& metaData)
+                   const string& value, int useWstring, const StringList& metaData, bool cpp11 = false)
 {
     ConstPtr constant = ConstPtr::dynamicCast(valueType);
     if(constant)
@@ -145,21 +181,21 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
                                                    "0123456789"
                                                    "_{}[]#()<>%:;.?*+-/^&|~!=,\\\"' ";
             static const set<char> charSet(basicSourceChars.begin(), basicSourceChars.end());
-
-            if((useWstring & TypeContextUseWstring) || findMetaData(metaData) == "wstring")
+            bool wide = (useWstring & TypeContextUseWstring) || findMetaData(metaData) == "wstring";
+            if(wide || cpp11)
             {
                 //
-                // Wide strings
+                // Wide strings or C++11 narrow string
                 //
                 vector<unsigned char> u8buffer;                  // Buffer to convert multibyte characters
-                out << "L\"";
+                out << (wide ? "L\"" : "u8\"");
                 for(size_t i = 0; i < value.size();)
                 {
                     if(charSet.find(value[i]) == charSet.end())
                     {
                         if(static_cast<unsigned char>(value[i]) < 128) // Single byte character
                         {
-                            out << u32CodePoint(static_cast<unsigned char>(value[i]));
+                            out << u32CodePoint(static_cast<unsigned char>(value[i]), cpp11);
                         }
                         else
                         {
@@ -173,7 +209,7 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
                         //
                         if(!u8buffer.empty())
                         {
-                            writeU8Buffer(u8buffer, out);
+                            writeU8Buffer(u8buffer, out, cpp11);
                             u8buffer.clear();
                         }
 
@@ -211,7 +247,7 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
                                     assert(codepoint.size() ==  sz);
 
                                     IceUtil::Int64 v = IceUtilInternal::strToInt64(codepoint.c_str(), 0, 16);
-                                    out << u32CodePoint(static_cast<unsigned int>(v));
+                                    out << u32CodePoint(static_cast<unsigned int>(v), cpp11);
 
                                     i = j + 1 + sz;
                                 }
@@ -240,12 +276,12 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
                 //
                 if(!u8buffer.empty())
                 {
-                    writeU8Buffer(u8buffer, out);
+                    writeU8Buffer(u8buffer, out, cpp11);
                     u8buffer.clear();
                 }
                 out << "\"";
             }
-            else // narrow strings
+            else // C++98 narrow strings
             {
                 out << "\"";                                    // Opening "
 
@@ -303,23 +339,7 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
                                     vector<unsigned int> u32buffer;
                                     u32buffer.push_back(static_cast<unsigned int>(v));
 
-                                    vector<unsigned char> u8buffer;
-
-                                    IceUtilInternal::ConversionResult result = convertUTF32ToUTF8(u32buffer, u8buffer, IceUtil::lenientConversion);
-                                    switch(result)
-                                    {
-                                        case conversionOK:
-                                            break;
-                                        case sourceExhausted:
-                                            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source exhausted");
-                                        case sourceIllegal:
-                                            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source illegal");
-                                        default:
-                                        {
-                                            assert(0);
-                                            throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
-                                        }
-                                    }
+                                    vector<unsigned char> u8buffer = fromUTF32(u32buffer);
 
                                     ostringstream s;
                                     for(vector<unsigned char>::const_iterator q = u8buffer.begin(); q != u8buffer.end(); ++q)
@@ -357,7 +377,14 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
         }
         else if(bp && bp->kind() == Builtin::KindLong)
         {
-            out << "ICE_INT64(" << value << ")";
+            if(cpp11)
+            {
+                out << value << "LL";
+            }
+            else
+            {
+                out << "ICE_INT64(" << value << ")";
+            }
         }
         else if(bp && bp->kind() == Builtin::KindFloat)
         {
@@ -373,7 +400,24 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
             EnumPtr ep = EnumPtr::dynamicCast(type);
             if(ep)
             {
-                out << fixKwd(value);
+                bool unscoped = findMetaData(ep->getMetaData(), cpp11 ? TypeContextCpp11 : 0) == "%unscoped";
+                if(!cpp11 || unscoped)
+                {
+                    out << fixKwd(value);
+                }
+                else
+                {
+                    string v = value;
+                    string scope;
+                    size_t pos = value.rfind("::");
+                    if(pos != string::npos)
+                    {
+                        v = value.substr(pos + 2);
+                        scope = value.substr(0, value.size() - v.size());
+                    }
+
+                    out << fixKwd(scope + ep->name() + "::" + v);
+                }
             }
             else
             {
@@ -383,39 +427,34 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
     }
 }
 
-void
-writeMarshalUnmarshalDataMember(IceUtilInternal::Output& C, const DataMemberPtr& p, bool marshal)
-{
-    writeMarshalUnmarshalCode(C, p->type(), p->optional(), p->tag(), fixKwd(p->name()), marshal, p->getMetaData());
-}
-
-void
-writeMarshalUnmarshalDataMemberInHolder(IceUtilInternal::Output& C, const string& holder, const DataMemberPtr& p, bool marshal)
+string
+toDllClassExport(const string& dllExport)
 {
-    writeMarshalUnmarshalCode(C, p->type(), p->optional(), p->tag(), holder + fixKwd(p->name()), marshal, p->getMetaData());
+    if(!dllExport.empty())
+    {
+        return "ICE_CLASS(" + dllExport.substr(0, dllExport.size() - 1) + ") ";
+    }
+    else
+    {
+        return "";
+    }
 }
 
-void
-writeMarshalUnmarshalDataMembers(IceUtilInternal::Output& C,
-                                 const DataMemberList& dataMembers,
-                                 const DataMemberList& optionalDataMembers,
-                                 bool marshal)
+string
+toDllMemberExport(const string& dllExport)
 {
-    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    if(!dllExport.empty())
     {
-        if(!(*q)->optional())
-        {
-            writeMarshalUnmarshalDataMember(C, *q, marshal);
-        }
+        return "ICE_MEMBER(" + dllExport.substr(0, dllExport.size() - 1) + ") ";
     }
-    for(DataMemberList::const_iterator q = optionalDataMembers.begin(); q != optionalDataMembers.end(); ++q)
+    else
     {
-        writeMarshalUnmarshalDataMember(C, *q, marshal);
+        return "";
     }
 }
 
 void
-writeDataMemberInitializers(IceUtilInternal::Output& C, const DataMemberList& members, int useWstring)
+writeDataMemberInitializers(IceUtilInternal::Output& C, const DataMemberList& members, int useWstring, bool cpp11 = false)
 {
     bool first = true;
     for(DataMemberList::const_iterator p = members.begin(); p != members.end(); ++p)
@@ -434,18 +473,105 @@ writeDataMemberInitializers(IceUtilInternal::Output& C, const DataMemberList& me
             }
             C << nl << memberName << '(';
             writeConstantValue(C, (*p)->type(), (*p)->defaultValueType(), (*p)->defaultValue(), useWstring,
-                               (*p)->getMetaData());
+                               (*p)->getMetaData(), cpp11);
             C << ')';
         }
     }
 }
 
+void
+writeInParamsLambda(IceUtilInternal::Output& C, const OperationPtr& p, const ParamDeclList& inParams)
+{
+    if(inParams.empty())
+    {
+        C << "nullptr";
+    }
+    else
+    {
+        C << "[&](::Ice::OutputStream* __os)";
+        C << sb;
+        writeMarshalCode(C, inParams, 0, true, TypeContextInParam | TypeContextCpp11);
+        if(p->sendsClasses(false))
+        {
+            C << nl << "__os->writePendingValues();";
+        }
+        C << eb;
+    }
+}
+
+void
+throwUserExceptionLambda(IceUtilInternal::Output& C, ExceptionList throws)
+{
+    if(throws.empty())
+    {
+        C << "nullptr";
+    }
+    else
+    {
+        throws.sort();
+        throws.unique();
+
+        //
+        // Arrange exceptions into most-derived to least-derived order. If we don't
+        // do this, a base exception handler can appear before a derived exception
+        // handler, causing compiler warnings and resulting in the base exception
+        // being marshaled instead of the derived exception.
+        //
+        throws.sort(Slice::DerivedToBaseCompare());
+
+        C << "[](const ::Ice::UserException& __ex)";
+        C << sb;
+        C << nl << "try";
+        C << sb;
+        C << nl << "__ex.ice_throw();";
+        C << eb;
+        //
+        // Generate a catch block for each legal user exception.
+        //
+        for(ExceptionList::const_iterator i = throws.begin(); i != throws.end(); ++i)
+        {
+            string scoped = (*i)->scoped();
+            C << nl << "catch(const " << fixKwd((*i)->scoped()) << "&)";
+            C << sb;
+            C << nl << "throw;";
+            C << eb;
+        }
+        C << nl << "catch(const ::Ice::UserException&)";
+        C << sb;
+        C << eb;
+        C << eb;
+    }
+}
+
+string
+resultStructName(const string& name, const string& scope = "")
+{
+    string stName = IceUtilInternal::toUpper(name.substr(0, 1)) + name.substr(1) + "Result";
+    if(!scope.empty())
+    {
+        stName = scope + "::" + stName;
+    }
+    return stName;
+}
+
+string
+condMove(bool moveIt, const string& str)
+{
+    return moveIt ? string("::std::move(") + str + ")" : str;
+}
+
+string
+condString(bool ok, const string& str)
+{
+    return ok ? str : "";
+}
+
 }
 
 Slice::Gen::Gen(const string& base, const string& headerExtension, const string& sourceExtension,
                 const vector<string>& extraHeaders, const string& include,
                 const vector<string>& includePaths, const string& dllExport, const string& dir,
-                bool imp, bool checksum, bool stream, bool ice) :
+                bool implCpp98, bool implCpp11, bool checksum, bool ice) :
     _base(base),
     _headerExtension(headerExtension),
     _implHeaderExtension(headerExtension),
@@ -455,9 +581,9 @@ Slice::Gen::Gen(const string& base, const string& headerExtension, const string&
     _includePaths(includePaths),
     _dllExport(dllExport),
     _dir(dir),
-    _impl(imp),
+    _implCpp98(implCpp98),
+    _implCpp11(implCpp11),
     _checksum(checksum),
-    _stream(stream),
     _ice(ice)
 {
     for(vector<string>::iterator p = _includePaths.begin(); p != _includePaths.end(); ++p)
@@ -478,7 +604,7 @@ Slice::Gen::~Gen()
     H << "\n#endif\n";
     C << '\n';
 
-    if(_impl)
+    if(_implCpp98 || _implCpp11)
     {
         implH << "\n\n#endif\n";
         implC << '\n';
@@ -486,6 +612,38 @@ Slice::Gen::~Gen()
 }
 
 void
+Slice::Gen::generateChecksumMap(const UnitPtr& p)
+{
+    if(_checksum)
+    {
+        ChecksumMap map = createChecksums(p);
+        if(!map.empty())
+        {
+            C << sp << nl << "namespace";
+            C << nl << "{";
+            C << sp << nl << "const char* __sliceChecksums[] =";
+            C << sb;
+            for(ChecksumMap::const_iterator q = map.begin(); q != map.end(); ++q)
+            {
+                C << nl << "\"" << q->first << "\", \"";
+                ostringstream str;
+                str.flags(ios_base::hex);
+                str.fill('0');
+                for(vector<unsigned char>::const_iterator r = q->second.begin(); r != q->second.end(); ++r)
+                {
+                    str << static_cast<int>(*r);
+                }
+                C << str.str() << "\",";
+            }
+            C << nl << "0";
+            C << eb << ';';
+            C << nl << "const IceInternal::SliceChecksumInit __sliceChecksumInit(__sliceChecksums);";
+            C << sp << nl << "}";
+        }
+    }
+}
+
+void
 Slice::Gen::generate(const UnitPtr& p)
 {
     string file = p->topLevelFile();
@@ -499,7 +657,7 @@ Slice::Gen::generate(const UnitPtr& p)
         _headerExtension = headerExtension;
     }
 
-    if(_impl)
+    if(_implCpp98 || _implCpp11)
     {
         string fileImplH = _base + "I." + _implHeaderExtension;
         string fileImplC = _base + "I." + _sourceExtension;
@@ -541,7 +699,7 @@ Slice::Gen::generate(const UnitPtr& p)
         }
         FileTracker::instance()->addFile(fileImplC);
 
-        string s = fileImplH;
+        string s = _base + "I." + _implHeaderExtension;
         if(_include.size())
         {
             s = _include + '/' + s;
@@ -584,7 +742,7 @@ Slice::Gen::generate(const UnitPtr& p)
     printGeneratedHeader(C, _base + ".ice");
 
 
-    string s = fileH;
+    string s = _base + "." + _headerExtension;;
     if(_include.size())
     {
         s = _include + '/' + s;
@@ -613,10 +771,10 @@ Slice::Gen::generate(const UnitPtr& p)
     C << _base << "." << _headerExtension << ">";
     C <<  "\n#include <IceUtil/PushDisableWarnings.h>";
 
-
     H << "\n#include <IceUtil/PushDisableWarnings.h>";
     H << "\n#include <Ice/ProxyF.h>";
     H << "\n#include <Ice/ObjectF.h>";
+    H << "\n#include <Ice/ValueF.h>";
     H << "\n#include <Ice/Exception.h>";
     H << "\n#include <Ice/LocalObject.h>";
     H << "\n#include <Ice/StreamHelpers.h>";
@@ -624,30 +782,29 @@ Slice::Gen::generate(const UnitPtr& p)
     if(p->hasNonLocalClassDefs())
     {
         H << "\n#include <Ice/Proxy.h>";
+        H << "\n#include <Ice/Object.h>";
         H << "\n#include <Ice/GCObject.h>";
-        H << "\n#include <Ice/AsyncResult.h>";
+        H << "\n#include <Ice/Value.h>";
         H << "\n#include <Ice/Incoming.h>";
         if(p->hasContentsWithMetaData("amd"))
         {
             H << "\n#include <Ice/IncomingAsync.h>";
         }
         C << "\n#include <Ice/LocalException.h>";
-        C << "\n#include <Ice/ObjectFactory.h>";
+        C << "\n#include <Ice/ValueFactory.h>";
         C << "\n#include <Ice/Outgoing.h>";
         C << "\n#include <Ice/OutgoingAsync.h>";
     }
     else if(p->hasLocalClassDefsWithAsync())
     {
-        H << "\n#include <Ice/Proxy.h>";
-        H << "\n#include <Ice/AsyncResult.h>";
-        C << "\n#include <Ice/OutgoingAsync.h>";
+        H << "\n#include <Ice/OutgoingAsync.h>";
     }
     else if(p->hasNonLocalClassDecls())
     {
         H << "\n#include <Ice/Proxy.h>";
     }
 
-    if(p->hasNonLocalDataOnlyClasses() || p->hasNonLocalExceptions())
+    if(p->hasNonLocalClassDefs() || p->hasNonLocalExceptions())
     {
         H << "\n#include <Ice/FactoryTableInit.h>";
     }
@@ -655,24 +812,20 @@ Slice::Gen::generate(const UnitPtr& p)
     H << "\n#include <IceUtil/ScopedArray.h>";
     H << "\n#include <IceUtil/Optional.h>";
 
-    if(p->usesNonLocals())
+    if(p->hasExceptions())
     {
-        C << "\n#include <Ice/BasicStream.h>";
+        H << "\n#include <Ice/ExceptionHelpers.h>";
     }
 
-    if(_stream || p->hasNonLocalClassDefs() || p->hasNonLocalExceptions())
+    if(p->usesNonLocals())
     {
-        if(!p->hasNonLocalClassDefs())
-        {
-            C << "\n#include <Ice/LocalException.h>";
-        }
-
-        H << "\n#include <Ice/StreamF.h>";
+        C << "\n#include <Ice/InputStream.h>";
+        C << "\n#include <Ice/OutputStream.h>";
+    }
 
-        if(_stream)
-        {
-            C << "\n#include <Ice/Stream.h>";
-        }
+    if(p->hasNonLocalExceptions())
+    {
+        C << "\n#include <Ice/LocalException.h>";
     }
 
     if(p->hasContentsWithMetaData("preserve-slice"))
@@ -731,96 +884,153 @@ Slice::Gen::generate(const UnitPtr& p)
         _dllExport += " ";
     }
 
-    ProxyDeclVisitor proxyDeclVisitor(H, C, _dllExport);
-    p->visit(&proxyDeclVisitor, false);
-
-    ObjectDeclVisitor objectDeclVisitor(H, C, _dllExport);
-    p->visit(&objectDeclVisitor, false);
+    H << sp;
+    H.zeroIndent();
+    H << nl << "#ifdef ICE_CPP11_MAPPING // C++11 mapping";
+    H.restoreIndent();
 
-    TypesVisitor typesVisitor(H, C, _dllExport, _stream);
-    p->visit(&typesVisitor, false);
+    C << sp;
+    C.zeroIndent();
+    C << nl << "#ifdef ICE_CPP11_MAPPING // C++11 mapping";
+    C.restoreIndent();
+    {
+        normalizeMetaData(p, true);
 
-    StreamVisitor streamVisitor(H, C, _dllExport);
-    p->visit(&streamVisitor, false);
+        Cpp11DeclVisitor declVisitor(H, C, _dllExport);
+        p->visit(&declVisitor, false);
 
-    AsyncVisitor asyncVisitor(H, C, _dllExport);
-    p->visit(&asyncVisitor, false);
+        Cpp11TypesVisitor typesVisitor(H, C, _dllExport);
+        p->visit(&typesVisitor, false);
 
-    AsyncImplVisitor asyncImplVisitor(H, C, _dllExport);
-    p->visit(&asyncImplVisitor, false);
+        Cpp11LocalObjectVisitor localObjectVisitor(H, C, _dllExport);
+        p->visit(&localObjectVisitor, false);
 
-    //
-    // The templates are emitted before the proxy definition
-    // so the derivation hierarchy is known to the proxy:
-    // the proxy relies on knowing the hierarchy to make the begin_
-    // methods type-safe.
-    //
-    AsyncCallbackVisitor asyncCallbackVisitor(H, C, _dllExport);
-    p->visit(&asyncCallbackVisitor, false);
+        Cpp11InterfaceVisitor interfaceVisitor(H, C, _dllExport);
+        p->visit(&interfaceVisitor, false);
 
-    ProxyVisitor proxyVisitor(H, C, _dllExport);
-    p->visit(&proxyVisitor, false);
+        Cpp11ValueVisitor valueVisitor(H, C, _dllExport);
+        p->visit(&valueVisitor, false);
 
-    ObjectVisitor objectVisitor(H, C, _dllExport, _stream);
-    p->visit(&objectVisitor, false);
+        Cpp11ProxyVisitor proxyVisitor(H, C, _dllExport);
+        p->visit(&proxyVisitor, false);
 
-    //
-    // We need to delay generating the template after the proxy
-    // definition, because completed calls the begin_ method in the
-    // proxy.
-    //
-    AsyncCallbackTemplateVisitor asyncCallbackTemplateVisitor(H, C, _dllExport);
-    p->visit(&asyncCallbackTemplateVisitor, false);
+        Cpp11StreamVisitor streamVisitor(H, C, _dllExport);
+        p->visit(&streamVisitor, false);
 
-    if(_impl)
-    {
-        implH << "\n#include <";
-        if(_include.size())
+        if(_implCpp11)
         {
-            implH << _include << '/';
-        }
-        implH << _base << "." << _headerExtension << ">";
+            implH << "\n#include <";
+            if(_include.size())
+            {
+                implH << _include << '/';
+            }
+            implH << _base << "." << _headerExtension << ">";
+            implH << nl << "//base";
+            writeExtraHeaders(implC);
 
-        writeExtraHeaders(implC);
+            implC << "\n#include <";
+            if(_include.size())
+            {
+                implC << _include << '/';
+            }
+            implC << _base << "I." << _implHeaderExtension << ">";
 
-        implC << "\n#include <";
-        if(_include.size())
-        {
-            implC << _include << '/';
+            Cpp11ImplVisitor implVisitor(implH, implC, _dllExport);
+            p->visit(&implVisitor, false);
         }
-        implC << _base << "I." << _implHeaderExtension << ">";
 
-        ImplVisitor implVisitor(implH, implC, _dllExport);
-        p->visit(&implVisitor, false);
+        Cpp11CompatibilityVisitor compatibilityVisitor(H, C, _dllExport);
+        p->visit(&compatibilityVisitor, false);
+
+        generateChecksumMap(p);
     }
+    H << sp;
+    H.zeroIndent();
+    H << nl << "#else // C++98 mapping";
+    H.restoreIndent();
 
-    if(_checksum)
+    C << sp;
+    C.zeroIndent();
+    C << nl << "#else // C++98 mapping";
+    C.restoreIndent();
     {
-        ChecksumMap map = createChecksums(p);
-        if(!map.empty())
+        normalizeMetaData(p, false);
+
+        ProxyDeclVisitor proxyDeclVisitor(H, C, _dllExport);
+        p->visit(&proxyDeclVisitor, false);
+
+        ObjectDeclVisitor objectDeclVisitor(H, C, _dllExport);
+        p->visit(&objectDeclVisitor, false);
+
+        TypesVisitor typesVisitor(H, C, _dllExport);
+        p->visit(&typesVisitor, false);
+
+        AsyncVisitor asyncVisitor(H, C, _dllExport);
+        p->visit(&asyncVisitor, false);
+
+        AsyncImplVisitor asyncImplVisitor(H, C, _dllExport);
+        p->visit(&asyncImplVisitor, false);
+
+        //
+        // The templates are emitted before the proxy definition
+        // so the derivation hierarchy is known to the proxy:
+        // the proxy relies on knowing the hierarchy to make the begin_
+        // methods type-safe.
+        //
+        AsyncCallbackVisitor asyncCallbackVisitor(H, C, _dllExport);
+        p->visit(&asyncCallbackVisitor, false);
+
+        ProxyVisitor proxyVisitor(H, C, _dllExport);
+        p->visit(&proxyVisitor, false);
+
+        ObjectVisitor objectVisitor(H, C, _dllExport);
+        p->visit(&objectVisitor, false);
+
+        StreamVisitor streamVisitor(H, C, _dllExport);
+        p->visit(&streamVisitor, false);
+
+        //
+        // We need to delay generating the template after the proxy
+        // definition, because completed calls the begin_ method in the
+        // proxy.
+        //
+        AsyncCallbackTemplateVisitor asyncCallbackTemplateVisitor(H, C, _dllExport);
+        p->visit(&asyncCallbackTemplateVisitor, false);
+
+        if(_implCpp98)
         {
-            C << sp << nl << "namespace";
-            C << nl << "{";
-            C << sp << nl << "const char* __sliceChecksums[] =";
-            C << sb;
-            for(ChecksumMap::const_iterator q = map.begin(); q != map.end(); ++q)
+            implH << "\n#include <";
+            if(_include.size())
             {
-                C << nl << "\"" << q->first << "\", \"";
-                ostringstream str;
-                str.flags(ios_base::hex);
-                str.fill('0');
-                for(vector<unsigned char>::const_iterator r = q->second.begin(); r != q->second.end(); ++r)
-                {
-                    str << static_cast<int>(*r);
-                }
-                C << str.str() << "\",";
+                implH << _include << '/';
             }
-            C << nl << "0";
-            C << eb << ';';
-            C << nl << "const IceInternal::SliceChecksumInit __sliceChecksumInit(__sliceChecksums);";
-            C << sp << nl << "}";
+            implH << _base << "." << _headerExtension << ">";
+
+            writeExtraHeaders(implC);
+
+            implC << "\n#include <";
+            if(_include.size())
+            {
+                implC << _include << '/';
+            }
+            implC << _base << "I." << _implHeaderExtension << ">";
+
+            ImplVisitor implVisitor(implH, implC, _dllExport);
+            p->visit(&implVisitor, false);
         }
+
+        generateChecksumMap(p);
     }
+
+    H << sp;
+    H.zeroIndent();
+    H << nl << "#endif";
+    H.restoreIndent();
+
+    C << sp;
+    C.zeroIndent();
+    C << nl << "#endif";
+    C.restoreIndent();
 }
 
 void
@@ -859,8 +1069,8 @@ Slice::Gen::writeExtraHeaders(IceUtilInternal::Output& out)
     }
 }
 
-Slice::Gen::TypesVisitor::TypesVisitor(Output& h, Output& c, const string& dllExport, bool stream) :
-    H(h), C(c), _dllExport(dllExport), _stream(stream), _doneStaticSymbol(false), _useWstring(false)
+Slice::Gen::TypesVisitor::TypesVisitor(Output& h, Output& c, const string& dllExport) :
+    H(h), C(c), _dllExport(dllExport), _doneStaticSymbol(false), _useWstring(false)
 {
 }
 
@@ -980,7 +1190,6 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
     H << nl << "virtual ~" << name << "() throw();";
     H << sp;
 
-
     if(!p->isLocal())
     {
         string initName = p->flattenedScope() + p->name() + "_init";
@@ -1077,10 +1286,10 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
     C << sb;
     C << eb;
 
-    H << nl << "virtual ::std::string ice_name() const;";
-    C << sp << nl << "::std::string" << nl << scoped.substr(2) << "::ice_name() const";
+    H << nl << "virtual ::std::string ice_id() const;";
+    C << sp << nl << "::std::string" << nl << scoped.substr(2) << "::ice_id() const";
     C << sb;
-    C << nl << "return \"" << p->scoped().substr(2) << "\";";
+    C << nl << "return \"" << p->scoped() << "\";";
     C << eb;
 
     StringList metaData = p->getMetaData();
@@ -1138,135 +1347,73 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 
         if(preserved && !basePreserved)
         {
-            H << sp << nl << "virtual void __write(::IceInternal::BasicStream*) const;";
-            H << nl << "virtual void __read(::IceInternal::BasicStream*);";
+            H << sp << nl << "virtual void __write(::Ice::OutputStream*) const;";
+            H << nl << "virtual void __read(::Ice::InputStream*);";
 
-            if(_stream)
-            {
-                H << nl << "virtual void __write(const ::Ice::OutputStreamPtr&) const;";
-                H << nl << "virtual void __read(const ::Ice::InputStreamPtr&);";
-            }
-            else
-            {
-                string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException");
-                H << nl << "using " << baseName << "::__write;";
-                H << nl << "using " << baseName << "::__read;";
-            }
+            string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException");
+            H << nl << "using " << baseName << "::__write;";
+            H << nl << "using " << baseName << "::__read;";
         }
 
         H.dec();
         H << sp << nl << "protected:";
         H.inc();
 
-        H << nl << "virtual void __writeImpl(::IceInternal::BasicStream*) const;";
-        H << nl << "virtual void __readImpl(::IceInternal::BasicStream*);";
+        H << nl << "virtual void __writeImpl(::Ice::OutputStream*) const;";
+        H << nl << "virtual void __readImpl(::Ice::InputStream*);";
 
-        if(_stream)
-        {
-            H << nl << "virtual void __writeImpl(const ::Ice::OutputStreamPtr&) const;";
-            H << nl << "virtual void __readImpl(const ::Ice::InputStreamPtr&);";
-        }
-        else
-        {
-            string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException");
-            H << nl << "using " << baseName << "::__writeImpl;";
-            H << nl << "using " << baseName << "::__readImpl;";
-        }
+        string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException");
 
         if(preserved && !basePreserved)
         {
 
             H << sp << nl << "::Ice::SlicedDataPtr __slicedData;";
 
-            C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::BasicStream* __os) const";
+            C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(::Ice::OutputStream* __os) const";
             C << sb;
-            C << nl << "__os->startWriteException(__slicedData);";
+            C << nl << "__os->startException(__slicedData);";
             C << nl << "__writeImpl(__os);";
-            C << nl << "__os->endWriteException();";
+            C << nl << "__os->endException();";
             C << eb;
 
-            C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)";
+            C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(::Ice::InputStream* __is)";
             C << sb;
-            C << nl << "__is->startReadException();";
+            C << nl << "__is->startException();";
             C << nl << "__readImpl(__is);";
-            C << nl << "__slicedData = __is->endReadException(true);";
+            C << nl << "__slicedData = __is->endException(true);";
             C << eb;
         }
 
-        C << sp << nl << "void" << nl << scoped.substr(2) << "::__writeImpl(::IceInternal::BasicStream* __os) const";
+        C << sp << nl << "void" << nl << scoped.substr(2) << "::__writeImpl(::Ice::OutputStream* __os) const";
         C << sb;
-        C << nl << "__os->startWriteSlice(\"" << p->scoped() << "\", -1, " << (!base ? "true" : "false") << ");";
-        writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true);
-        C << nl << "__os->endWriteSlice();";
+        C << nl << "__os->startSlice(\"" << p->scoped() << "\", -1, " << (!base ? "true" : "false") << ");";
+        C << nl << "Ice::StreamWriter<" << scoped.substr(2) << ", ::Ice::OutputStream>::write(__os, *this);";
+        C << nl << "__os->endSlice();";
         if(base)
         {
             emitUpcall(base, "::__writeImpl(__os);");
         }
         C << eb;
 
-        C << sp << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::IceInternal::BasicStream* __is)";
+        C << sp << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::Ice::InputStream* __is)";
         C << sb;
-        C << nl << "__is->startReadSlice();";
-        writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false);
-        C << nl << "__is->endReadSlice();";
+        C << nl << "__is->startSlice();";
+        C << nl << "Ice::StreamReader<" << scoped.substr(2) << ", ::Ice::InputStream>::read(__is, *this);";
+        C << nl << "__is->endSlice();";
         if(base)
         {
             emitUpcall(base, "::__readImpl(__is);");
         }
         C << eb;
-
-        if(_stream)
-        {
-            if(preserved && !basePreserved)
-            {
-                C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(const ::Ice::OutputStreamPtr& __os) const";
-                C << sb;
-                C << nl << "__os->startException(__slicedData);";
-                C << nl << "__writeImpl(__os);";
-                C << nl << "__os->endException();";
-                C << eb;
-
-                C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(const ::Ice::InputStreamPtr& __is)";
-                C << sb;
-                C << nl << "__is->startException();";
-                C << nl << "__readImpl(__is);";
-                C << nl << "__slicedData = __is->endException(true);";
-                C << eb;
-            }
-
-            C << sp << nl << "void" << nl << scoped.substr(2)
-              << "::__writeImpl(const ::Ice::OutputStreamPtr& __os) const";
-            C << sb;
-            C << nl << "__os->startSlice(\"" << p->scoped() << "\", -1, " << (!base ? "true" : "false") << ");";
-            writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true);
-            C << nl << "__os->endSlice();";
-            if(base)
-            {
-                emitUpcall(base, "::__writeImpl(__os);");
-            }
-            C << eb;
-
-            C << sp << nl << "void" << nl << scoped.substr(2)
-              << "::__readImpl(const ::Ice::InputStreamPtr& __is)";
-            C << sb;
-            C << nl << "__is->startSlice();";
-            writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false);
-            C << nl << "__is->endSlice();";
-            if(base)
-            {
-                emitUpcall(base, "::__readImpl(__is);");
-            }
-            C << eb;
-        }
     }
     H << eb << ';';
 
     if(!p->isLocal())
     {
         //
-        // We need an instance here to trigger initialization if the implementation is in a shared libarry.
+        // We need an instance here to trigger initialization if the implementation is in a static library.
         // But we do this only once per source file, because a single instance is sufficient to initialize
-        // all of the globals in a shared library.
+        // all of the globals in a compilation unit.
         //
         if(!_doneStaticSymbol)
         {
@@ -1289,7 +1436,7 @@ Slice::Gen::TypesVisitor::visitStructStart(const StructPtr& p)
     bool classMetaData = findMetaData(p->getMetaData()) == "%class";
     if(classMetaData)
     {
-        H << sp << nl << "class " << _dllExport << name << " : public IceUtil::Shared";
+        H << sp << nl << "class " << name << " : public IceUtil::Shared";
         H << sb;
         H.dec();
         H << nl << "public:";
@@ -1341,10 +1488,6 @@ Slice::Gen::TypesVisitor::visitStructStart(const StructPtr& p)
         }
 
         H << nl;
-        if(!classMetaData)
-        {
-            H << _dllExport;
-        }
         if(paramDecls.size() == 1)
         {
             H << "explicit ";
@@ -1623,13 +1766,14 @@ Slice::Gen::ProxyDeclVisitor::visitClassDecl(const ClassDeclPtr& p)
     string scoped = fixKwd(p->scoped());
 
     H << sp << nl << "class " << name << ';';
-    H << nl << _dllExport << "void __read(::IceInternal::BasicStream*, ::IceInternal::ProxyHandle< ::IceProxy"
+    H << nl << _dllExport << "void __read(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy"
       << scoped << ">&);";
     H << nl << _dllExport << "::IceProxy::Ice::Object* upCast(::IceProxy" << scoped << "*);";
 }
 
 Slice::Gen::ProxyVisitor::ProxyVisitor(Output& h, Output& c, const string& dllExport) :
-    H(h), C(c), _dllExport(dllExport), _useWstring(false)
+    H(h), C(c), _dllExport(dllExport), _dllClassExport(toDllClassExport(dllExport)),
+    _dllMemberExport(toDllMemberExport(dllExport)), _useWstring(false)
 {
 }
 
@@ -1692,49 +1836,74 @@ Slice::Gen::ProxyVisitor::visitClassDefStart(const ClassDefPtr& p)
     string scoped = fixKwd(p->scoped());
     ClassList bases = p->bases();
 
-    H << sp << nl << "class " << _dllExport << name << " : ";
-    if(bases.empty())
-    {
-        H << "virtual public ::IceProxy::Ice::Object";
-    }
-    else
+    if(bases.size() > 1)
     {
+        //
+        // Generated helper class to deal with multiple inheritance
+        // when using Proxy template.
+        //
+
+        string baseName = fixKwd("_" + p->name() + "Base");
+
+        H << sp << nl << "class " << _dllClassExport << baseName << " : ";
         H.useCurrentPosAsIndent();
-        ClassList::const_iterator q = bases.begin();
-        while(q != bases.end())
+        for(ClassList::const_iterator q = bases.begin(); q != bases.end();)
         {
-            H << "virtual public ::IceProxy" << fixKwd((*q)->scoped());
+            H << "public virtual ::IceProxy" << fixKwd((*q)->scoped());
             if(++q != bases.end())
             {
-                H << ',' << nl;
+                H << ", " << nl;
             }
         }
         H.restoreIndent();
+        H << sb;
+
+        H.dec();
+        H << nl << "public:";
+        H.inc();
+
+        // Out of line dtor to avoid weak vtable
+        H << sp << nl << _dllMemberExport << "virtual ~" << baseName << "();";
+        C << sp;
+        C << nl << "::IceProxy" << scope << baseName << "::~" << baseName << "()";
+        C << sb;
+        C << eb;
+
+        H.dec();
+        H << sp << nl << "protected:";
+        H.inc();
+
+        H << sp << nl << "virtual Object* __newInstance() const = 0;";
+        H << eb << ';';
+    }
+
+    H << sp << nl << "class " << _dllClassExport << name << " : ";
+    H << "public virtual ::Ice::Proxy<" << name << ", ";
+    if(bases.empty())
+    {
+        H << "::IceProxy::Ice::Object";
+    }
+    else if(bases.size() == 1)
+    {
+        H << "::IceProxy" << fixKwd(bases.front()->scoped());
+    }
+    else
+    {
+        H << fixKwd("_" + p->name() + "Base");
     }
+    H << ">";
 
     H << sb;
     H.dec();
     H << nl << "public:";
     H.inc();
 
-    if(_dllExport != "")
-    {
-        //
-        // To export the virtual table
-        //
-        C << nl << "#ifdef __SUNPRO_CC";
-        C << nl << "class " << _dllExport
-          << "IceProxy" << scoped << ";";
-        C << nl << "#endif";
-    }
-
     C << nl
       << _dllExport
-      << "::IceProxy::Ice::Object* ::IceProxy" << scope << "upCast(::IceProxy" << scoped
-      << "* p) { return p; }";
+      << "::IceProxy::Ice::Object* ::IceProxy" << scope << "upCast(::IceProxy" << scoped << "* p) { return p; }";
 
     C << sp;
-    C << nl << "void" << nl << "::IceProxy" << scope << "__read(::IceInternal::BasicStream* __is, "
+    C << nl << "void" << nl << "::IceProxy" << scope << "__read(::Ice::InputStream* __is, "
       << "::IceInternal::ProxyHandle< ::IceProxy" << scoped << ">& v)";
     C << sb;
     C << nl << "::Ice::ObjectPrx proxy;";
@@ -1760,143 +1929,25 @@ Slice::Gen::ProxyVisitor::visitClassDefEnd(const ClassDefPtr& p)
     string scoped = fixKwd(p->scoped());
     string scope = fixKwd(p->scope());
 
-    //
-    // "Overwrite" various non-virtual functions in ::IceProxy::Ice::Object that return an ObjectPrx and
-    // are more usable when they return a <name>Prx
-    //
-
-    //
-    // No identity!
-    //
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_context(const ::Ice::Context& __context) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_context(__context).get());";
-    H << eb;
-
-    //
-    // No facet!
-    //
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_adapterId(const ::std::string& __id) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_adapterId(__id).get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_endpoints(const ::Ice::EndpointSeq& __endpoints) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_endpoints(__endpoints).get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_locatorCacheTimeout(int __timeout) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_locatorCacheTimeout(__timeout).get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_connectionCached(bool __cached) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_connectionCached(__cached).get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_endpointSelection(::Ice::EndpointSelectionType __est) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_endpointSelection(__est).get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_secure(bool __secure) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_secure(__secure).get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_preferSecure(bool __preferSecure) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_preferSecure(__preferSecure).get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_router(const ::Ice::RouterPrx& __router) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_router(__router).get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_locator(const ::Ice::LocatorPrx& __locator) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_locator(__locator).get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_collocationOptimized(bool __co) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_collocationOptimized(__co).get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_invocationTimeout(int __timeout) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_invocationTimeout(__timeout).get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_twoway() const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_twoway().get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_oneway() const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_oneway().get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_batchOneway() const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_batchOneway().get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_datagram() const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_datagram().get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_batchDatagram() const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_batchDatagram().get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_compress(bool __compress) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_compress(__compress).get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_timeout(int __timeout) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_timeout(__timeout).get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name << "> ice_connectionId(const ::std::string& __id) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_connectionId(__id).get());";
-    H << eb;
-
-    H << nl << nl << "::IceInternal::ProxyHandle<" << name
-      << "> ice_encodingVersion(const ::Ice::EncodingVersion& __v) const";
-    H << sb;
-    H << nl << "return dynamic_cast<" << name << "*>(::IceProxy::Ice::Object::ice_encodingVersion(__v).get());";
-    H << eb;
-
-    H << nl << nl << "static const ::std::string& ice_staticId();";
+    H << nl << nl << _dllMemberExport << "static const ::std::string& ice_staticId();";
 
     H.dec();
-    H << sp << nl << "private: ";
+    H << sp << nl << "protected: ";
     H.inc();
-    H << nl << "virtual ::IceProxy::Ice::Object* __newInstance() const;";
+    H << nl << _dllMemberExport << "virtual ::IceProxy::Ice::Object* __newInstance() const;";
     H << eb << ';';
 
     C << sp;
-    C << nl << "const ::std::string&" << nl << "IceProxy" << scoped << "::ice_staticId()";
+    C << nl << "::IceProxy::Ice::Object*";
+    C << nl << "IceProxy" << scoped << "::__newInstance() const";
     C << sb;
-    C << nl << "return "<< scoped << "::ice_staticId();";
+    C << nl << "return new " << name << ";";
     C << eb;
 
-    C << sp << nl << "::IceProxy::Ice::Object*";
-    C << nl << "IceProxy" << scoped << "::__newInstance() const";
+    C << sp;
+    C << nl << "const ::std::string&" << nl << "IceProxy" << scoped << "::ice_staticId()";
     C << sb;
-    C << nl << "return new " << name << ";";
+    C << nl << "return "<< scoped << "::ice_staticId();";
     C << eb;
 
     _useWstring = resetUseWstring(_useWstringHist);
@@ -2019,7 +2070,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
 
     //
     // Check if we need to generate a private ___end_ method. This is the case if the
-    // when using certain mapping features such as cpp:array or cpp:range:array. While
+    // when using certain mapping features such as cpp:array. While
     // the regular end_ method can't return pair<const TYPE*, const TYPE*> because the
     // pointers would be invalid once end_ returns, we still want to allow using this
     // alternate mapping with AMI response callbacks (to allow zero-copy for instance).
@@ -2038,219 +2089,13 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     string thisPointer = fixKwd(scope.substr(0, scope.size() - 2)) + "*";
 
     string deprecateSymbol = getDeprecateSymbol(p, cl);
-    H << sp << nl << deprecateSymbol << retS << ' ' << fixKwd(name) << spar << paramsDecl << epar;
-    H << sb;
-    H << nl;
-    if(ret)
-    {
-        H << "return ";
-    }
-    H << fixKwd(name) << spar << args << "0" << epar << ';';
-    H << eb;
-    H << nl << deprecateSymbol << retS << ' ' << fixKwd(name) << spar << paramsDecl << "const ::Ice::Context& __ctx"
-      << epar;
-    H << sb;
-    H << nl;
-    if(ret)
-    {
-        H << "return ";
-    }
-    H << fixKwd(name) << spar << args << "&__ctx" << epar << ';';
-    H << eb;
-
-    H.zeroIndent();
-    H << nl << "#ifdef ICE_CPP11";
-    H.restoreIndent();
-
-    string retEndArg = getEndArg(ret, p->getMetaData(), "__ret");
-
-    //
-    // COMPILERFIX VC compilers up to VC110 don't support more than 10 parameters with std::function due to
-    // lack of variadic templates.
-    //
-    if(outDecls.size() > 10 || (outDecls.size() > 9 && !retInS.empty()))
-    {
-        H.zeroIndent();
-        H << nl << "#if !defined(_MSC_VER) || _MSC_VER > 1700";
-        H.restoreIndent();
-        H << nl << "//";
-        H << nl << "// COMPILERFIX VC compilers up to VC110 don't support more than 10 parameters with";
-        H << nl << "// std::function due to lack of variadic templates.";
-        H << nl << "//";
-    }
-
-    H << nl << "::Ice::AsyncResultPtr";
-    H << nl << "begin_" << name << spar << paramsDeclAMI
-      << "const ::IceInternal::Function<void " << spar;
-    if(!retInS.empty())
-    {
-        H << retInS;
-    }
-    H << outDecls << epar << ">& __response, "
-      << "const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = "
-         "::IceInternal::Function<void (const ::Ice::Exception&)>(), "
-      << "const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>()" << epar;
-
-    H << sb;
-    if(p->returnsData())
-    {
-        H << nl << "return __begin_" << name << spar << argsAMI << "0, __response, __exception, __sent" << epar << ";";
-    }
-    else
-    {
-        H << nl << "return begin_" << name << spar << argsAMI
-          << "0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent)" << epar << ";";
-
-    }
-    H << eb;
-
-    //
-    // COMPILERFIX VC compilers up to VC110 don't support more than 10 parameters with std::function due to
-    // lack of variadic templates.
-    //
-    if(outDecls.size() > 10 || (outDecls.size() > 9 && !retInS.empty()))
-    {
-        H.zeroIndent();
-        H << nl << "#endif";
-        H.restoreIndent();
-    }
-
-    H << nl << "::Ice::AsyncResultPtr";
-    H << nl << "begin_" << name << spar << paramsDeclAMI
-      << "const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed"
-      << "const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = "
-         "::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>()" << epar;
-    H << sb;
-    H << nl << "return begin_" << name << spar << argsAMI << "0, ::Ice::newCallback(__completed, __sent), 0" << epar << ";";
-    H << eb;
-
-    //
-    // COMPILERFIX VC compilers up to VC110 don't support more than 10 parameters with std::function due to
-    // lack of variadic templates.
-    //
-    if(outDecls.size() > 10 || (outDecls.size() > 9 && !retInS.empty()))
-    {
-        H.zeroIndent();
-        H << nl << "#if !defined(_MSC_VER) || _MSC_VER > 1700";
-        H.restoreIndent();
-        H << nl << "//";
-        H << nl << "// COMPILERFIX VC compilers up to VC110 don't support more than 10 parameters with";
-        H << nl << "// std::function due to lack of variadic templates.";
-        H << nl << "//";
-    }
-
-    H << nl << "::Ice::AsyncResultPtr";
-    H << nl << "begin_" << name << spar << paramsDeclAMI << "const ::Ice::Context& __ctx"
-      << "const ::IceInternal::Function<void " << spar;
-    if(!retInS.empty())
-    {
-        H << retInS;
-    }
-    H << outDecls << epar << ">& __response, "
-      << "const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception = "
-         "::IceInternal::Function<void (const ::Ice::Exception&)>(), "
-      << "const ::IceInternal::Function<void (bool)>& __sent = ::IceInternal::Function<void (bool)>()" << epar;
-
-    H << sb;
-    if(p->returnsData())
-    {
-        H << nl << "return __begin_" << name << spar << argsAMI << "&__ctx, __response, __exception, __sent" << epar << ";";
-    }
-    else
-    {
-        H << nl << "return begin_" << name << spar << argsAMI
-          << "&__ctx, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent), 0" << epar << ";";
-    }
-    H << eb;
-
-    //
-    // COMPILERFIX VC compilers up to VC110 don't support more than 10 parameters with std::function due to
-    // lack of variadic templates.
-    //
-    if(outDecls.size() > 10 || (outDecls.size() > 9 && !retInS.empty()))
-    {
-        H.zeroIndent();
-        H << nl << "#endif";
-        H.restoreIndent();
-    }
-
-    H << nl << "::Ice::AsyncResultPtr";
-    H << nl << "begin_" << name << spar << paramsDeclAMI
-      << "const ::Ice::Context& __ctx"
-      << "const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __completed"
-      << "const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = "
-         "::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>()" << epar;
-    H << sb;
-    H << nl << "return begin_" << name << spar << argsAMI << "&__ctx, ::Ice::newCallback(__completed, __sent)" << epar << ";";
-    H << eb;
-
-    if(p->returnsData())
-    {
-        //
-        // COMPILERFIX VC compilers up to VC110 don't support more than 10 parameters with std::function due to
-        // lack of variadic templates.
-        //
-        if(outDecls.size() > 10 || (outDecls.size() > 9 && !retInS.empty()))
-        {
-            H.zeroIndent();
-            H << nl << "#if !defined(_MSC_VER) || _MSC_VER > 1700";
-            H.restoreIndent();
-            H << nl << "//";
-            H << nl << "// COMPILERFIX VC compilers up to VC110 don't support more than 10 parameters with";
-            H << nl << "// std::function due to lack of variadic templates.";
-            H << nl << "//";
-        }
-
-        H << nl;
-        H.dec();
-        H << nl << "private:";
-        H.inc();
-
-
-        H << sp << nl << "::Ice::AsyncResultPtr __begin_" << name << spar << paramsDeclAMI
-          << "const ::Ice::Context* __ctx" << "const ::IceInternal::Function<void " << spar;
-
-
-        if(!retInS.empty())
-        {
-            H << retInS;
-        }
-        H << outDecls;
-
-        H << epar << ">& __response, "
-          << "const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, "
-          << "const ::IceInternal::Function<void (bool)>& __sent" << epar << ";";
-
-        H << nl;
-        H.dec();
-        H << nl << "public:";
-        H.inc();
-        //
-        // COMPILERFIX VC compilers up to VC110 don't support more than 10 parameters with std::function due to
-        // lack of variadic templates.
-        //
-        if(outDecls.size() > 10 || (outDecls.size() > 9 && !retInS.empty()))
-        {
-            H.zeroIndent();
-            H << nl << "#endif";
-            H.restoreIndent();
-        }
-    }
-
-    H.zeroIndent();
-    H << nl << "#endif";
-    H.restoreIndent();
-
-    H << sp << nl << "::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI << epar;
-    H << sb;
-    H << nl << "return begin_" << name << spar << argsAMI << "0" << "::IceInternal::__dummyCallback" << "0"
-      << epar << ';';
-    H << eb;
+    H << nl << deprecateSymbol << _dllMemberExport << retS << ' ' << fixKwd(name) << spar << paramsDecl
+      << "const ::Ice::Context& __ctx = ::Ice::noExplicitContext" << epar << ";";
 
     H << sp << nl << "::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI
-      << "const ::Ice::Context& __ctx" << epar;
+      << "const ::Ice::Context& __ctx = ::Ice::noExplicitContext" << epar;
     H << sb;
-    H << nl << "return begin_" << name << spar << argsAMI << "&__ctx" << "::IceInternal::__dummyCallback" << "0"
+    H << nl << "return __begin_" << name << spar << argsAMI << "__ctx" << "::IceInternal::__dummyCallback" << "0"
       << epar << ';';
     H << eb;
 
@@ -2258,7 +2103,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
       << "const ::Ice::CallbackPtr& __del"
       << "const ::Ice::LocalObjectPtr& __cookie = 0" << epar;
     H << sb;
-    H << nl << "return begin_" << name << spar << argsAMI << "0" << "__del" << "__cookie" << epar << ';';
+    H << nl << "return __begin_" << name << spar << argsAMI << "::Ice::noExplicitContext" << "__del" << "__cookie" << epar << ';';
     H << eb;
 
     H << sp << nl << "::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI
@@ -2266,14 +2111,14 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
       << "const ::Ice::CallbackPtr& __del"
       << "const ::Ice::LocalObjectPtr& __cookie = 0" << epar;
     H << sb;
-    H << nl << "return begin_" << name << spar << argsAMI << "&__ctx" << "__del" << "__cookie" << epar << ';';
+    H << nl << "return __begin_" << name << spar << argsAMI << "__ctx" << "__del" << "__cookie" << epar << ';';
     H << eb;
 
     H << sp << nl << "::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI
       << "const " + delNameScoped + "Ptr& __del"
       << "const ::Ice::LocalObjectPtr& __cookie = 0" << epar;
     H << sb;
-    H << nl << "return begin_" << name << spar << argsAMI << "0" << "__del" << "__cookie" << epar << ';';
+    H << nl << "return __begin_" << name << spar << argsAMI << "::Ice::noExplicitContext" << "__del" << "__cookie" << epar << ';';
     H << eb;
 
     H << sp << nl << "::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI
@@ -2281,14 +2126,14 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
       << "const " + delNameScoped + "Ptr& __del"
       << "const ::Ice::LocalObjectPtr& __cookie = 0" << epar;
     H << sb;
-    H << nl << "return begin_" << name << spar << argsAMI << "&__ctx" << "__del" << "__cookie" << epar << ';';
+    H << nl << "return __begin_" << name << spar << argsAMI << "__ctx" << "__del" << "__cookie" << epar << ';';
     H << eb;
 
-    H << sp << nl << retS << " end_" << name << spar << outParamsDeclAMI
+    H << sp << nl << _dllMemberExport << retS << " end_" << name << spar << outParamsDeclAMI
       << "const ::Ice::AsyncResultPtr&" << epar << ';';
     if(generatePrivateEnd)
     {
-        H << sp << nl << " void ___end_" << name << spar << outParamsDeclEndAMI;
+        H << sp << nl << _dllMemberExport << "void ___end_" << name << spar << outParamsDeclEndAMI;
         H << "const ::Ice::AsyncResultPtr&" << epar << ';';
     }
 
@@ -2296,9 +2141,8 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     H.dec();
     H << nl << "private:";
     H.inc();
-    H << sp << nl << retS << ' ' << fixKwd(name) << spar << params << "const ::Ice::Context*" << epar
-      << ';';
-    H << nl <<  "::Ice::AsyncResultPtr begin_" << name << spar << paramsAMI << "const ::Ice::Context*"
+    H << nl << _dllMemberExport << "::Ice::AsyncResultPtr __begin_" << name << spar
+      << paramsAMI << "const ::Ice::Context&"
       << "const ::IceInternal::CallbackBasePtr&"
       << "const ::Ice::LocalObjectPtr& __cookie = 0" << epar << ';';
     H << nl;
@@ -2306,7 +2150,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     H << nl << "public:";
     H.inc();
 
-    C << sp << nl << retS << nl << "IceProxy" << scoped << spar << paramsDecl << "const ::Ice::Context* __ctx" << epar;
+    C << sp << nl << retS << nl << "IceProxy" << scoped << spar << paramsDecl << "const ::Ice::Context& __ctx" << epar;
     C << sb;
     if(p->returnsData())
     {
@@ -2322,11 +2166,11 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     {
         C << nl << "try";
         C << sb;
-        C << nl<< "::IceInternal::BasicStream* __os = __og.startWriteParams(" << opFormatTypeToString(p) << ");";
+        C << nl<< "::Ice::OutputStream* __os = __og.startWriteParams(" << opFormatTypeToString(p) << ");";
         writeMarshalCode(C, inParams, 0, true, TypeContextInParam);
         if(p->sendsClasses(false))
         {
-            C << nl << "__os->writePendingObjects();";
+            C << nl << "__os->writePendingValues();";
         }
         C << nl << "__og.endWriteParams();";
         C << eb;
@@ -2393,7 +2237,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
         // COMPILERFIX: Don't throw UnknownUserException directly. This is causing access
         // violation errors with Visual C++ 64bits optimized builds. See bug #2962.
         //
-        C << nl << "::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());";
+        C << nl << "::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_id());";
         C << nl << "throw __uue;";
         C << eb;
         C << eb;
@@ -2401,11 +2245,11 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
         if(ret || !outParams.empty())
         {
             writeAllocateCode(C, ParamDeclList(), p, true, _useWstring);
-            C << nl << "::IceInternal::BasicStream* __is = __og.startReadParams();";
+            C << nl << "::Ice::InputStream* __is = __og.startReadParams();";
             writeUnmarshalCode(C, outParams, p, true);
             if(p->returnsClasses(false))
             {
-                C << nl << "__is->readPendingObjects();";
+                C << nl << "__is->readPendingValues();";
             }
             C << nl << "__og.endReadParams();";
         }
@@ -2417,16 +2261,16 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     }
     C << eb;
 
-    C << sp << nl << "::Ice::AsyncResultPtr" << nl << "IceProxy" << scope << "begin_" << name << spar << paramsDeclAMI
-      << "const ::Ice::Context* __ctx" << "const ::IceInternal::CallbackBasePtr& __del"
+    C << sp << nl << "::Ice::AsyncResultPtr" << nl << "IceProxy" << scope << "__begin_" << name << spar << paramsDeclAMI
+      << "const ::Ice::Context& __ctx" << "const ::IceInternal::CallbackBasePtr& __del"
       << "const ::Ice::LocalObjectPtr& __cookie" << epar;
     C << sb;
     if(p->returnsData())
     {
         C << nl << "__checkAsyncTwowayOnly(" << flatName <<  ");";
     }
-    C << nl << "::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, ";
-    C << flatName << ", __del, __cookie);";
+    C << nl << "::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::CallbackOutgoing(this, " << flatName
+        << ", __del, __cookie);";
     C << nl << "try";
     C << sb;
     C << nl << "__result->prepare(" << flatName << ", " << operationModeToString(p->sendMode()) << ", __ctx);";
@@ -2436,15 +2280,15 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     }
     else
     {
-        C << nl << "::IceInternal::BasicStream* __os = __result->startWriteParams(" << opFormatTypeToString(p) <<");";
+        C << nl << "::Ice::OutputStream* __os = __result->startWriteParams(" << opFormatTypeToString(p) <<");";
         writeMarshalCode(C, inParams, 0, true, TypeContextInParam);
         if(p->sendsClasses(false))
         {
-            C << nl << "__os->writePendingObjects();";
+            C << nl << "__os->writePendingValues();";
         }
         C << nl << "__result->endWriteParams();";
     }
-    C << nl << "__result->invoke();";
+    C << nl << "__result->invoke(" << flatName << ");";
     C << eb;
     C << nl << "catch(const ::Ice::Exception& __ex)";
     C << sb;
@@ -2453,140 +2297,6 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     C << nl << "return __result;";
     C << eb;
 
-    if(p->returnsData())
-    {
-        C << nl << nl << "#ifdef ICE_CPP11";
-
-        //
-        // COMPILERFIX VC compilers up to VC110 don't support more than 10 parameters with std::function due to
-        // lack of variadic templates.
-        //
-        if(outDecls.size() > 10 || (outDecls.size() > 9 && !retInS.empty()))
-        {
-
-            C << nl << "#if !defined(_MSC_VER) || _MSC_VER > 1700";
-
-            C << nl << "//";
-            C << nl << "// COMPILERFIX VC compilers up to VC110 don't support more than 10 parameters with";
-            C << nl << "// std::function due to lack of variadic templates.";
-            C << nl << "//";
-        }
-
-        C << sp << nl << "::Ice::AsyncResultPtr" << nl
-          << "IceProxy" << scope << "__begin_" <<  name << spar << paramsDeclAMI
-          << "const ::Ice::Context* __ctx" << "const ::IceInternal::Function<void " << spar;
-
-        if(!retInS.empty())
-        {
-            C << retInS;
-        }
-        C << outDecls;
-
-        C << epar << ">& __response, "
-          << "const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, "
-          << "const ::IceInternal::Function<void (bool)>& __sent" << epar;
-
-        C << sb;
-        C << nl << "class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC";
-        C << sb;
-        C.dec();
-        C << nl << "public:";
-        C.inc();
-        C << sp << nl << "Cpp11CB" << spar << "const ::std::function<void " << spar;
-        if(!retInS.empty())
-        {
-            C << retInS;
-        }
-        C << outDecls;
-        C << epar << ">& responseFunc, "
-          << "const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc, "
-          << "const ::std::function<void (bool)>& sentFunc" << epar << " :";
-        C.inc();
-        C << nl << "::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),";
-        C << nl << "_response(responseFunc)";
-        C.dec();
-        C << sb;
-        C << nl << "CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);";
-        C << eb;
-
-        //
-        // completed.
-        //
-        C << sp << nl << "virtual void completed(const ::Ice::AsyncResultPtr& __result) const";
-        C << sb;
-        C << nl << clScope << clName << "Prx __proxy = " << clScope << clName
-          << "Prx::uncheckedCast(__result->getProxy());";
-        writeAllocateCode(C, outParams, p, true, _useWstring | TypeContextInParam | TypeContextAMICallPrivateEnd);
-        C << nl << "try";
-        C << sb;
-        C << nl;
-        if(!usePrivateEnd(p))
-        {
-            if(ret)
-            {
-                C << retEndArg << " = ";
-            }
-            C << "__proxy->end_" << p->name() << spar << outEndArgs << "__result" << epar << ';';
-        }
-        else
-        {
-            C << "__proxy->___end_" << p->name() << spar << outEndArgs;
-            if(ret)
-            {
-                C << retEndArg;
-            }
-            C << "__result" << epar << ';';
-        }
-        writeEndCode(C, outParams, p, true);
-        C << eb;
-        C << nl << "catch(const ::Ice::Exception& ex)";
-        C << sb;
-        C << nl << "Cpp11FnCallbackNC::exception(__result, ex);";
-        C << nl << "return;";
-        C << eb;
-        C << nl << "if(_response != nullptr)";
-        C << sb;
-        C << nl << "_response" << spar;
-        if(ret)
-        {
-            C << "__ret";
-        }
-        C << outParamNamesAMI;
-        C << epar << ';';
-        C << eb;
-        C << eb;
-
-        C.dec();
-        C << nl << nl << "private:";
-        C.inc();
-        C << nl;
-        C << nl << "::std::function<void " << spar;
-
-        if(!retInS.empty())
-        {
-            C << retInS;
-        }
-        C << outDecls;
-
-        C << epar << "> _response;";
-
-        C << eb << ';';
-
-        C << nl << "return begin_" << name << spar << argsAMI << "__ctx"
-          << "new Cpp11CB(__response, __exception, __sent)" << epar << ';';
-        C << eb;
-
-        //
-        // COMPILERFIX VC compilers up to VC110 don't support more than 10 parameters with std::function due to
-        // lack of variadic templates.
-        //
-        if(outDecls.size() > 10 || (outDecls.size() > 9 && !retInS.empty()))
-        {
-            C << nl << "#endif";
-        }
-        C << nl << "#endif"; // ICE_CPP11
-    }
-
     C << sp << nl << retS << nl << "IceProxy" << scope << "end_" << name << spar << outParamsDeclAMI
       << "const ::Ice::AsyncResultPtr& __result" << epar;
     C << sb;
@@ -2628,16 +2338,16 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
         }
         C << nl << "catch(const ::Ice::UserException& __ex)";
         C << sb;
-        C << nl << "throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());";
+        C << nl << "throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_id());";
         C << eb;
         C << eb;
         if(ret || !outParams.empty())
         {
-            C << nl << "::IceInternal::BasicStream* __is = __result->__startReadParams();";
+            C << nl << "::Ice::InputStream* __is = __result->__startReadParams();";
             writeUnmarshalCode(C, outParams, p, true, _useWstring | TypeContextAMIEnd);
             if(p->returnsClasses(false))
             {
-                C << nl << "__is->readPendingObjects();";
+                C << nl << "__is->readPendingValues();";
             }
             C << nl << "__result->__endReadParams();";
         }
@@ -2691,16 +2401,17 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
         }
         C << nl << "catch(const ::Ice::UserException& __ex)";
         C << sb;
-        C << nl << "throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());";
+        C << nl << "throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_id());";
         C << eb;
         C << eb;
+
         if(ret || !outParams.empty())
         {
-            C << nl << "::IceInternal::BasicStream* __is = __result->__startReadParams();";
+            C << nl << "::Ice::InputStream* __is = __result->__startReadParams();";
             writeUnmarshalCode(C, outParams, p, true, _useWstring | TypeContextAMIPrivateEnd);
             if(p->returnsClasses(false))
             {
-                C << nl << "__is->readPendingObjects();";
+                C << nl << "__is->readPendingValues();";
             }
             C << nl << "__result->__endReadParams();";
         }
@@ -2751,6 +2462,7 @@ Slice::Gen::ObjectDeclVisitor::visitClassDecl(const ClassDeclPtr& p)
         H << nl << _dllExport << "::Ice::Object* upCast(" << scoped << "*);";
         H << nl << "typedef ::IceInternal::Handle< " << scoped << "> " << p->name() << "Ptr;";
         H << nl << "typedef ::IceInternal::ProxyHandle< ::IceProxy" << scoped << "> " << p->name() << "Prx;";
+        H << nl << "typedef " << p->name() << "Prx " << p->name() << "PrxPtr;";
         H << nl << _dllExport << "void __patch(" << p->name() << "Ptr&, const ::Ice::ObjectPtr&);";
     }
     else
@@ -2771,8 +2483,8 @@ Slice::Gen::ObjectDeclVisitor::visitOperation(const OperationPtr& p)
     }
 }
 
-Slice::Gen::ObjectVisitor::ObjectVisitor(Output& h, Output& c, const string& dllExport, bool stream) :
-    H(h), C(c), _dllExport(dllExport), _stream(stream), _doneStaticSymbol(false), _useWstring(false)
+Slice::Gen::ObjectVisitor::ObjectVisitor(Output& h, Output& c, const string& dllExport) :
+    H(h), C(c), _dllExport(dllExport), _doneStaticSymbol(false), _useWstring(false)
 {
 }
 
@@ -2827,11 +2539,11 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
     {
         if(p->isLocal())
         {
-            H << "virtual public ::Ice::LocalObject";
+            H << "public virtual ::Ice::LocalObject";
         }
         else
         {
-            H << "virtual public ::Ice::Object";
+            H << "public virtual ::Ice::Object";
         }
     }
     else
@@ -2854,7 +2566,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
     }
 
     bool hasBaseClass = !bases.empty() && !bases.front()->isInterface();
-    bool override = p->canBeCyclic() && (!hasBaseClass || !bases.front()->canBeCyclic());
+    bool override = !p->isLocal() && p->canBeCyclic() && (!hasBaseClass || !bases.front()->canBeCyclic());
     bool hasGCObjectBaseClass = basePreserved || override || preserved;
     if(!basePreserved && (override || preserved))
     {
@@ -2880,6 +2592,12 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
         H << nl << "typedef " << p->name() << "Ptr PointerType;";
     }
 
+    H << sp << nl << "virtual ~" << name << "();";
+    C << sp;
+    C << nl << scoped.substr(2) << "::~" << name << "()";
+    C << sb;
+    C << eb;
+
     vector<string> params;
     vector<string> allTypes;
     vector<string> allParamDecls;
@@ -2913,124 +2631,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
             H << sb << eb;
         }
 
-        /*
-         * Strong guarantee: commented-out code marked "Strong guarantee" generates
-         * a copy-assignment operator that provides the strong exception guarantee.
-         * For now, this is commented out, and we use the compiler-generated
-         * copy-assignment operator. However, that one does not provide the strong
-         * guarantee.
-
-        H << ';';
-        if(!p->isAbstract())
-        {
-            H << nl << name << "& operator=(const " << name << "&)";
-            if(allDataMembers.empty())
-            {
-                H << " { return *this; }";
-            }
-            H << ';';
-        }
-
-        //
-        // __swap() is static because classes may be abstract, so we
-        // can't use a non-static member function when we do an upcall
-        // from a non-abstract derived __swap to the __swap in an abstract base.
-        //
-        H << sp << nl << "static void __swap(" << name << "&, " << name << "&) throw()";
-        if(allDataMembers.empty())
-        {
-            H << " {}";
-        }
-        H << ';';
-        H << nl << "void swap(" << name << "& rhs) throw()";
-        H << sb;
-        if(!allDataMembers.empty())
-        {
-            H << nl << "__swap(*this, rhs);";
-        }
-        H << eb;
-
-         * Strong guarantee
-         */
-
         emitOneShotConstructor(p);
-        H << sp;
-
-        /*
-         * Strong guarantee
-
-        if(!allDataMembers.empty())
-        {
-            C << sp << nl << "void";
-            C << nl << scoped.substr(2) << "::__swap(" << name << "& __lhs, " << name << "& __rhs) throw()";
-            C << sb;
-
-            if(base)
-            {
-                emitUpcall(base, "::__swap(__lhs, __rhs);");
-            }
-
-            //
-            // We use a map to remember for which types we have already declared
-            // a temporary variable and reuse that variable if a class has
-            // more than one member of the same type. That way, we don't use more
-            // temporaries than necessary. (::std::swap() instantiates a new temporary
-            // each time it is used.)
-            //
-            map<string, int> tmpMap;
-            map<string, int>::iterator pos;
-            int tmpCount = 0;
-
-            for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
-            {
-                string memberName = fixKwd((*q)->name());
-                TypePtr type = (*q)->type();
-                BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-                if(builtin && builtin->kind() != Builtin::KindString
-                   || EnumPtr::dynamicCast(type) || ProxyPtr::dynamicCast(type)
-                   || ClassDeclPtr::dynamicCast(type) || StructPtr::dynamicCast(type))
-                {
-                    //
-                    // For built-in types (except string), enums, proxies, structs, and classes,
-                    // do the swap via a temporary variable.
-                    //
-                    string typeName = typeToString(type);
-                    pos = tmpMap.find(typeName);
-                    if(pos == tmpMap.end())
-                    {
-                        pos = tmpMap.insert(pos, make_pair(typeName, tmpCount));
-                        C << nl << typeName << " __tmp" << tmpCount << ';';
-                        tmpCount++;
-                    }
-                    C << nl << "__tmp" << pos->second << " = __rhs." << memberName << ';';
-                    C << nl << "__rhs." << memberName << " = __lhs." << memberName << ';';
-                    C << nl << "__lhs." << memberName << " = __tmp" << pos->second << ';';
-                }
-                else
-                {
-                    //
-                    // For dictionaries, vectors, and maps, use the standard container's
-                    // swap() (which is usually optimized).
-                    //
-                    C << nl << "__lhs." << memberName << ".swap(__rhs." << memberName << ");";
-                }
-            }
-            C << eb;
-
-            if(!p->isAbstract())
-            {
-                C << sp << nl << scoped << "&";
-                C << nl << scoped.substr(2) << "::operator=(const " << name << "& __rhs)";
-                C << sb;
-                C << nl << name << " __tmp(__rhs);";
-                C << nl << "__swap(*this, __tmp);";
-                C << nl << "return *this;";
-                C << eb;
-            }
-        }
-
-         * Strong guarantee
-         */
     }
 
     if(!p->isLocal())
@@ -3063,8 +2664,6 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
             C << sb;
             if(!p->isAbstract())
             {
-
-
                 C << nl << "::Ice::Object* __p = new " << name << "(*this);";
                 C << nl << "return __p;";
             }
@@ -3102,10 +2701,10 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
 
         H << sp;
         H << nl << "virtual bool ice_isA"
-          << "(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;";
+          << "(const ::std::string&, const ::Ice::Current& = ::Ice::noExplicitCurrent) const;";
         H << nl << "virtual ::std::vector< ::std::string> ice_ids"
-          << "(const ::Ice::Current& = ::Ice::Current()) const;";
-        H << nl << "virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;";
+          << "(const ::Ice::Current& = ::Ice::noExplicitCurrent) const;";
+        H << nl << "virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::noExplicitCurrent) const;";
         H << nl << "static const ::std::string& ice_staticId();";
 
         if(!dataMembers.empty())
@@ -3196,6 +2795,8 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
     bool basePreserved = p->inheritsMetaData("preserve-slice");
     bool preserved = p->hasMetaData("preserve-slice");
 
+    bool inProtected = false;
+
     if(!p->isLocal())
     {
         OperationList allOps = p->allOperations();
@@ -3204,7 +2805,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
             StringList allOpNames;
             transform(allOps.begin(), allOps.end(), back_inserter(allOpNames),
                       ::IceUtil::constMemFun(&Contained::name));
-	    
+
             allOpNames.push_back("ice_id");
             allOpNames.push_back("ice_ids");
             allOpNames.push_back("ice_isA");
@@ -3331,74 +2932,49 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
 
         if(!p->isAbstract())
         {
-            H << sp << nl << "static ::Ice::ObjectFactoryPtr ice_factory();";
+            H << sp << nl << "static ::Ice::ValueFactoryPtr ice_factory();";
         }
 
         if(preserved && !basePreserved)
         {
             H << sp;
-            H << nl << "virtual void __write(::IceInternal::BasicStream*) const;";
-            H << nl << "virtual void __read(::IceInternal::BasicStream*);";
-
-            if(_stream)
-            {
-                H << nl << "virtual void __write(const ::Ice::OutputStreamPtr&) const;";
-                H << nl << "virtual void __read(const ::Ice::InputStreamPtr&);";
-            }
-            else
-            {
-                string baseName = base ? fixKwd(base->scoped()) : string("::Ice::Object");
-                H << nl << "using " << baseName << "::__write;";
-                H << nl << "using " << baseName << "::__read;";
-            }
+            H << nl << "virtual void __write(::Ice::OutputStream*) const;";
+            H << nl << "virtual void __read(::Ice::InputStream*);";
         }
 
         H.dec();
         H << sp << nl << "protected:";
+        inProtected = true;
         H.inc();
 
-        H << nl << "virtual void __writeImpl(::IceInternal::BasicStream*) const;";
-        H << nl << "virtual void __readImpl(::IceInternal::BasicStream*);";
-
-        if(_stream)
-        {
-            H << nl << "virtual void __writeImpl(const ::Ice::OutputStreamPtr&) const;";
-            H << nl << "virtual void __readImpl(const ::Ice::InputStreamPtr&);";
-        }
-        else
-        {
-            string baseName = base ? fixKwd(base->scoped()) : string("::Ice::Object");
-            H << nl << "using " << baseName << "::__writeImpl;";
-            H << nl << "using " << baseName << "::__readImpl;";
-        }
+        H << nl << "virtual void __writeImpl(::Ice::OutputStream*) const;";
+        H << nl << "virtual void __readImpl(::Ice::InputStream*);";
 
         if(preserved && !basePreserved)
         {
             C << sp;
-            C << nl << "void" << nl << scoped.substr(2)
-              << "::__write(::IceInternal::BasicStream* __os) const";
+            C << nl << "void" << nl << scoped.substr(2) << "::__write(::Ice::OutputStream* __os) const";
             C << sb;
-            C << nl << "__os->startWriteObject(__slicedData);";
+            C << nl << "__os->startValue(__slicedData);";
             C << nl << "__writeImpl(__os);";
-            C << nl << "__os->endWriteObject();";
+            C << nl << "__os->endValue();";
             C << eb;
 
             C << sp;
-            C << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)";
+            C << nl << "void" << nl << scoped.substr(2) << "::__read(::Ice::InputStream* __is)";
             C << sb;
-            C << nl << "__is->startReadObject();";
+            C << nl << "__is->startValue();";
             C << nl << "__readImpl(__is);";
-            C << nl << "__slicedData = __is->endReadObject(true);";
+            C << nl << "__slicedData = __is->endValue(true);";
             C << eb;
         }
 
         C << sp;
-        C << nl << "void" << nl << scoped.substr(2)
-          << "::__writeImpl(::IceInternal::BasicStream* __os) const";
+        C << nl << "void" << nl << scoped.substr(2) << "::__writeImpl(::Ice::OutputStream* __os) const";
         C << sb;
-        C << nl << "__os->startWriteSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");";
-        writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true);
-        C << nl << "__os->endWriteSlice();";
+        C << nl << "__os->startSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");";
+        C << nl << "Ice::StreamWriter<" << scoped.substr(2) << ", ::Ice::OutputStream>::write(__os, *this);";
+        C << nl << "__os->endSlice();";
         if(base)
         {
             emitUpcall(base, "::__writeImpl(__os);");
@@ -3406,60 +2982,17 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
         C << eb;
 
         C << sp;
-        C << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::IceInternal::BasicStream* __is)";
+        C << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::Ice::InputStream* __is)";
         C << sb;
-        C << nl << "__is->startReadSlice();";
-        writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false);
-        C << nl << "__is->endReadSlice();";
+        C << nl << "__is->startSlice();";
+        C << nl << "Ice::StreamReader<" << scoped.substr(2) << ", ::Ice::InputStream>::read(__is, *this);";
+        C << nl << "__is->endSlice();";
         if(base)
         {
             emitUpcall(base, "::__readImpl(__is);");
         }
         C << eb;
 
-        if(_stream)
-        {
-            if(preserved && !basePreserved)
-            {
-                C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(const ::Ice::OutputStreamPtr& __os) const";
-                C << sb;
-                C << nl << "__os->startObject(__slicedData);";
-                C << nl << "__writeImpl(__os);";
-                C << nl << "__os->endObject();";
-                C << eb;
-
-                C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(const ::Ice::InputStreamPtr& __is)";
-                C << sb;
-                C << nl << "__is->startObject();";
-                C << nl << "__readImpl(__is);";
-                C << nl << "__slicedData = __is->endObject(true);";
-                C << eb;
-            }
-
-            C << sp << nl << "void" << nl << scoped.substr(2)
-              << "::__writeImpl(const ::Ice::OutputStreamPtr& __os) const";
-            C << sb;
-            C << nl << "__os->startSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");";
-            writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true);
-            C << nl << "__os->endSlice();";
-            if(base)
-            {
-                emitUpcall(base, "::__writeImpl(__os);");
-            }
-            C << eb;
-
-            C << sp << nl << "void" << nl << scoped.substr(2) << "::__readImpl(const ::Ice::InputStreamPtr& __is)";
-            C << sb;
-            C << nl << "__is->startSlice();";
-            writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false);
-            C << nl << "__is->endSlice();";
-            if(base)
-            {
-                emitUpcall(base, "::__readImpl(__is);");
-            }
-            C << eb;
-        }
-
         if(!p->isAbstract() || p->compactId() >= 0)
         {
             C << sp << nl << "namespace";
@@ -3468,22 +3001,22 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
             if(!p->isAbstract())
             {
                 string initName = p->flattenedScope() + p->name() + "_init";
-                C << sp << nl << "const ::IceInternal::DefaultObjectFactoryInit< " << scoped << "> "
+                C << nl << "const ::IceInternal::DefaultValueFactoryInit< " << scoped << "> "
                   << initName << "(\"" << p->scoped() << "\");";
             }
             if(p->compactId() >= 0)
             {
                 string initName = p->flattenedScope() + p->name() + "_compactIdInit";
-                C << sp << nl << "const ::IceInternal::CompactIdInit "
+                C << nl << "const ::IceInternal::CompactIdInit "
                   << initName << "(\"" << p->scoped() << "\", " << p->compactId() << ");";
             }
             C << nl << "}";
 
             if(!p->isAbstract())
             {
-                C << sp << nl << "::Ice::ObjectFactoryPtr" << nl << scoped.substr(2) << "::ice_factory()";
+                C << sp << nl << "::Ice::ValueFactoryPtr" << nl << scoped.substr(2) << "::ice_factory()";
                 C << sb;
-                C << nl << "return ::IceInternal::factoryTable->getObjectFactory(" << scoped << "::ice_staticId());";
+                C << nl << "return ::IceInternal::factoryTable->getValueFactory(" << scoped << "::ice_staticId());";
                 C << eb;
             }
         }
@@ -3492,7 +3025,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
     //
     // Emit data members. Access visibility may be specified by metadata.
     //
-    bool inProtected = true;
+    bool generateFriend = false;
     DataMemberList dataMembers = p->dataMembers();
     bool prot = p->hasMetaData("protected");
     for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
@@ -3506,6 +3039,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
                 H.inc();
                 inProtected = true;
             }
+            generateFriend = true;
         }
         else
         {
@@ -3521,29 +3055,19 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
         emitDataMember(*q);
     }
 
-    if(!p->isAbstract())
+    if(!p->isLocal() && preserved && !basePreserved)
     {
-        //
-        // We add a protected destructor to force heap instantiation of the class.
-        //
         if(!inProtected)
         {
             H.dec();
-            H << nl << "protected:";
+            H << sp << nl << "protected:";
             H.inc();
             inProtected = true;
         }
-        H << sp << nl << "virtual ~" << fixKwd(p->name()) << "() {}";
-
-        if(!_doneStaticSymbol)
-        {
-            H.dec();
-            H << sp << nl << "friend class " << p->name() << "__staticInit;";
-            H.inc();
-        }
+        H << sp << nl << "::Ice::SlicedDataPtr __slicedData;";
     }
 
-    if(!p->isLocal() && preserved && !basePreserved)
+    if(generateFriend)
     {
         if(!inProtected)
         {
@@ -3552,7 +3076,12 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
             H.inc();
             inProtected = true;
         }
-        H << sp << nl << "::Ice::SlicedDataPtr __slicedData;";
+
+        H << sp;
+        H << nl << "template<typename T, typename S>";
+        H << nl << "friend struct Ice::StreamWriter;";
+        H << nl << "template<typename T, typename S>";
+        H << nl << "friend struct Ice::StreamReader;";
     }
 
     H << eb << ';';
@@ -3560,40 +3089,11 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
     if(!p->isAbstract() && !p->isLocal() && !_doneStaticSymbol)
     {
         //
-        // We need an instance here to trigger initialization if the implementation is in a shared library.
+        // We need an instance here to trigger initialization if the implementation is in a static library.
         // But we do this only once per source file, because a single instance is sufficient to initialize
-        // all of the globals in a shared library.
-        //
-        // For a Slice class Foo, we instantiate a dummy class Foo__staticInit instead of using a static
-        // Foo instance directly because Foo has a protected destructor.
+        // all of the globals in a compilation unit.
         //
-        H.zeroIndent();
-        H << nl << "#if !defined(_MSC_VER) || (_MSC_VER < 1900)";
-        H.restoreIndent();
-        H << nl << "//";
-        H << nl << "// COMPILERFIX: Visual Studio 2015 update 1 fails to access";
-        H << nl << "// the proected destructor from a friend class.";
-        H << nl << "//";
-
-        H << sp << nl << "class " << p->name() << "__staticInit";
-        H << sb;
-        H.dec();
-        H << nl << "public:";
-        H.inc();
-        H << sp << nl << scoped << " _init;";
-        H << eb << ';';
-        _doneStaticSymbol = true;
-        H << sp << nl << "static " << p->name() << "__staticInit _" << p->name() << "_init;";
-
-        H.zeroIndent();
-        H << nl << "#else";
-        H.restoreIndent();
-
-        H << nl << "static auto _" << p->name() << "_init = " << p->scoped() << "::ice_factory;";
-
-        H.zeroIndent();
-        H << nl << "#endif";
-        H.restoreIndent();
+        H << nl << "static ::Ice::ValueFactoryPtr _" << p->name() << "_init = " << p->scoped() << "::ice_factory();";
     }
 
     if(p->isLocal())
@@ -3732,7 +3232,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
             args += ", ";
         }
 
-        params += "const ::Ice::Current& = ::Ice::Current())";
+        params += "const ::Ice::Current& = ::Ice::noExplicitCurrent)";
         paramsDecl += "const ::Ice::Current& __current)";
         args += "__current)";
     }
@@ -3743,11 +3243,11 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
         args += ')';
     }
 
-    paramsAMD += "const ::Ice::Current& = ::Ice::Current())";
+    paramsAMD += "const ::Ice::Current& = ::Ice::noExplicitCurrent)";
     paramsDeclAMD += "const ::Ice::Current& __current)";
     argsAMD += "__current)";
 
-    bool isConst = (p->mode() == Operation::Nonmutating) || p->hasMetaData("cpp:const");
+    string isConst = ((p->mode() == Operation::Nonmutating) || p->hasMetaData("cpp:const")) ? " const" : "";
     bool amd = !cl->isLocal() && (cl->hasMetaData("amd") || p->hasMetaData("amd"));
 
     string deprecateSymbol = getDeprecateSymbol(p, cl);
@@ -3755,24 +3255,21 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
     H << sp;
     if(!amd)
     {
-        H << nl << deprecateSymbol << "virtual " << retS << ' ' << fixKwd(name) << params
-          << (isConst ? " const" : "") << " = 0;";
+        H << nl << deprecateSymbol << "virtual " << retS << ' ' << fixKwd(name) << params << isConst << " = 0;";
     }
     else
     {
-        H << nl << deprecateSymbol << "virtual void " << name << "_async" << paramsAMD
-          << (isConst ? " const" : "") << " = 0;";
+        H << nl << deprecateSymbol << "virtual void " << name << "_async" << paramsAMD << isConst << " = 0;";
     }
 
     if(!cl->isLocal())
     {
         H << nl << "::Ice::DispatchStatus ___" << name
-          << "(::IceInternal::Incoming&, const ::Ice::Current&)" << (isConst ? " const" : "") << ';';
+          << "(::IceInternal::Incoming&, const ::Ice::Current&)" << isConst << ';';
 
         C << sp;
         C << nl << "::Ice::DispatchStatus" << nl << scope.substr(2) << "___" << name
-          << "(::IceInternal::Incoming& __inS";
-        C << ", const ::Ice::Current& __current)" << (isConst ? " const" : "");
+          << "(::IceInternal::Incoming& __inS" << ", const ::Ice::Current& __current)" << isConst;
         C << sb;
         if(!amd)
         {
@@ -3797,12 +3294,12 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
 
             if(!inParams.empty())
             {
-                C << nl << "::IceInternal::BasicStream* __is = __inS.startReadParams();";
+                C << nl << "::Ice::InputStream* __is = __inS.startReadParams();";
                 writeAllocateCode(C, inParams, 0, true, _useWstring | TypeContextInParam);
                 writeUnmarshalCode(C, inParams, 0, true, TypeContextInParam);
                 if(p->sendsClasses(false))
                 {
-                    C << nl << "__is->readPendingObjects();";
+                    C << nl << "__is->readPendingValues();";
                 }
                 C << nl << "__inS.endReadParams();";
             }
@@ -3825,12 +3322,12 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
             C << fixKwd(name) << args << ';';
             if(ret || !outParams.empty())
             {
-                C << nl << "::IceInternal::BasicStream* __os = __inS.__startWriteParams("
+                C << nl << "::Ice::OutputStream* __os = __inS.__startWriteParams("
                   << opFormatTypeToString(p) << ");";
                 writeMarshalCode(C, outParams, p, true);
                 if(p->returnsClasses(false))
                 {
-                    C << nl << "__os->writePendingObjects();";
+                    C << nl << "__os->writePendingValues();";
                 }
                 C << nl << "__inS.__endWriteParams(true);";
             }
@@ -3859,12 +3356,12 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
 
             if(!inParams.empty())
             {
-                C << nl << "::IceInternal::BasicStream* __is = __inS.startReadParams();";
+                C << nl << "::Ice::InputStream* __is = __inS.startReadParams();";
                 writeAllocateCode(C, inParams, 0, true, _useWstring | TypeContextInParam);
                 writeUnmarshalCode(C, inParams, 0, true, TypeContextInParam);
                 if(p->sendsClasses(false))
                 {
-                    C << nl << "__is->readPendingObjects();";
+                    C << nl << "__is->readPendingValues();";
                 }
                 C << nl << "__inS.endReadParams();";
             }
@@ -3892,7 +3389,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
         C << eb;
     }
 
-    if(cl->isLocal() && (cl->hasMetaData("async") || p->hasMetaData("async")))
+    if(cl->isLocal() && (cl->hasMetaData("async-oneway") || p->hasMetaData("async-oneway")))
     {
         vector<string> paramsDeclAMI;
         vector<string> outParamsDeclAMI;
@@ -3924,12 +3421,6 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
             }
         }
 
-        H << nl << "// Only supported with C++ 11 support enabled";
-        H << nl << "virtual ::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI
-          << "const ::IceInternal::Function<void (const ::Ice::Exception&)>& exception"
-          << "const ::IceInternal::Function<void (bool)>& sent = ::IceInternal::Function<void (bool)>()"
-          << epar << " = 0;";
-
         H << sp << nl << "virtual ::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI << epar << " = 0;";
 
         H << sp << nl << "virtual ::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI
@@ -4029,7 +3520,9 @@ void
 Slice::Gen::ObjectVisitor::emitGCVisitCode(const TypePtr& p, const string& prefix, const string& name, int level)
 {
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(p);
-    if((builtin && BuiltinPtr::dynamicCast(p)->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(p))
+    if((builtin &&
+       (BuiltinPtr::dynamicCast(p)->kind() == Builtin::KindObject || BuiltinPtr::dynamicCast(p)->kind() == Builtin::KindValue)) ||
+       ClassDeclPtr::dynamicCast(p))
     {
         C << nl << "if(" << prefix << name << ')';
         C << sb;
@@ -4216,7 +3709,7 @@ Slice::Gen::AsyncCallbackVisitor::AsyncCallbackVisitor(Output& h, Output&, const
 bool
 Slice::Gen::AsyncCallbackVisitor::visitModuleStart(const ModulePtr& p)
 {
-    if(!p->hasNonLocalClassDefs() && !p->hasContentsWithMetaData("async"))
+    if(!p->hasNonLocalClassDefs() && !p->hasContentsWithMetaData("async-oneway"))
     {
         return false;
     }
@@ -4254,7 +3747,7 @@ Slice::Gen::AsyncCallbackVisitor::visitOperation(const OperationPtr& p)
 {
     ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container());
 
-    if(cl->isLocal() && !(cl->hasMetaData("async") || p->hasMetaData("async")))
+    if(cl->isLocal() && !(cl->hasMetaData("async-oneway") || p->hasMetaData("async-oneway")))
     {
         return;
     }
@@ -4263,7 +3756,7 @@ Slice::Gen::AsyncCallbackVisitor::visitOperation(const OperationPtr& p)
     // Write the callback base class and callback smart pointer.
     //
     string delName = "Callback_" + cl->name() + "_" + p->name();
-    H << sp << nl << "class " << delName << "_Base : virtual public ::IceInternal::CallbackBase { };";
+    H << sp << nl << "class " << delName << "_Base : public virtual ::IceInternal::CallbackBase { };";
     H << nl << "typedef ::IceUtil::Handle< " << delName << "_Base> " << delName << "Ptr;";
 }
 
@@ -4301,7 +3794,6 @@ void
 Slice::Gen::AsyncCallbackTemplateVisitor::visitModuleEnd(const ModulePtr&)
 {
     _useWstring = resetUseWstring(_useWstringHist);
-
     H << sp << nl << '}';
 }
 
@@ -4490,7 +3982,9 @@ Slice::Gen::AsyncCallbackTemplateVisitor::generateOperation(const OperationPtr&
         H << epar << ';';
         H << eb;
         H << eb;
+        H.dec();
         H << sp << nl << "private:";
+        H.inc();
         H << sp << nl << "Response _response;";
     }
     H << eb << ';';
@@ -4575,57 +4069,8 @@ Slice::Gen::ImplVisitor::ImplVisitor(Output& h, Output& c, const string& dllExpo
 {
 }
 
-void
-Slice::Gen::ImplVisitor::writeDecl(Output& out, const string& name, const TypePtr& type, const StringList& metaData)
-{
-    out << nl << typeToString(type, metaData, _useWstring) << ' ' << name;
-
-    BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-    if(builtin)
-    {
-        switch(builtin->kind())
-        {
-            case Builtin::KindBool:
-            {
-                out << " = false";
-                break;
-            }
-            case Builtin::KindByte:
-            case Builtin::KindShort:
-            case Builtin::KindInt:
-            case Builtin::KindLong:
-            {
-                out << " = 0";
-                break;
-            }
-            case Builtin::KindFloat:
-            case Builtin::KindDouble:
-            {
-                out << " = 0.0";
-                break;
-            }
-            case Builtin::KindString:
-            case Builtin::KindObject:
-            case Builtin::KindObjectProxy:
-            case Builtin::KindLocalObject:
-            {
-                break;
-            }
-        }
-    }
-
-    EnumPtr en = EnumPtr::dynamicCast(type);
-    if(en)
-    {
-        EnumeratorList enumerators = en->getEnumerators();
-        out << " = " << fixKwd(en->scope()) << fixKwd(enumerators.front()->name());
-    }
-
-    out << ';';
-}
-
-void
-Slice::Gen::ImplVisitor::writeReturn(Output& out, const TypePtr& type, const StringList& metaData)
+string
+Slice::Gen::ImplVisitor::defaultValue(const TypePtr& type, const StringList& metaData) const
 {
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
     if(builtin)
@@ -4634,84 +4079,76 @@ Slice::Gen::ImplVisitor::writeReturn(Output& out, const TypePtr& type, const Str
         {
             case Builtin::KindBool:
             {
-                out << nl << "return false;";
-                break;
+                return "false";
             }
             case Builtin::KindByte:
             case Builtin::KindShort:
             case Builtin::KindInt:
             case Builtin::KindLong:
             {
-                out << nl << "return 0;";
-                break;
+                return "0";
             }
             case Builtin::KindFloat:
             case Builtin::KindDouble:
             {
-                out << nl << "return 0.0;";
-                break;
+                return "0.0";
             }
             case Builtin::KindString:
             {
-                out << nl << "return ::std::string();";
-                break;
+                return "::std::string()";
             }
+            case Builtin::KindValue:
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
             case Builtin::KindLocalObject:
             {
-                out << nl << "return 0;";
-                break;
+                return "0";
             }
         }
     }
     else
     {
         ProxyPtr prx = ProxyPtr::dynamicCast(type);
-        if(prx)
+
+        if(ProxyPtr::dynamicCast(type) || ClassDeclPtr::dynamicCast(type))
         {
-            out << nl << "return 0;";
+            return "0";
         }
-        else
+
+        StructPtr st = StructPtr::dynamicCast(type);
+        if(st)
         {
-            ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
-            if(cl)
-            {
-                out << nl << "return 0;";
-            }
-            else
-            {
-                StructPtr st = StructPtr::dynamicCast(type);
-                if(st)
-                {
-                    out << nl << "return " << fixKwd(st->scoped()) << "();";
-                }
-                else
-                {
-                    EnumPtr en = EnumPtr::dynamicCast(type);
-                    if(en)
-                    {
-                        EnumeratorList enumerators = en->getEnumerators();
-                        out << nl << "return " << fixKwd(en->scope()) << fixKwd(enumerators.front()->name()) << ';';
-                    }
-                    else
-                    {
-                        SequencePtr seq = SequencePtr::dynamicCast(type);
-                        if(seq)
-                        {
-                            out << nl << "return " << typeToString(seq, metaData, _useWstring) << "();";
-                        }
-                        else
-                        {
-                            DictionaryPtr dict = DictionaryPtr::dynamicCast(type);
-                            assert(dict);
-                            out << nl << "return " << fixKwd(dict->scoped()) << "();";
-                        }
-                    }
-                }
-            }
+           return fixKwd(st->scoped()) + "()";
+        }
+
+        EnumPtr en = EnumPtr::dynamicCast(type);
+        if(en)
+        {
+            EnumeratorList enumerators = en->getEnumerators();
+            return fixKwd(en->scope() + enumerators.front()->name());
+        }
+
+        SequencePtr seq = SequencePtr::dynamicCast(type);
+        if(seq)
+        {
+            return typeToString(seq, metaData, _useWstring | TypeContextCpp11) + "()";
+        }
+
+        DictionaryPtr dict = DictionaryPtr::dynamicCast(type);
+        if(dict)
+        {
+            return fixKwd(dict->scoped()) + "()";
         }
     }
+
+    assert(false);
+    return "???";
+}
+
+void
+Slice::Gen::ImplVisitor::writeReturn(Output& out, const TypePtr& type, const StringList& metaData)
+{
+    out << nl << "return " << defaultValue(type, metaData) << ";";
 }
 
 bool
@@ -4721,32 +4158,8 @@ Slice::Gen::ImplVisitor::visitModuleStart(const ModulePtr& p)
     {
         return false;
     }
-
     _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
-
-    set<string> includes;
-    ClassList classes = p->classes();
-    for(ClassList::const_iterator q = classes.begin(); q != classes.end(); ++q)
-    {
-        ClassList bases = (*q)->bases();
-        for(ClassList::const_iterator r = bases.begin(); r != bases.end(); ++r)
-        {
-            if((*r)->isAbstract())
-            {
-                includes.insert((*r)->name());
-            }
-        }
-    }
-
-    for(set<string>::const_iterator it = includes.begin(); it != includes.end(); ++it)
-    {
-        H << nl << "#include <" << *it << "I.h>";
-    }
-
-    string name = fixKwd(p->name());
-
-    H << sp << nl << "namespace " << name << nl << '{';
-
+    H << sp << nl << "namespace " << fixKwd(p->name()) << nl << '{';
     return true;
 }
 
@@ -4772,38 +4185,25 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
     string name = p->name();
     string scope = fixKwd(p->scope());
     string cls = scope.substr(2) + name + "I";
-    string classScopedAMD = scope + "AMD_" + name;
     ClassList bases = p->bases();
 
     H << sp;
-    H << nl << "class " << name << "I : ";
-    H.useCurrentPosAsIndent();
-    H << "virtual public " << fixKwd(name);
-    for(ClassList::const_iterator q = bases.begin(); q != bases.end(); ++q)
-    {
-        H << ',' << nl << "virtual public " << fixKwd((*q)->scope());
-        if((*q)->isAbstract())
-        {
-            H << (*q)->name() << "I";
-        }
-        else
-        {
-            H << fixKwd((*q)->name());
-        }
-    }
-    H.restoreIndent();
+    H << nl << "class " << name << "I : public virtual " << fixKwd(name);
 
     H << sb;
     H.dec();
     H << nl << "public:";
     H.inc();
 
-    OperationList ops = p->operations();
+    OperationList ops = p->allOperations();
 
     for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
     {
         OperationPtr op = (*r);
         string opName = op->name();
+        string isConst = ((op->mode() == Operation::Nonmutating) || op->hasMetaData("cpp:const")) ? " const" : "";
+
+        string classScopedAMD = scope + "AMD_" + ClassDefPtr::dynamicCast(op->container())->name();
 
         TypePtr ret = op->returnType();
         string retS = returnTypeToString(ret, op->returnIsOptional(), op->getMetaData(), _useWstring);
@@ -4825,10 +4225,7 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
             }
             H << ',' << nl << "const Ice::Current&";
             H.restoreIndent();
-
-            bool isConst = (op->mode() == Operation::Nonmutating) || op->hasMetaData("cpp:const");
-
-            H << ")" << (isConst ? " const" : "") << ';';
+            H << ")" << isConst << ';';
 
             C << sp << nl << "void" << nl << scope << name << "I::" << opName << "_async(";
             C.useCurrentPosAsIndent();
@@ -4843,7 +4240,7 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
             }
             C << ',' << nl << "const Ice::Current& current";
             C.restoreIndent();
-            C << ")" << (isConst ? " const" : "");
+            C << ")" << isConst;
             C << sb;
 
             string result = "r";
@@ -4855,22 +4252,11 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
                     break;
                 }
             }
-            if(ret)
-            {
-                writeDecl(C, result, ret, op->getMetaData());
-            }
-            for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
-            {
-                if((*q)->isOutParam())
-                {
-                    writeDecl(C, fixKwd((*q)->name()), (*q)->type(), (*q)->getMetaData());
-                }
-            }
 
             C << nl << opName << "CB->ice_response(";
             if(ret)
             {
-                C << result;
+                C << defaultValue(ret, op->getMetaData());
             }
             for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
             {
@@ -4880,7 +4266,7 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
                     {
                         C << ", ";
                     }
-                    C << fixKwd((*q)->name());
+                    C << defaultValue((*q)->type(), op->getMetaData());
                 }
             }
             C << ");";
@@ -4898,17 +4284,14 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
                 {
                     H << ',' << nl;
                 }
-                StringList metaData = (*q)->getMetaData();
-                string typeString;
                 if((*q)->isOutParam())
                 {
-                    typeString = outputTypeToString((*q)->type(), (*q)->optional(), metaData, _useWstring);
+                    H << outputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring);
                 }
                 else
                 {
-                    typeString = inputTypeToString((*q)->type(), (*q)->optional(), metaData, _useWstring);
+                    H << inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring);
                 }
-                H << typeString;
             }
             if(!p->isLocal())
             {
@@ -4920,9 +4303,9 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
             }
             H.restoreIndent();
 
-            bool isConst = (op->mode() == Operation::Nonmutating) || op->hasMetaData("cpp:const");
+            string isConst = ((op->mode() == Operation::Nonmutating) || op->hasMetaData("cpp:const")) ? " const" : "";
 
-            H << ")" << (isConst ? " const" : "") << ';';
+            H << ")" << isConst << ';';
 
             C << sp << nl << retS << nl;
             C << scope.substr(2) << name << "I::" << fixKwd(opName) << '(';
@@ -4933,17 +4316,16 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
                 {
                     C << ',' << nl;
                 }
-                StringList metaData = (*q)->getMetaData();
-                string typeString;
                 if((*q)->isOutParam())
                 {
-                    typeString = outputTypeToString((*q)->type(), (*q)->optional(), metaData, _useWstring);
+                    C << outputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring) << " "
+                      << fixKwd((*q)->name());
                 }
                 else
                 {
-                    typeString = inputTypeToString((*q)->type(), (*q)->optional(), metaData, _useWstring);
+                    C << inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring) << " /*"
+                      << fixKwd((*q)->name()) << "*/";
                 }
-                C << typeString << ' ' << fixKwd((*q)->name());
             }
             if(!p->isLocal())
             {
@@ -4955,7 +4337,7 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
             }
             C.restoreIndent();
             C << ')';
-            C << (isConst ? " const" : "");
+            C << isConst;
             C << sb;
 
             if(ret)
@@ -4974,8 +4356,8 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
     return true;
 }
 
-Slice::Gen::AsyncVisitor::AsyncVisitor(Output& h, Output&, const string& dllExport) :
-    H(h), _dllExport(dllExport), _useWstring(false)
+Slice::Gen::AsyncVisitor::AsyncVisitor(Output& h, Output& c, const string& dllExport) :
+    H(h), C(c), _dllExport(dllExport), _useWstring(false)
 {
 }
 
@@ -5085,17 +4467,27 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
         }
     }
 
-    paramsInvoke.push_back("const ::Ice::Context*");
-    paramsDeclInvoke.push_back("const ::Ice::Context* __ctx");
+    paramsInvoke.push_back("const ::Ice::Context&");
+    paramsDeclInvoke.push_back("const ::Ice::Context& __ctx");
 
     if(cl->hasMetaData("amd") || p->hasMetaData("amd"))
     {
-        H << sp << nl << "class " << _dllExport << classNameAMD << '_' << name
-          << " : virtual public ::Ice::AMDCallback";
+        string cbName = classNameAMD + '_' + name;
+
+        H << sp << nl << "class " << _dllExport << cbName
+          << " : public virtual ::Ice::AMDCallback";
         H << sb;
         H.dec();
         H << nl << "public:";
         H.inc();
+
+        // Out of line dtor to avoid weak vtable
+        H << sp << nl << "virtual ~" << cbName << "();";
+        C << sp;
+        C << nl << classScope.substr(2) << cbName << "::~" << cbName << "()";
+        C << sb;
+        C << eb;
+
         H << sp;
         H << nl << "virtual void ice_response" << spar << paramsAMD << epar << " = 0;";
         H << eb << ';';
@@ -5279,11 +4671,11 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p)
     {
         C << nl << "try";
         C << sb;
-        C << nl << "::IceInternal::BasicStream* __os = __startWriteParams(" << opFormatTypeToString(p) << ");";
+        C << nl << "::Ice::OutputStream* __os = __startWriteParams(" << opFormatTypeToString(p) << ");";
         writeMarshalCode(C, outParams, p, false, TypeContextInParam);
         if(p->returnsClasses(false))
         {
-            C << nl << "__os->writePendingObjects();";
+            C << nl << "__os->writePendingValues();";
         }
         C << nl << "__endWriteParams(true);";
         C << eb;
@@ -5343,6 +4735,7 @@ Slice::Gen::StreamVisitor::visitModuleStart(const ModulePtr& m)
 {
     if(!m->hasNonLocalContained(Contained::ContainedTypeStruct) &&
        !m->hasNonLocalContained(Contained::ContainedTypeEnum) &&
+       !m->hasNonLocalContained(Contained::ContainedTypeClass) &&
        !m->hasNonLocalContained(Contained::ContainedTypeException))
     {
         return false;
@@ -5377,6 +4770,16 @@ Slice::Gen::StreamVisitor::visitModuleEnd(const ModulePtr& m)
 }
 
 bool
+Slice::Gen::StreamVisitor::visitClassDefStart(const ClassDefPtr& c)
+{
+    if(!c->isLocal())
+    {
+        writeStreamHelpers(H, true, c, c->dataMembers(), c->orderedOptionalDataMembers());
+    }
+    return false;
+}
+
+bool
 Slice::Gen::StreamVisitor::visitExceptionStart(const ExceptionPtr& p)
 {
     if(!p->isLocal())
@@ -5387,6 +4790,8 @@ Slice::Gen::StreamVisitor::visitExceptionStart(const ExceptionPtr& p)
         H << sb;
         H << nl << "static const StreamHelperCategory helper = StreamHelperCategoryUserException;";
         H << eb << ";" << nl;
+
+        writeStreamHelpers(H, true, p, p->dataMembers(), p->orderedOptionalDataMembers());
     }
     return false;
 }
@@ -5425,53 +4830,7 @@ Slice::Gen::StreamVisitor::visitStructStart(const StructPtr& p)
         }
         H << eb << ";" << nl;
 
-        DataMemberList dataMembers = p->dataMembers();
-
-        string holder = classMetaData ? "v->" : "v.";
-
-        H << nl << "template<class S>";
-        H << nl << "struct StreamWriter< " << fullStructName << ", S>";
-        H << sb;
-        H << nl << "static void write(S* __os, const " <<  fullStructName << "& v)";
-        H << sb;
-        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
-        {
-            writeMarshalUnmarshalDataMemberInHolder(H, holder, *q, true);
-        }
-        H << eb;
-        H << eb << ";" << nl;
-
-        H << nl << "template<class S>";
-        H << nl << "struct StreamReader< " << fullStructName << ", S>";
-        H << sb;
-        H << nl << "static void read(S* __is, " << fullStructName << "& v)";
-        H << sb;
-        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
-        {
-            writeMarshalUnmarshalDataMemberInHolder(H, holder, *q, false);
-        }
-        H << eb;
-        H << eb << ";" << nl;
-
-        if(!_dllExport.empty())
-        {
-            //
-            // We tell "importers" that the implementation exports these instantiations
-            //
-            H << nl << "#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(";
-            H << _dllExport.substr(0, _dllExport.size() - 1) + "_EXPORTS) && !defined(ICE_STATIC_LIBS)";
-            H << nl << "template struct " << _dllExport << "StreamWriter< " << fullStructName << ", ::IceInternal::BasicStream>;";
-            H << nl << "template struct " << _dllExport << "StreamReader< " << fullStructName << ", ::IceInternal::BasicStream>;";
-            H << nl << "#endif" << nl;
-
-            //
-            // The instantations:
-            //
-            C << nl << "#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)";
-            C << nl << "template struct " << _dllExport << "StreamWriter< " << fullStructName << ", ::IceInternal::BasicStream>;";
-            C << nl << "template struct " << _dllExport << "StreamReader< " << fullStructName << ", ::IceInternal::BasicStream>;";
-            C << nl << "#endif";
-        }
+        writeStreamHelpers(H, true, p, p->dataMembers(), DataMemberList());
     }
     return false;
 }
@@ -5508,6 +4867,7 @@ Slice::Gen::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
 
     //
     // Validate global metadata in the top-level file and all included files.
+    // Note that these metadata can only be cpp:, never cpp98: or cpp11:
     //
     StringList files = p->allFiles();
 
@@ -5699,13 +5059,36 @@ void
 Slice::Gen::MetaDataVisitor::validate(const SyntaxTreeBasePtr& cont, const StringList& metaData,
                                       const string& file, const string& line, bool /*inParam*/)
 {
-    static const string prefix = "cpp:";
+    static const string cppPrefix = "cpp:";
+    static const string cpp11Prefix = "cpp11:";
+    static const string cpp98Prefix  = "cpp98:";
+
     for(StringList::const_iterator p = metaData.begin(); p != metaData.end(); ++p)
     {
         string s = *p;
+
         if(_history.count(s) == 0)
         {
-            if(s.find(prefix) == 0)
+            string prefix;
+            bool cpp98 = false;
+            bool cpp11 = false;
+
+            if(s.find(cppPrefix) == 0)
+            {
+                prefix = cppPrefix;
+            }
+            else if(s.find(cpp98Prefix) == 0)
+            {
+                prefix = cpp98Prefix;
+                cpp98 = true;
+            }
+            else if(s.find(cpp11Prefix) == 0)
+            {
+                prefix = cpp11Prefix;
+                cpp11 = true;
+            }
+
+            if(!prefix.empty())
             {
                 string ss = s.substr(prefix.size());
                 if(ss == "type:wstring" || ss == "type:string")
@@ -5738,18 +5121,46 @@ Slice::Gen::MetaDataVisitor::validate(const SyntaxTreeBasePtr& cont, const Strin
                 {
                     continue;
                 }
-                if(StructPtr::dynamicCast(cont) && (ss == "class" || ss == "comparable"))
+                if(!cpp11 && StructPtr::dynamicCast(cont) && (ss == "class" || ss == "comparable"))
                 {
                     continue;
                 }
-                if(ClassDefPtr::dynamicCast(cont) && ss == "virtual")
+
                 {
-                    continue;
+                    ClassDefPtr cl = ClassDefPtr::dynamicCast(cont);
+                    if(cl && ((!cpp11 && ss == "virtual") ||
+                              (cl->isLocal() && ss.find("type:") == 0) ||
+                              (!cpp11 && cl->isLocal() && ss == "comparable")))
+                    {
+                        continue;
+                    }
                 }
                 if(ExceptionPtr::dynamicCast(cont) && ss == "ice_print")
                 {
                     continue;
                 }
+                if(!cpp98 && EnumPtr::dynamicCast(cont) && ss == "unscoped")
+                {
+                    continue;
+                }
+
+                {
+                    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(cont);
+                    if(cl && cl->isLocal() && ss.find("type:") == 0)
+                    {
+                        continue;
+                    }
+                }
+                emitWarning(file, line, "ignoring invalid metadata `" + s + "'");
+            }
+
+            if(s.find("delegate") == 0)
+            {
+                ClassDefPtr cl = ClassDefPtr::dynamicCast(cont);
+                if(cl && cl->isDelegate())
+                {
+                    continue;
+                }
                 emitWarning(file, line, "ignoring invalid metadata `" + s + "'");
             }
             _history.insert(s);
@@ -5757,6 +5168,249 @@ Slice::Gen::MetaDataVisitor::validate(const SyntaxTreeBasePtr& cont, const Strin
     }
 }
 
+
+void
+Slice::Gen::normalizeMetaData(const UnitPtr& u, bool cpp11)
+{
+    NormalizeMetaDataVisitor visitor(cpp11);
+    u->visit(&visitor, false);
+}
+
+Slice::Gen::NormalizeMetaDataVisitor::NormalizeMetaDataVisitor(bool cpp11) :
+    _cpp11(cpp11)
+{
+}
+
+bool
+Slice::Gen::NormalizeMetaDataVisitor::visitUnitStart(const UnitPtr& p)
+{
+    return true;
+}
+
+bool
+Slice::Gen::NormalizeMetaDataVisitor::visitModuleStart(const ModulePtr& p)
+{
+    p->setMetaData(normalize(p->getMetaData()));
+    return true;
+}
+
+void
+Slice::Gen::NormalizeMetaDataVisitor::visitModuleEnd(const ModulePtr&)
+{
+}
+
+void
+Slice::Gen::NormalizeMetaDataVisitor::visitClassDecl(const ClassDeclPtr& p)
+{
+    p->setMetaData(normalize(p->getMetaData()));
+}
+
+bool
+Slice::Gen::NormalizeMetaDataVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    p->setMetaData(normalize(p->getMetaData()));
+    return true;
+}
+
+void
+Slice::Gen::NormalizeMetaDataVisitor::visitClassDefEnd(const ClassDefPtr&)
+{
+}
+
+bool
+Slice::Gen::NormalizeMetaDataVisitor::visitExceptionStart(const ExceptionPtr& p)
+{
+    p->setMetaData(normalize(p->getMetaData()));
+    return true;
+}
+
+void
+Slice::Gen::NormalizeMetaDataVisitor::visitExceptionEnd(const ExceptionPtr&)
+{
+}
+
+bool
+Slice::Gen::NormalizeMetaDataVisitor::visitStructStart(const StructPtr& p)
+{
+    p->setMetaData(normalize(p->getMetaData()));
+    return true;
+}
+
+void
+Slice::Gen::NormalizeMetaDataVisitor::visitStructEnd(const StructPtr&)
+{
+}
+
+void
+Slice::Gen::NormalizeMetaDataVisitor::visitOperation(const OperationPtr& p)
+{
+    p->setMetaData(normalize(p->getMetaData()));
+
+    ParamDeclList params = p->parameters();
+    for(ParamDeclList::iterator q = params.begin(); q != params.end(); ++q)
+    {
+        (*q)->setMetaData(normalize((*q)->getMetaData()));
+    }
+}
+
+void
+Slice::Gen::NormalizeMetaDataVisitor::visitDataMember(const DataMemberPtr& p)
+{
+    p->setMetaData(normalize(p->getMetaData()));
+}
+
+void
+Slice::Gen::NormalizeMetaDataVisitor::visitSequence(const SequencePtr& p)
+{
+    p->setMetaData(normalize(p->getMetaData()));
+}
+
+void
+Slice::Gen::NormalizeMetaDataVisitor::visitDictionary(const DictionaryPtr& p)
+{
+    p->setMetaData(normalize(p->getMetaData()));
+}
+
+void
+Slice::Gen::NormalizeMetaDataVisitor::visitEnum(const EnumPtr& p)
+{
+    p->setMetaData(normalize(p->getMetaData()));
+}
+
+void
+Slice::Gen::NormalizeMetaDataVisitor::visitConst(const ConstPtr& p)
+{
+    p->setMetaData(normalize(p->getMetaData()));
+}
+
+
+StringList
+Slice::Gen::NormalizeMetaDataVisitor::normalize(const StringList& metaData)
+{
+    //
+    // if _cpp11: transform "cpp:" into "cpp-all:" and "cpp"
+    //            + transform "cpp11:" into "cpp:" in front
+    //
+    // if !_cpp11: remove "cpp:", transform "cpp-all:" into "cpp"
+    //             + transform "cpp98:" into "cpp:" in front
+
+    //
+    // Note: global metadata like header-ext exists only in cpp:
+    // form and are not processed at all
+    //
+
+    StringList result;
+
+    static const string cppPrefixTable[] =
+    {
+        "array",
+        "class",
+        "comparable",
+        "const",
+        "ice_print",
+        "range",
+        "type:",
+        "unscoped",
+        "view-type:",
+        "virtual",
+        ""
+    };
+
+    static const string cppPrefix = "cpp:";
+    static const string cppAllPrefix = "cpp-all:";
+
+    //
+    // First look for the higher priority cpp98/cpp11, that go to the
+    // front of result
+    //
+
+    static const string cpp11Prefix = "cpp11:";
+    static const string cpp98Prefix = "cpp98:";
+
+    const string altCppPrefix = _cpp11 ? cpp11Prefix : cpp98Prefix;
+
+    for(StringList::const_iterator p = metaData.begin(); p != metaData.end(); ++p)
+    {
+        string s = *p;
+
+        unsigned int i = 0;
+        bool found = false;
+        while(!found)
+        {
+            string m = cppPrefixTable[i++];
+            if(m.empty())
+            {
+                break;
+            }
+            if(s.find(altCppPrefix + m) == 0)
+            {
+                found = true;
+            }
+        }
+
+        if(found)
+        {
+            s.replace(0, altCppPrefix.length(), cppPrefix);
+            result.push_back(s);
+        }
+    }
+
+    //
+    // Then look for the lower-priority "cpp:" / "cpp-all:", pushed back later
+    //
+
+    const string prefix = _cpp11 ? cppPrefix : cppAllPrefix;
+
+    for(StringList::const_iterator p = metaData.begin(); p != metaData.end(); ++p)
+    {
+        string s = *p;
+
+        unsigned int i = 0;
+        bool foundPrefix = false;
+        bool foundOld = false;
+        while(!foundPrefix && !foundOld)
+        {
+            string m = cppPrefixTable[i++];
+            if(m.empty())
+            {
+                break; // while
+            }
+            if(s.find(prefix + m) == 0)
+            {
+                foundPrefix = true;
+            }
+            else if(!_cpp11 && s.find(cppPrefix + m) == 0)
+            {
+                //
+                // We want to filter-out "cpp:" when !_cpp11
+                //
+                foundOld = true;
+            }
+        }
+
+        if(foundPrefix)
+        {
+            if(_cpp11)
+            {
+                result.push_back(s);
+                s.replace(0, prefix.length(), cppAllPrefix);
+                result.push_back(s);
+            }
+            else
+            {
+                s.replace(0, prefix.length(), cppPrefix);
+                result.push_back(s);
+            }
+        }
+        else if(_cpp11 || !foundOld)
+        {
+            result.push_back(s);
+        }
+    }
+
+    return result;
+}
+
 int
 Slice::Gen::setUseWstring(ContainedPtr p, list<int>& hist, int use)
 {
@@ -5795,3 +5449,3039 @@ Slice::Gen::getHeaderExt(const string& file, const UnitPtr& unit)
     }
     return ext;
 }
+
+// C++11 visitors
+Slice::Gen::Cpp11DeclVisitor::Cpp11DeclVisitor(Output& h, Output& c, const string& dllExport) :
+    H(h), C(c), _dllExport(dllExport)
+{
+}
+
+bool
+Slice::Gen::Cpp11DeclVisitor::visitUnitStart(const UnitPtr& p)
+{
+    if(!p->hasClassDecls() && !p->hasNonLocalExceptions())
+    {
+        return false;
+    }
+    C << sp << nl << "namespace" << nl << "{";
+    return true;
+}
+
+void
+Slice::Gen::Cpp11DeclVisitor::visitUnitEnd(const UnitPtr& p)
+{
+    C << sp << nl << "}";
+}
+
+bool
+Slice::Gen::Cpp11DeclVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(p->hasClassDecls())
+    {
+        H << sp << nl << "namespace " << fixKwd(p->name()) << nl << '{' << sp;
+    }
+    return true;
+}
+
+void
+Slice::Gen::Cpp11DeclVisitor::visitModuleEnd(const ModulePtr& p)
+{
+    if(p->hasClassDecls())
+    {
+        H << sp << nl << '}';
+    }
+}
+
+void
+Slice::Gen::Cpp11DeclVisitor::visitClassDecl(const ClassDeclPtr& p)
+{
+    ClassDefPtr def = p->definition();
+    if(def && def->isDelegate())
+    {
+        return;
+    }
+
+    H << nl << "class " << fixKwd(p->name()) << ';';
+    if(p->isInterface() || (def && !def->allOperations().empty()))
+    {
+        H << nl << "class " << p->name() << "Prx;";
+    }
+}
+
+bool
+Slice::Gen::Cpp11DeclVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    if(p->isLocal())
+    {
+        return false;
+    }
+
+    if(!p->isInterface())
+    {
+        C << sp;
+
+        C << nl << "const ::IceInternal::DefaultValueFactoryInit<" << fixKwd(p->scoped()) << "> ";
+        C << p->flattenedScope() + p->name() + "_init" << "(\"" << p->scoped() << "\");";
+
+        if(p->compactId() >= 0)
+        {
+            string n = p->flattenedScope() + p->name() + "_compactIdInit ";
+            C << "const ::IceInternal::CompactIdInit " << n << "(\"" << p->scoped() << "\", " << p->compactId() << ");";
+        }
+    }
+
+    OperationList allOps = p->allOperations();
+    if(p->isInterface() || !allOps.empty())
+    {
+        C << sp;
+
+        ClassList allBases = p->allBases();
+        StringList ids;
+        transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun(&Contained::scoped));
+        StringList other;
+        other.push_back(p->scoped());
+        other.push_back("::Ice::Object");
+        other.sort();
+        ids.merge(other);
+        ids.unique();
+
+        C << nl << "const ::std::string " << p->flattenedScope() << p->name() << "_ids[" << ids.size() << "] =";
+        C << sb;
+        for(StringList::const_iterator r = ids.begin(); r != ids.end();)
+        {
+            C << nl << '"' << *r << '"';
+            if(++r != ids.end())
+            {
+                C << ',';
+            }
+        }
+        C << eb << ';';
+
+        StringList allOpNames;
+        transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), ::IceUtil::constMemFun(&Contained::name));
+        allOpNames.push_back("ice_id");
+        allOpNames.push_back("ice_ids");
+        allOpNames.push_back("ice_isA");
+        allOpNames.push_back("ice_ping");
+        allOpNames.sort();
+        allOpNames.unique();
+
+        C << nl << "const ::std::string " << p->flattenedScope() << p->name() << "_ops[] =";
+        C << sb;
+        for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end();)
+        {
+            C << nl << '"' << *q << '"';
+            if(++q != allOpNames.end())
+            {
+                C << ',';
+            }
+        }
+        C << eb << ';';
+    }
+
+    return true;
+}
+
+bool
+Slice::Gen::Cpp11DeclVisitor::visitExceptionStart(const ExceptionPtr& p)
+{
+    if(p->isLocal())
+    {
+        return false;
+    }
+
+    C << sp;
+    C << nl << "const ::IceInternal::DefaultUserExceptionFactoryInit<" << fixKwd(p->scoped()) << "> ";
+    C << p->flattenedScope() + p->name() + "_init" << "(\"" << p->scoped() << "\");";
+    return false;
+}
+
+void
+Slice::Gen::Cpp11DeclVisitor::visitOperation(const OperationPtr& p)
+{
+    ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container());
+    if(cl && !cl->isLocal())
+    {
+        string flatName = p->flattenedScope() + p->name() + "_name";
+        C << nl << "const ::std::string " << flatName << " = \"" << p->name() << "\";";
+    }
+}
+
+Slice::Gen::Cpp11TypesVisitor::Cpp11TypesVisitor(Output& h, Output& c, const string& dllExport) :
+    H(h), C(c), _dllExport(dllExport), _dllClassExport(toDllClassExport(dllExport)),
+    _dllMemberExport(toDllMemberExport(dllExport)), _doneStaticSymbol(false), _useWstring(false)
+{
+}
+
+bool
+Slice::Gen::Cpp11TypesVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!p->hasOtherConstructedOrExceptions())
+    {
+        return false;
+    }
+
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+    H << sp << nl << "namespace " << fixKwd(p->name()) << nl << '{';
+    return true;
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitModuleEnd(const ModulePtr&)
+{
+    H << sp << nl << '}';
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11TypesVisitor::visitClassDefStart(const ClassDefPtr&)
+{
+    return false;
+}
+
+bool
+Slice::Gen::Cpp11TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
+{
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+
+    string name = fixKwd(p->name());
+    string scoped = fixKwd(p->scoped());
+    ExceptionPtr base = p->base();
+    DataMemberList dataMembers = p->dataMembers();
+    DataMemberList allDataMembers = p->allDataMembers();
+    DataMemberList baseDataMembers;
+
+    vector<string> params;
+    vector<string> allTypes;
+    vector<string> allParamDecls;
+    vector<string> baseParams;
+
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        params.push_back(fixKwd((*q)->name()));
+    }
+
+    for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+    {
+        string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(),
+                                            _useWstring | TypeContextCpp11);
+        allTypes.push_back(typeName);
+        allParamDecls.push_back(typeName + " " + fixKwd("__ice_" + (*q)->name()));
+    }
+
+    if(base)
+    {
+        baseDataMembers = base->allDataMembers();
+        for(DataMemberList::const_iterator q = baseDataMembers.begin(); q != baseDataMembers.end(); ++q)
+        {
+            baseParams.push_back(fixKwd("__ice_" + (*q)->name()));
+        }
+    }
+
+    string helperClass = p->isLocal() ? "Ice::LocalExceptionHelper" : "Ice::UserExceptionHelper";
+    string baseClass = base ? fixKwd(base->scoped()) : (p->isLocal() ? "::Ice::LocalException" : "::Ice::UserException");
+    string templateParameters = name + ", " + baseClass;
+
+    H << sp << nl;
+    H << "class " << _dllClassExport << name << " : public ::" << helperClass << "<" << templateParameters << ">";
+    H << sb;
+
+    H.dec();
+    H << nl << "public:";
+    H.inc();
+
+    // Out of line dtor to avoid weak vtable
+    H << nl << _dllMemberExport << "virtual ~" << name << "();";
+    C << sp;
+    C << nl << scoped.substr(2) << "::~" << name << "()";
+    C << sb;
+    C << eb;
+
+    if(p->isLocal())
+    {
+        H << sp << nl << name << "(const char* __ice_file, int __ice_line) : ";
+        H << "::Ice::LocalExceptionHelper" << "<" << templateParameters << ">";
+        H << "(__ice_file, __ice_line)";
+        H << sb;
+        H << eb;
+    }
+    else
+    {
+        H.zeroIndent();
+        H << sp << nl << "//";
+        H << nl << "// COMPILERFIX: Apple LLVM version 7.3.0 crash when using";
+        H << " a '= default' constructor in classes derived from std::exception";
+        H << nl << "//";
+        H << nl << "#if defined(__APPLE___) && defined(__clang__)";
+        H.restoreIndent();
+        H << nl << name << "() {}";
+        H.zeroIndent();
+        H << nl << "#else";
+        H.restoreIndent();
+        H << nl << name << "() = default;";
+        H.zeroIndent();
+        H << nl << "#endif";
+        H.restoreIndent();
+    }
+
+    if(!allDataMembers.empty())
+    {
+        H << sp << nl << name << "(";
+        if(p->isLocal())
+        {
+            H << "const char* __ice_file, int __ice_line";
+            if(!allParamDecls.empty())
+            {
+                H << ", ";
+            }
+        }
+
+        for(vector<string>::const_iterator q = allParamDecls.begin(); q != allParamDecls.end(); ++q)
+        {
+            if(q != allParamDecls.begin())
+            {
+                H << ", ";
+            }
+            H << (*q);
+        }
+        H << ") :";
+        H.inc();
+        if(base && (p->isLocal() || !baseDataMembers.empty()))
+        {
+            H << nl << "::" << helperClass << "<" << templateParameters << ">" << "(";
+            if(p->isLocal())
+            {
+                H << "__ice_file, __ice_line";
+                if(!baseDataMembers.empty())
+                {
+                    H << ", ";
+                }
+            }
+
+            for(DataMemberList::const_iterator q = baseDataMembers.begin(); q != baseDataMembers.end(); ++q)
+            {
+                if(q != baseDataMembers.begin())
+                {
+                    H << ", ";
+                }
+                if(isMovable((*q)->type()))
+                {
+                    H << "::std::move(" << fixKwd("__ice_" + (*q)->name()) << ")";
+                }
+                else
+                {
+                    H << fixKwd("__ice_" + (*q)->name());
+                }
+            }
+
+            H << ")";
+            if(!dataMembers.empty())
+            {
+                H << ",";
+            }
+        }
+        else if(p->isLocal())
+        {
+            H << " ::Ice::LocalExceptionHelper" << "<" << templateParameters << ">";
+            H << "(__ice_file, __ice_line)";
+            if(!dataMembers.empty())
+            {
+                H << ",";
+            }
+        }
+
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        {
+            if(q != dataMembers.begin())
+            {
+                H << ", ";
+            }
+            if(isMovable((*q)->type()))
+            {
+                H << nl << fixKwd((*q)->name()) << "(::std::move(" << fixKwd("__ice_" + (*q)->name()) << "))";
+            }
+            else
+            {
+                H << nl << fixKwd((*q)->name()) << "(" << fixKwd("__ice_" + (*q)->name()) << ")";
+            }
+        }
+
+        H.dec();
+        H << sb;
+        H << eb;
+    }
+    H << sp;
+
+    H << nl << _dllMemberExport << "static const ::std::string& ice_staticId();";
+
+    if(p->isLocal())
+    {
+        C << sp << nl << "namespace" << sb;
+        C.dec();
+        C << nl << "const std::string " << p->flattenedScope() << p->name() << "_id = \"" << p->scoped() << "\";";
+        C.inc();
+        C << eb;
+    }
+
+    C << sp << nl << "const ::std::string&" << nl << scoped.substr(2) << "::ice_staticId()";
+    C << sb;
+    if(p->isLocal())
+    {
+        C << nl << "return " << p->flattenedScope() << p->name() << "_id;";
+    }
+    else
+    {
+        C << nl << "return " << p->flattenedScope() << p->name() << "_init.typeId" << ";";
+    }
+    C << eb;
+
+    StringList metaData = p->getMetaData();
+    if(find(metaData.begin(), metaData.end(), "cpp:ice_print") != metaData.end())
+    {
+        H << nl << _dllMemberExport << "virtual void ice_print(::std::ostream&) const;";
+    }
+
+    if(!p->isLocal() && p->usesClasses(false))
+    {
+        if(!base || (base && !base->usesClasses(false)))
+        {
+            H << sp << nl << _dllMemberExport << "virtual bool __usesClasses() const;";
+
+            C << sp << nl << "bool";
+            C << nl << scoped.substr(2) << "::__usesClasses() const";
+            C << sb;
+            C << nl << "return true;";
+            C << eb;
+        }
+    }
+
+    if(!dataMembers.empty())
+    {
+        H << sp;
+    }
+    return true;
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
+{
+    string name = fixKwd(p->name());
+    string scope = fixKwd(p->scope());
+    string scoped = fixKwd(p->scoped());
+    string factoryName;
+
+    if(!p->isLocal())
+    {
+        ExceptionPtr base = p->base();
+        bool basePreserved = p->inheritsMetaData("preserve-slice");
+        bool preserved = p->hasMetaData("preserve-slice");
+
+        if(preserved && !basePreserved)
+        {
+            H << sp << nl << _dllMemberExport << "virtual void __write(::Ice::OutputStream*) const;";
+            H << nl << _dllMemberExport << "virtual void __read(::Ice::InputStream*);";
+
+            H << sp << nl << "::std::shared_ptr<::Ice::SlicedData> __slicedData;";
+
+            C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(::Ice::OutputStream* __os) const";
+            C << sb;
+            C << nl << "__os->startException(__slicedData);";
+            C << nl << "__writeImpl(__os);";
+            C << nl << "__os->endException();";
+            C << eb;
+
+            C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(::Ice::InputStream* __is)";
+            C << sb;
+            C << nl << "__is->startException();";
+            C << nl << "__readImpl(__is);";
+            C << nl << "__slicedData = __is->endException(true);";
+            C << eb;
+        }
+    }
+    H << eb << ';';
+
+    if(!p->isLocal())
+    {
+        //
+        // We need an instance here to trigger initialization if the implementation is in a shared libarry.
+        // But we do this only once per source file, because a single instance is sufficient to initialize
+        // all of the globals in a shared library.
+        //
+        if(!_doneStaticSymbol)
+        {
+            _doneStaticSymbol = true;
+            H << sp << nl << "static " << name << " __" << p->name() << "_init;";
+        }
+    }
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11TypesVisitor::visitStructStart(const StructPtr& p)
+{
+    DataMemberList dataMembers = p->dataMembers();
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+
+    string name = fixKwd(p->name());
+
+
+    H << sp << nl << "struct " << name;
+    H << sb;
+
+    return true;
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitStructEnd(const StructPtr& p)
+{
+    string name = fixKwd(p->name());
+    string scoped = fixKwd(p->scoped());
+    string scope = fixKwd(p->scope());
+
+    DataMemberList dataMembers = p->dataMembers();
+
+    vector<string> params;
+    vector<string>::const_iterator pi;
+
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        params.push_back(fixKwd((*q)->name()));
+    }
+
+    bool containsSequence = false;
+    if((Dictionary::legalKeyType(p, containsSequence) && !containsSequence))
+    {
+        H << sp << nl << "bool operator==(const " << name << "& __rhs) const";
+        H << sb;
+        H << nl << "if(this == &__rhs)";
+        H << sb;
+        H << nl << "return true;";
+        H << eb;
+        for(vector<string>::const_iterator pi = params.begin(); pi != params.end(); ++pi)
+        {
+            H << nl << "if(" << *pi << " != __rhs." << *pi << ')';
+            H << sb;
+            H << nl << "return false;";
+            H << eb;
+        }
+        H << nl << "return true;";
+        H << eb;
+        H << sp << nl << "bool operator<(const " << name << "& __rhs) const";
+        H << sb;
+        H << nl << "if(this == &__rhs)";
+        H << sb;
+        H << nl << "return false;";
+        H << eb;
+        for(vector<string>::const_iterator pi = params.begin(); pi != params.end(); ++pi)
+        {
+            H << nl << "if(" << *pi << " < __rhs." << *pi << ')';
+            H << sb;
+            H << nl << "return true;";
+            H << eb;
+            H << nl << "else if(__rhs." << *pi << " < " << *pi << ')';
+            H << sb;
+            H << nl << "return false;";
+            H << eb;
+        }
+        H << nl << "return false;";
+        H << eb;
+
+        H << sp << nl << "bool operator!=(const " << name << "& __rhs) const";
+        H << sb;
+        H << nl << "return !operator==(__rhs);";
+        H << eb;
+        H << nl << "bool operator<=(const " << name << "& __rhs) const";
+        H << sb;
+        H << nl << "return operator<(__rhs) || operator==(__rhs);";
+        H << eb;
+        H << nl << "bool operator>(const " << name << "& __rhs) const";
+        H << sb;
+        H << nl << "return !operator<(__rhs) && !operator==(__rhs);";
+        H << eb;
+        H << nl << "bool operator>=(const " << name << "& __rhs) const";
+        H << sb;
+        H << nl << "return !operator<(__rhs);";
+        H << eb;
+    }
+    H << eb << ';';
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitDataMember(const DataMemberPtr& p)
+{
+    string name = fixKwd(p->name());
+    H << nl << typeToString(p->type(), p->optional(), p->getMetaData(), _useWstring | TypeContextCpp11)
+      << ' ' << name;
+
+    string defaultValue = p->defaultValue();
+    if(!defaultValue.empty())
+    {
+        H << " = ";
+        writeConstantValue(H, p->type(), p->defaultValueType(), defaultValue, _useWstring, p->getMetaData(), true);
+    }
+
+    H << ';';
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitSequence(const SequencePtr& p)
+{
+    string name = fixKwd(p->name());
+    TypePtr type = p->type();
+    int typeCtx = p->isLocal() ? (_useWstring | TypeContextLocal) : _useWstring;
+    string s = typeToString(type, p->typeMetaData(), typeCtx | TypeContextCpp11);
+    StringList metaData = p->getMetaData();
+
+    string seqType = findMetaData(metaData, _useWstring);
+    H << sp;
+
+    if(!seqType.empty())
+    {
+        H << nl << "typedef " << seqType << ' ' << name << ';';
+    }
+    else
+    {
+        H << nl << "typedef ::std::vector<" << (s[0] == ':' ? " " : "") << s << "> " << name << ';';
+    }
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitDictionary(const DictionaryPtr& p)
+{
+    string name = fixKwd(p->name());
+    string dictType = findMetaData(p->getMetaData());
+    int typeCtx = p->isLocal() ? (_useWstring | TypeContextLocal) : _useWstring;
+    if(dictType.empty())
+    {
+        //
+        // A default std::map dictionary
+        //
+
+        TypePtr keyType = p->keyType();
+        TypePtr valueType = p->valueType();
+        string ks = typeToString(keyType, p->keyMetaData(), typeCtx | TypeContextCpp11);
+        if(ks[0] == ':')
+        {
+            ks.insert(0, " ");
+        }
+        string vs = typeToString(valueType, p->valueMetaData(), typeCtx | TypeContextCpp11);
+
+        H << sp << nl << "typedef ::std::map<" << ks << ", " << vs << "> " << name << ';';
+    }
+    else
+    {
+        //
+        // A custom dictionary
+        //
+        H << sp << nl << "typedef " << dictType << ' ' << name << ';';
+    }
+}
+
+Slice::Gen::Cpp11ProxyVisitor::Cpp11ProxyVisitor(Output& h, Output& c, const string& dllExport) :
+    H(h), C(c), _dllClassExport(toDllClassExport(dllExport)), _dllMemberExport(toDllMemberExport(dllExport)),
+    _useWstring(false)
+{
+}
+
+bool
+Slice::Gen::Cpp11ProxyVisitor::visitUnitStart(const UnitPtr& p)
+{
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ProxyVisitor::visitUnitEnd(const UnitPtr&)
+{
+}
+
+bool
+Slice::Gen::Cpp11ProxyVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!p->hasNonLocalClassDefs())
+    {
+        return false;
+    }
+
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+
+    H << sp << nl << "namespace " << fixKwd(p->name()) << nl << '{';
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ProxyVisitor::visitModuleEnd(const ModulePtr&)
+{
+    H << sp << nl << '}';
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11ProxyVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    if(p->isLocal() || (!p->isInterface() && p->allOperations().empty()))
+    {
+        return false;
+    }
+
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+
+    string name = fixKwd(p->name());
+    string scope = fixKwd(p->scope());
+    string scoped = fixKwd(p->scoped());
+    ClassList bases = p->bases();
+
+    ClassDefPtr base;
+    if(!bases.empty() && !bases.front()->isInterface())
+    {
+        base = bases.front();
+    }
+
+    H << sp << nl << "class " << _dllClassExport << p->name() << "Prx : public virtual ::Ice::Proxy<"
+      << fixKwd(p->name() + "Prx") << ", ";
+    if(bases.empty() || (base && base->allOperations().empty()))
+    {
+        H << "::Ice::ObjectPrx";
+    }
+    else
+    {
+        ClassList::const_iterator q = bases.begin();
+        while(q != bases.end())
+        {
+            H << fixKwd((*q)->scoped() + "Prx");
+            if(++q != bases.end())
+            {
+                H << ", ";
+            }
+        }
+    }
+    H << ">";
+
+    H << sb;
+    H.dec();
+    H << nl << "public:";
+    H.inc();
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ProxyVisitor::visitClassDefEnd(const ClassDefPtr& p)
+{
+    string prx = fixKwd(p->name() + "Prx");
+
+    H << sp;
+    H << nl << _dllMemberExport << "static const ::std::string& ice_staticId();";
+
+    H.dec();
+    H << sp << nl << "protected: ";
+    H.inc();
+    H << sp << nl << prx << "() = default;";
+    H << nl << "friend ::std::shared_ptr<" << prx << "> IceInternal::createProxy<" << prx << ">();";
+    H << sp;
+    H << nl << _dllMemberExport << "virtual ::std::shared_ptr<::Ice::ObjectPrx> __newInstance() const override;";
+    H << eb << ';';
+
+    string suffix = p->isInterface() ? "" : "Disp";
+    string scoped = fixKwd(p->scoped() + "Prx");
+
+    C << sp;
+    C << nl << "::std::shared_ptr<::Ice::ObjectPrx>";
+    C << nl << scoped.substr(2) << "::__newInstance() const";
+    C << sb;
+    C << nl << "return ::IceInternal::createProxy<" << prx << ">();";
+    C << eb;
+    C << sp;
+    C << nl << "const ::std::string&" << nl << scoped.substr(2) << "::ice_staticId()";
+    C << sb;
+    C << nl << "return "<< fixKwd(p->scope() + p->name() + suffix).substr(2) << "::ice_staticId();";
+    C << eb;
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+void
+Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p)
+{
+    string name = p->name();
+    string flatName = p->flattenedScope() + p->name() + "_name";
+
+    TypePtr ret = p->returnType();
+
+    bool retIsOpt = p->returnIsOptional();
+    string retS = returnTypeToString(ret, retIsOpt, p->getMetaData(), _useWstring | TypeContextCpp11);
+
+    ContainerPtr container = p->container();
+    ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
+
+    vector<string> params;
+    vector<string> paramsDecl;
+
+    vector<string> inParamsS;
+    vector<string> inParamsDecl;
+
+    vector<string> futureOutParams;
+    vector<string> lambdaOutParams;
+
+    ParamDeclList paramList = p->parameters();
+    ParamDeclList inParams;
+    ParamDeclList outParams;
+
+    string returnValueS = "returnValue";
+    bool outParamsHasOpt = false;
+
+    if(ret)
+    {
+        futureOutParams.push_back(typeToString(ret, retIsOpt, p->getMetaData(), _useWstring | TypeContextCpp11));
+
+        lambdaOutParams.push_back(
+            typeToString(ret, retIsOpt, p->getMetaData(), _useWstring | TypeContextInParam | TypeContextCpp11));
+
+        outParamsHasOpt |= p->returnIsOptional();
+    }
+
+    for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
+    {
+        string paramName = fixKwd(paramPrefix + (*q)->name());
+        StringList metaData = (*q)->getMetaData();
+
+        if((*q)->isOutParam())
+        {
+            futureOutParams.push_back(typeToString((*q)->type(), (*q)->optional(), metaData,
+                                                   _useWstring | TypeContextCpp11));
+            lambdaOutParams.push_back(typeToString((*q)->type(), (*q)->optional(), metaData,
+                                                   _useWstring | TypeContextInParam | TypeContextCpp11));
+
+            string outputTypeString = outputTypeToString((*q)->type(), (*q)->optional(), metaData,
+                                                         _useWstring | TypeContextCpp11);
+
+            params.push_back(outputTypeString);
+            paramsDecl.push_back(outputTypeString + ' ' + paramName);
+
+            outParamsHasOpt |= (*q)->optional();
+            outParams.push_back(*q);
+
+            if((*q)->name() == "returnValue")
+            {
+                returnValueS = "_returnValue";
+            }
+        }
+        else
+        {
+            string typeString = inputTypeToString((*q)->type(), (*q)->optional(), metaData,
+                                                  _useWstring | TypeContextCpp11);
+
+            params.push_back(typeString);
+            paramsDecl.push_back(typeString + ' ' + paramName);
+
+            inParamsS.push_back(typeString);
+            inParamsDecl.push_back(typeString + ' ' + paramName);
+            inParams.push_back(*q);
+        }
+    }
+
+    string scoped = fixKwd(cl->scope() + cl->name() + "Prx" + "::").substr(2);
+
+    string futureT;
+    if(futureOutParams.empty())
+    {
+        futureT = "void";
+    }
+    else if(futureOutParams.size() == 1)
+    {
+        futureT = futureOutParams[0];
+    }
+    else
+    {
+        string suffix = cl->isInterface() ? "" : "Disp";
+        string resultScope = fixKwd(cl->scope() + cl->name() + suffix);
+        futureT = resultStructName(name, resultScope);
+    }
+
+    string deprecateSymbol = getDeprecateSymbol(p, cl);
+
+    //
+    // Synchronous operation
+    //
+    H << sp << nl << deprecateSymbol << retS << ' ' << fixKwd(name) << spar << paramsDecl;
+    H << "const ::Ice::Context& __ctx = Ice::noExplicitContext" << epar;
+    H << sb;
+    H << nl;
+    if(futureOutParams.size() == 1)
+    {
+        if(ret)
+        {
+            H << "return ";
+        }
+        else
+        {
+            H << paramPrefix << (*outParams.begin())->name() << " = ";
+        }
+    }
+    else if(futureOutParams.size() > 1)
+    {
+        H << "auto __result = ";
+    }
+
+    H << "makePromiseOutgoing<" << futureT << ">";
+
+    H << spar << "true, this" << string("&" + scoped + "__" + name);
+    for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end(); ++q)
+    {
+        H << fixKwd(paramPrefix + (*q)->name());
+    }
+    H << "__ctx" << epar << ".get();";
+    if(futureOutParams.size() > 1)
+    {
+        for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end(); ++q)
+        {
+            H << nl << paramPrefix << (*q)->name() << " = ";
+            H << condMove(isMovable((*q)->type()), "__result." + fixKwd((*q)->name())) + ";";
+        }
+        if(ret)
+        {
+            H << nl << "return " + condMove(isMovable(ret), "__result." + returnValueS) + ";";
+        }
+    }
+    H << eb;
+
+    //
+    // Promise based asynchronous operation
+    //
+    H << sp;
+    H << nl << "template<template<typename> class P = ::std::promise>";
+    H << nl << deprecateSymbol << "auto " << name << "Async" << spar << inParamsDecl;
+    H << "const ::Ice::Context& __ctx = Ice::noExplicitContext" << epar;
+    H.inc();
+    H << nl << "-> decltype(::std::declval<P<" << futureT << ">>().get_future())";
+    H.dec();
+    H << sb;
+
+    H << nl << "return makePromiseOutgoing<" << futureT << ", P>" << spar;
+
+    H << "false, this" << string("&" + scoped + "__" + name);
+    for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end(); ++q)
+    {
+        H << fixKwd(paramPrefix + (*q)->name());
+    }
+    H << "__ctx" << epar << ";";
+    H << eb;
+
+
+    //
+    // Lambda based asynchronous operation
+    //
+    bool lambdaCustomOut = (lambdaOutParams != futureOutParams);
+
+    H << sp;
+    H << nl;
+    if(lambdaCustomOut)
+    {
+        H << _dllMemberExport;
+    }
+    H << "::std::function<void()>";
+    H << nl << name << "Async(";
+    H.useCurrentPosAsIndent();
+    if(!inParamsDecl.empty())
+    {
+        if(lambdaCustomOut)
+        {
+            for(vector<string>::const_iterator q = inParamsS.begin(); q != inParamsS.end(); ++q)
+            {
+                H << *q << ", ";
+            }
+        }
+        else
+        {
+            for(vector<string>::const_iterator q = inParamsDecl.begin(); q != inParamsDecl.end(); ++q)
+            {
+                H << *q << ", ";
+            }
+        }
+        H << nl;
+    }
+
+    H << "::std::function<void" << spar << lambdaOutParams << epar << ">"
+        + condString(!lambdaCustomOut, " __response") + ",";
+    H << nl << "::std::function<void(::std::exception_ptr)>"
+        + condString(!lambdaCustomOut, " __ex") + " = nullptr,";
+    H << nl << "::std::function<void(bool)>"
+        + condString(!lambdaCustomOut," __sent") + " = nullptr,";
+    H << nl << "const ::Ice::Context&"
+        + condString(!lambdaCustomOut, "__ctx") + " = Ice::noExplicitContext)" + condString(lambdaCustomOut, ";");
+
+    H.restoreIndent();
+    if(lambdaCustomOut)
+    {
+        //
+        // "Custom" implementation in .cpp file
+        //
+
+        C << sp;
+        C << nl << "::std::function<void()>";
+        C << nl << scoped << name << "Async(";
+        C.useCurrentPosAsIndent();
+        if(!inParamsDecl.empty())
+        {
+            for(vector<string>::const_iterator q = inParamsDecl.begin(); q != inParamsDecl.end(); ++q)
+            {
+                C << *q << ", ";
+            }
+            C << nl;
+        }
+        C << "::std::function<void " << spar << lambdaOutParams << epar << "> __response,";
+        C << nl << "::std::function<void(::std::exception_ptr)> __ex,";
+        C << nl << "::std::function<void(bool)> __sent,";
+        C << nl << "const ::Ice::Context& __ctx)";
+        C.restoreIndent();
+        C << sb;
+        if(p->returnsData())
+        {
+            C << nl << "__checkAsyncTwowayOnly(" << flatName << ");";
+        }
+
+        C << nl << "::std::function<void(::Ice::InputStream*)> __read;";
+        C << nl << "if(__response)";
+        C << sb;
+        C << nl << "__read = [__response](::Ice::InputStream* __is)";
+        C << sb;
+        C << nl << "__is->startEncapsulation();";
+        writeAllocateCode(C, outParams, p, true, _useWstring | TypeContextInParam | TypeContextCpp11);
+        writeUnmarshalCode(C, outParams, p, true, _useWstring | TypeContextInParam | TypeContextCpp11);
+
+        if(p->returnsClasses(false))
+        {
+            C << nl << "__is->readPendingValues();";
+        }
+        C << nl << "__is->endEncapsulation();";
+        C << nl << "try" << sb;
+        C << nl << "__response" << spar;
+        if(ret)
+        {
+            C << "__ret";
+        }
+        for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end(); ++q)
+        {
+            C << fixKwd(paramPrefix + (*q)->name());
+        }
+        C << epar << ";";
+        C << eb;
+        C << nl << "catch(...)";
+        C << sb;
+        C << nl << "throw ::std::current_exception();";
+        C << eb;
+        C << eb << ";";
+        C << eb;
+        C << nl << "auto __outAsync = ::std::make_shared<::IceInternal::CustomLambdaOutgoing>(";
+        C << "shared_from_this(), __read, __ex, __sent);";
+        C << sp;
+
+        C << nl << "__outAsync->invoke(" << flatName << ", ";
+        C << operationModeToString(p->sendMode(), true) << ", " << opFormatTypeToString(p) << ", __ctx, ";
+        C.inc();
+        C << nl;
+
+        writeInParamsLambda(C, p, inParams);
+        C << "," << nl;
+        throwUserExceptionLambda(C, p->throws());
+
+        C.dec();
+        C << ");";
+        C << nl << "return [__outAsync]() { __outAsync->cancel(); };";
+        C << eb;
+    }
+    else
+    {
+        //
+        // Simple implementation directly in header file
+        //
+
+        H << sb;
+        if(futureOutParams.size() > 1)
+        {
+            H << nl << "auto __responseCb = [__response](" << futureT << "&& result)";
+            H << sb;
+            H << nl << "__response" << spar;
+
+            if(ret)
+            {
+                H << condMove(isMovable(ret), string("result.") + returnValueS);
+            }
+            for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end(); ++q)
+            {
+                H << condMove(isMovable((*q)->type()), "result." + fixKwd((*q)->name()));
+            }
+            H << epar << ";" << eb << ";";
+        }
+
+        H << nl << "return makeLambdaOutgoing<" << futureT << ">" << spar;
+
+        H << (futureOutParams.size() > 1 ? "__responseCb" : "__response") << "__ex" << "__sent" << "this";
+        H << string("&" + scoped + "__" + name);
+        for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end(); ++q)
+        {
+            H << fixKwd(paramPrefix + (*q)->name());
+        }
+        H << "__ctx" << epar << ";";
+        H << eb;
+    }
+
+    //
+    // Private implementation
+    //
+
+    H << sp;
+    H << nl << _dllMemberExport << "void __" << name << spar;
+    H << "const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<" + futureT + ">>&";
+    H << inParamsS;
+    H << "const ::Ice::Context&";
+    H << epar << ";";
+
+    C << sp;
+    C << nl << "void" << nl << scoped << "__" << name << spar;
+    C << "const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<" + futureT + ">>& __outAsync";
+    C << inParamsDecl << "const ::Ice::Context& __ctx";
+    C << epar;
+    C << sb;
+    if(p->returnsData())
+    {
+        C << nl << "__checkAsyncTwowayOnly(" << flatName << ");";
+    }
+    C << nl << "__outAsync->invoke(" << flatName << ", ";
+    C << operationModeToString(p->sendMode(), true) << ", " << opFormatTypeToString(p) << ", __ctx, ";
+    C.inc();
+    C << nl;
+
+    writeInParamsLambda(C, p, inParams);
+    C << "," << nl;
+    throwUserExceptionLambda(C, p->throws());
+
+    if(futureOutParams.size() > 1)
+    {
+        //
+        // Generate a read method if there are more than one ret/out parameter. If there's
+        // only one, we rely on the default read method from LambdaOutgoing
+        // except if the unique ret/out is optional or is an array/range.
+        //
+        C << "," << nl << "[](::Ice::InputStream* __is)";
+        C << sb;
+        C << nl << futureT << " v;";
+        writeUnmarshalCode(C, outParams, p, false, _useWstring | TypeContextCpp11, returnValueS, "v");
+
+        if(p->returnsClasses(false))
+        {
+            C << nl << "__is->readPendingValues();";
+        }
+        C << nl << "return v;";
+        C << eb;
+    }
+    else if(outParamsHasOpt || p->returnsClasses(false))
+    {
+        //
+        // If there's only one optional ret/out parameter, we still need to generate
+        // a read method, we can't rely on the default read method which wouldn't
+        // known which tag to use.
+        //
+        C << "," << nl << "[](::Ice::InputStream* __is)";
+        C << sb;
+
+        writeAllocateCode(C, outParams, p, true, _useWstring | TypeContextCpp11);
+        writeUnmarshalCode(C, outParams, p, true, _useWstring | TypeContextCpp11);
+
+        if(p->returnsClasses(false))
+        {
+            C << nl << "__is->readPendingValues();";
+        }
+
+        if(ret)
+        {
+            C << nl << "return __ret;";
+        }
+        else
+        {
+            C << nl << "return " << fixKwd(paramPrefix + outParams.front()->name()) << ";";
+        }
+        C << eb;
+    }
+
+    C.dec();
+    C << ");" << eb;
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitEnum(const EnumPtr& p)
+{
+    bool unscoped = findMetaData(p->getMetaData(), TypeContextCpp11) == "%unscoped";
+    H << sp << nl << "enum ";
+    if(!unscoped)
+    {
+        H << "class ";
+    }
+    H << fixKwd(p->name());
+    if(!unscoped && p->maxValue() <= 0xFF)
+    {
+        H << " : unsigned char";
+    }
+    H << sb;
+
+    EnumeratorList enumerators = p->getEnumerators();
+    //
+    // Check if any of the enumerators were assigned an explicit value.
+    //
+    const bool explicitValue = p->explicitValue();
+    for(EnumeratorList::const_iterator en = enumerators.begin(); en != enumerators.end();)
+    {
+        H << nl << fixKwd((*en)->name());
+        //
+        // If any of the enumerators were assigned an explicit value, we emit
+        // an explicit value for *all* enumerators.
+        //
+        if(explicitValue)
+        {
+            H << " = " << int64ToString((*en)->value());
+        }
+        if(++en != enumerators.end())
+        {
+            H << ',';
+        }
+    }
+    H << eb << ';';
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitConst(const ConstPtr& p)
+{
+    H << sp;
+    H << nl << (isConstexprType(p->type()) ? "constexpr " : "const ")
+      << typeToString(p->type(), p->typeMetaData(), _useWstring | TypeContextCpp11) << " " << fixKwd(p->name())
+      << " = ";
+    writeConstantValue(H, p->type(), p->valueType(), p->value(), _useWstring, p->typeMetaData(), true);
+    H << ';';
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::emitUpcall(const ExceptionPtr& base, const string& call, bool isLocal)
+{
+    C << nl << (base ? fixKwd(base->scoped()) : string(isLocal ? "::Ice::LocalException" : "::Ice::UserException"))
+      << call;
+}
+
+Slice::Gen::Cpp11ObjectVisitor::Cpp11ObjectVisitor(::IceUtilInternal::Output& h,
+                                                   ::IceUtilInternal::Output& c,
+                                                   const std::string& dllExport) :
+    H(h),
+    C(c),
+    _dllExport(dllExport),
+    _dllClassExport(toDllClassExport(dllExport)), _dllMemberExport(toDllMemberExport(dllExport)),
+    _doneStaticSymbol(false),
+    _useWstring(false)
+{
+}
+
+void
+Slice::Gen::Cpp11ObjectVisitor::emitDataMember(const DataMemberPtr& p)
+{
+    string name = fixKwd(p->name());
+    H << sp << nl << typeToString(p->type(), p->optional(), p->getMetaData(),
+                                  _useWstring | TypeContextCpp11) << ' ' << name;
+
+    string defaultValue = p->defaultValue();
+    if(!defaultValue.empty())
+    {
+        H << " = ";
+        writeConstantValue(H, p->type(), p->defaultValueType(), defaultValue, _useWstring, p->getMetaData(), true);
+    }
+    H << ";";
+}
+
+void
+Slice::Gen::Cpp11InterfaceVisitor::emitUpcall(const ClassDefPtr& base, const string& call)
+{
+    C << nl << (base ? fixKwd(base->scoped()) : string("::Ice::Object")) << call;
+}
+
+void
+Slice::Gen::Cpp11ValueVisitor::emitUpcall(const ClassDefPtr& base, const string& call)
+{
+    C << nl << (base ? fixKwd(base->scoped()) : string("::Ice::Value")) << call;
+}
+
+Slice::Gen::Cpp11LocalObjectVisitor::Cpp11LocalObjectVisitor(::IceUtilInternal::Output& h,
+                                                             ::IceUtilInternal::Output& c,
+                                                             const std::string& dllExport) :
+    Cpp11ObjectVisitor(h, c, dllExport)
+{
+}
+
+bool
+Slice::Gen::Cpp11LocalObjectVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!p->hasLocalClassDefs())
+    {
+        return false;
+    }
+
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+    string name = fixKwd(p->name());
+    H << sp << nl << "namespace " << name << nl << '{';
+    return true;
+}
+
+void
+Slice::Gen::Cpp11LocalObjectVisitor::visitModuleEnd(const ModulePtr&)
+{
+    H << sp;
+    H << nl << '}';
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11LocalObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    if(!p->isLocal())
+    {
+        return false;
+    }
+    if(p->isDelegate())
+    {
+        return false;
+    }
+
+    string name = fixKwd(p->name());
+    string scope = fixKwd(p->scope());
+    string scoped = fixKwd(p->scoped());
+    ClassList bases = p->bases();
+    ClassDefPtr base;
+    if(!bases.empty() && !bases.front()->isInterface())
+    {
+        base = bases.front();
+    }
+    DataMemberList dataMembers = p->dataMembers();
+    DataMemberList allDataMembers = p->allDataMembers();
+
+    H << sp << nl << "class " << _dllClassExport << name;
+    H.useCurrentPosAsIndent();
+    if(!bases.empty())
+    {
+        H << " : ";
+        ClassList::const_iterator q = bases.begin();
+        bool virtualInheritance = p->isInterface();
+        while(q != bases.end())
+        {
+            if(virtualInheritance || (*q)->isInterface())
+            {
+                H << "virtual ";
+            }
+
+            H << "public " << fixKwd((*q)->scoped());
+            if(++q != bases.end())
+            {
+                H << ',' << nl;
+            }
+        }
+    }
+
+    H.restoreIndent();
+    H << sb;
+    H.dec();
+    H << nl << "public:" << sp;
+    H.inc();
+
+    //
+    // In C++, a nested type cannot have the same name as the enclosing type
+    //
+    if(p->name() != "PointerType")
+    {
+        H << nl << "typedef ::std::shared_ptr<" << name << "> PointerType;";
+    }
+
+    //
+    // Out of line virtual dtor to avoid weak vtable
+    //
+    H << sp << nl << _dllMemberExport << "virtual ~" << name  << "();";
+    C << sp << nl << scoped.substr(2) << "::~" << name << "()";
+    C << sb;
+    C << eb;
+
+    vector<string> params;
+    vector<string> allTypes;
+    vector<string> allParamDecls;
+
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        params.push_back(fixKwd((*q)->name()));
+    }
+
+    for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+    {
+        string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring);
+        allTypes.push_back(typeName);
+        allParamDecls.push_back(typeName + " __ice_" + (*q)->name());
+    }
+
+    if(!p->isInterface())
+    {
+        if(p->hasDefaultValues())
+        {
+            H << sp << nl << name << "() :";
+            H.inc();
+            writeDataMemberInitializers(H, dataMembers, _useWstring | TypeContextCpp11);
+            H.dec();
+            H << sb;
+            H << eb;
+        }
+        else
+        {
+            H << sp << nl << name << "() = default;";
+        }
+
+        emitOneShotConstructor(p);
+    }
+
+    if(p->hasMetaData("cpp:comparable"))
+    {
+        H << sp;
+        H << nl << "virtual bool operator==(const " << p->name() << "&) const = 0;";
+        H << nl << "virtual bool operator<(const " << p->name() << "&) const = 0;";
+    }
+    return true;
+}
+
+void
+Slice::Gen::Cpp11LocalObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
+{
+    string scoped = fixKwd(p->scoped());
+    string scope = fixKwd(p->scope());
+    ClassList bases = p->bases();
+    ClassDefPtr base;
+    if(!bases.empty() && !bases.front()->isInterface())
+    {
+        base = bases.front();
+    }
+
+    //
+    // Emit data members. Access visibility may be specified by metadata.
+    //
+    bool inProtected = false;
+    DataMemberList dataMembers = p->dataMembers();
+    bool prot = p->hasMetaData("protected");
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        if(prot || (*q)->hasMetaData("protected"))
+        {
+            if(!inProtected)
+            {
+                H.dec();
+                H << sp << nl << "protected:";
+                H.inc();
+                inProtected = true;
+            }
+        }
+        else
+        {
+            if(inProtected)
+            {
+                H.dec();
+                H << sp << nl << "public:";
+                H.inc();
+                inProtected = false;
+            }
+        }
+
+        emitDataMember(*q);
+    }
+
+    H << eb << ';';
+}
+
+bool
+Slice::Gen::Cpp11LocalObjectVisitor::visitExceptionStart(const ExceptionPtr&)
+{
+    return false;
+}
+
+bool
+Slice::Gen::Cpp11LocalObjectVisitor::visitStructStart(const StructPtr&)
+{
+    return false;
+}
+
+void
+Slice::Gen::Cpp11LocalObjectVisitor::visitOperation(const OperationPtr& p)
+{
+    string name = p->name();
+    string scoped = fixKwd(p->scoped());
+    string scope = fixKwd(p->scope());
+
+    int typeCtx = _useWstring | TypeContextLocal | TypeContextCpp11;
+    TypePtr ret = p->returnType();
+    string retS = returnTypeToString(ret, p->returnIsOptional(), p->getMetaData(),
+                                     typeCtx | TypeContextCpp11);
+
+    string params = "(";
+    string paramsDecl = "(";
+    string args = "(";
+
+    ContainerPtr container = p->container();
+    ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
+    string classScope = fixKwd(cl->scope());
+
+    ParamDeclList inParams;
+    ParamDeclList outParams;
+    ParamDeclList paramList = p->parameters();
+    vector< string> outDecls;
+    for(ParamDeclList::iterator q = paramList.begin(); q != paramList.end(); ++q)
+    {
+        string paramName = fixKwd(string(paramPrefix) + (*q)->name());
+        TypePtr type = (*q)->type();
+        bool isOutParam = (*q)->isOutParam();
+        string typeString;
+        if(isOutParam)
+        {
+            outParams.push_back(*q);
+            typeString = outputTypeToString(type, (*q)->optional(), (*q)->getMetaData(), typeCtx);
+        }
+        else
+        {
+            inParams.push_back(*q);
+            typeString = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), typeCtx);
+        }
+
+        if(q != paramList.begin())
+        {
+            params += ", ";
+            paramsDecl += ", ";
+            args += ", ";
+        }
+
+        params += typeString;
+        paramsDecl += typeString;
+        paramsDecl += ' ';
+        paramsDecl += paramName;
+        args += paramName;
+
+        if(isOutParam)
+        {
+            outDecls.push_back(typeString);
+        }
+    }
+
+    params += ')';
+    paramsDecl += ')';
+    args += ')';
+
+    string isConst = ((p->mode() == Operation::Nonmutating) || p->hasMetaData("cpp:const")) ? " const" : "";
+
+    string deprecateSymbol = getDeprecateSymbol(p, cl);
+
+    H << sp;
+    H << nl << deprecateSymbol << "virtual " << retS << ' ' << fixKwd(name) << params << isConst << " = 0;";
+
+    if(cl->hasMetaData("async-oneway") || p->hasMetaData("async-oneway"))
+    {
+        vector<string> paramsDeclAMI;
+        vector<string> outParamsDeclAMI;
+
+        ParamDeclList paramList = p->parameters();
+        for(ParamDeclList::const_iterator r = paramList.begin(); r != paramList.end(); ++r)
+        {
+            string paramName = fixKwd((*r)->name());
+
+            StringList metaData = (*r)->getMetaData();
+            string typeString;
+            if(!(*r)->isOutParam())
+            {
+                typeString = inputTypeToString((*r)->type(), (*r)->optional(), metaData, typeCtx);
+                paramsDeclAMI.push_back(typeString + ' ' + paramName);
+            }
+        }
+
+        H << sp;
+        H << nl << "virtual ::std::function<void()>";
+        H << nl << name << "Async(";
+        H.useCurrentPosAsIndent();
+        for(vector<string>::const_iterator i = paramsDeclAMI.begin(); i != paramsDeclAMI.end(); ++i)
+        {
+            H << *i << ",";
+        }
+        if(!paramsDeclAMI.empty())
+        {
+            H << nl;
+        }
+        H << "::std::function<void(::std::exception_ptr)> exception,";
+        H << nl << "::std::function<void(bool)> sent = nullptr) = 0;";
+        H.restoreIndent();
+
+        H << sp;
+        H << nl << "template<template<typename> class P = ::std::promise>";
+        H << nl << deprecateSymbol << "auto " << name << "Async" << spar << paramsDeclAMI << epar;
+        H.inc();
+        H << nl << "-> decltype(::std::declval<P<bool>>().get_future())";
+        H.dec();
+        H << sb;
+        H << nl << "using Promise = P<bool>;";
+        H << nl << "auto __promise = ::std::make_shared<Promise>();";
+
+        H << nl << name << "Async(";
+        H.useCurrentPosAsIndent();
+        for(vector<string>::const_iterator i = paramsDeclAMI.begin(); i != paramsDeclAMI.end(); ++i)
+        {
+            H << *i << ",";
+        }
+        if(!paramsDeclAMI.empty())
+        {
+            H << nl;
+        }
+        H << "[__promise](::std::exception_ptr __ex)";
+        H << sb;
+        H << nl << "__promise->set_exception(::std::move(__ex));";
+        H << eb << ",";
+        H << nl << "[__promise](bool __b)";
+        H << sb;
+        H << nl << "__promise->set_value(__b);";
+        H << eb << ");";
+        H.restoreIndent();
+
+        H << nl << "return __promise->get_future();";
+        H << eb;
+    }
+}
+
+Slice::Gen::Cpp11InterfaceVisitor::Cpp11InterfaceVisitor(::IceUtilInternal::Output& h,
+                                                         ::IceUtilInternal::Output& c,
+                                                         const std::string& dllExport) :
+    Cpp11ObjectVisitor(h, c, dllExport)
+{
+}
+
+bool
+Slice::Gen::Cpp11InterfaceVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!p->hasNonLocalInterfaceDefs())
+    {
+        return false;
+    }
+
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+    string name = fixKwd(p->name());
+    H << sp << nl << "namespace " << name << nl << '{';
+    return true;
+}
+
+void
+Slice::Gen::Cpp11InterfaceVisitor::visitModuleEnd(const ModulePtr&)
+{
+    H << sp;
+    H << nl << '}';
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11InterfaceVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    if(p->isLocal() || (!p->isInterface() && p->allOperations().empty()))
+    {
+        return false;
+    }
+
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+
+    string suffix = p->isInterface() ? "" : "Disp";
+
+    string name = fixKwd(p->name() + suffix);
+    string scope = fixKwd(p->scope());
+    string scoped = fixKwd(p->scope() + p->name() + suffix);
+    ClassList bases = p->bases();
+    ClassDefPtr base;
+    if(!bases.empty() && !bases.front()->isInterface())
+    {
+        base = bases.front();
+    }
+    DataMemberList dataMembers = p->dataMembers();
+    DataMemberList allDataMembers = p->allDataMembers();
+
+    H << sp << nl << "class " << _dllExport << name << " : ";
+    H.useCurrentPosAsIndent();
+    if(bases.empty() || (base && base->allOperations().empty()))
+    {
+        H << "public virtual ::Ice::Object";
+    }
+    else
+    {
+        ClassList::const_iterator q = bases.begin();
+        while(q != bases.end())
+        {
+            string baseSuffix = (*q)->isInterface() ? "" : "Disp";
+            string baseScoped = fixKwd((*q)->scope() + (*q)->name() + baseSuffix);
+
+            H << "public virtual " << baseScoped;
+            if(++q != bases.end())
+            {
+                H << ',' << nl;
+            }
+        }
+    }
+
+    H.restoreIndent();
+    H << sb;
+    H.dec();
+    H << nl << "public:" << sp;
+    H.inc();
+
+    //
+    // In C++, a nested type cannot have the same name as the enclosing type
+    //
+    if(name != "ProxyType")
+    {
+        H << nl << "typedef " << p->name() << "Prx ProxyType;";
+    }
+
+    vector<string> params;
+    vector<string> allTypes;
+    vector<string> allParamDecls;
+
+    ClassList allBases = p->allBases();
+    StringList ids;
+    transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun(&Contained::scoped));
+    StringList other;
+    other.push_back(p->scoped());
+    other.push_back("::Ice::Object");
+    other.sort();
+    ids.merge(other);
+    ids.unique();
+    StringList::const_iterator firstIter = ids.begin();
+    StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), p->scoped());
+    assert(scopedIter != ids.end());
+    StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter);
+
+    H << sp;
+    H << nl << "virtual bool ice_isA(::std::string, const ::Ice::Current& = ::Ice::noExplicitCurrent) const;";
+    H << nl << "virtual ::std::vector< ::std::string> ice_ids(const ::Ice::Current& = ::Ice::noExplicitCurrent) const;";
+    H << nl << "virtual ::std::string ice_id(const ::Ice::Current& = ::Ice::noExplicitCurrent) const;";
+    H << nl << "static const ::std::string& ice_staticId();";
+
+    string flatName = p->flattenedScope() + p->name() + "_ids";
+
+    C << sp;
+    C << nl << "bool" << nl << scoped.substr(2) << "::ice_isA(::std::string _s, const ::Ice::Current&) const";
+    C << sb;
+    C << nl << "return ::std::binary_search(" << flatName << ", " << flatName << " + " << ids.size() << ", _s);";
+    C << eb;
+
+    C << sp;
+    C << nl << "::std::vector< ::std::string>" << nl << scoped.substr(2) << "::ice_ids(const ::Ice::Current&) const";
+    C << sb;
+    C << nl << "return ::std::vector< ::std::string>(&" << flatName << "[0], &" << flatName << '[' << ids.size() << "]);";
+    C << eb;
+
+    C << sp;
+    C << nl << "::std::string" << nl << scoped.substr(2) << "::ice_id(const ::Ice::Current&) const";
+    C << sb;
+    C << nl << "return " << flatName << '[' << scopedPos << "];";
+    C << eb;
+
+    C << sp;
+    C << nl << "const ::std::string&" << nl << scoped.substr(2) << "::ice_staticId()";
+    C << sb;
+    C << nl << "return " << flatName << '[' << scopedPos << "];";
+    C << eb;
+    return true;
+}
+
+void
+Slice::Gen::Cpp11InterfaceVisitor::visitClassDefEnd(const ClassDefPtr& p)
+{
+    string suffix = p->isInterface() ? "" : "Disp";
+    string scoped = fixKwd(p->scope() + p->name() + suffix);
+
+    string scope = fixKwd(p->scope());
+    string name = fixKwd(p->name() + suffix);
+    ClassList bases = p->bases();
+    ClassDefPtr base;
+    if(!bases.empty() && !bases.front()->isInterface())
+    {
+        base = bases.front();
+    }
+
+    OperationList allOps = p->allOperations();
+    if(!allOps.empty())
+    {
+        StringList allOpNames;
+        transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), ::IceUtil::constMemFun(&Contained::name));
+        allOpNames.push_back("ice_id");
+        allOpNames.push_back("ice_ids");
+        allOpNames.push_back("ice_isA");
+        allOpNames.push_back("ice_ping");
+        allOpNames.sort();
+        allOpNames.unique();
+
+        string flatName = p->flattenedScope() + p->name() + "_ops";
+
+        H << sp;
+        H << nl << "virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);";
+
+        C << sp;
+        C << nl << "::Ice::DispatchStatus" << nl << scoped.substr(2)
+          << "::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& c)";
+        C << sb;
+
+        C << nl << "::std::pair< const ::std::string*, const ::std::string*> r = "
+          << "::std::equal_range(" << flatName << ", " << flatName << " + " << allOpNames.size() << ", c.operation);";
+        C << nl << "if(r.first == r.second)";
+        C << sb;
+        C << nl << "throw ::Ice::OperationNotExistException(__FILE__, __LINE__, c.id, c.facet, c.operation);";
+        C << eb;
+        C << sp;
+        C << nl << "switch(r.first - " << flatName << ')';
+        C << sb;
+        int i = 0;
+        for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end(); ++q)
+        {
+            C << nl << "case " << i++ << ':';
+            C << sb;
+            C << nl << "return ___" << *q << "(in, c);";
+            C << eb;
+        }
+        C << eb;
+        C << sp;
+        C << nl << "assert(false);";
+        C << nl << "throw ::Ice::OperationNotExistException(__FILE__, __LINE__, c.id, c.facet, c.operation);";
+        C << eb;
+    }
+
+    H << eb << ';';
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11InterfaceVisitor::visitExceptionStart(const ExceptionPtr&)
+{
+    return false;
+}
+
+bool
+Slice::Gen::Cpp11InterfaceVisitor::visitStructStart(const StructPtr&)
+{
+    return false;
+}
+
+void
+Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p)
+{
+    string name = p->name();
+
+    TypePtr ret = p->returnType();
+    string retS = returnTypeToString(ret, p->returnIsOptional(), p->getMetaData(), _useWstring | TypeContextCpp11);
+
+    string params = "(";
+    string paramsDecl = "(";
+    string args = "(";
+
+    string paramsAMD;
+    string argsAMD;
+
+    string responseParams;
+    string responseParamsDecl;
+
+    ContainerPtr container = p->container();
+    ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
+    string classScope = fixKwd(cl->scope());
+
+    string suffix = cl->isInterface() ? "" : "Disp";
+    string scope = fixKwd(cl->scope() + cl->name() + suffix + "::");
+    string scoped = fixKwd(cl->scope() + cl->name() + suffix + "::" + p->name());
+
+    ParamDeclList inParams;
+    ParamDeclList outParams;
+    ParamDeclList paramList = p->parameters();
+    vector<string> outDecls;
+    for(ParamDeclList::iterator q = paramList.begin(); q != paramList.end(); ++q)
+    {
+        string paramName = fixKwd(string(paramPrefix) + (*q)->name());
+        TypePtr type = (*q)->type();
+        bool isOutParam = (*q)->isOutParam();
+        string typeString;
+        if(isOutParam)
+        {
+            outParams.push_back(*q);
+            typeString = outputTypeToString(type, (*q)->optional(), (*q)->getMetaData(),
+                                            _useWstring | TypeContextCpp11);
+            outDecls.push_back(inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(),
+                                                 _useWstring | TypeContextCpp11));
+        }
+        else
+        {
+            inParams.push_back(*q);
+            typeString = typeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(),
+                                      _useWstring | TypeContextInParam | TypeContextCpp11);
+        }
+
+        if(q != paramList.begin())
+        {
+            params += ", ";
+            paramsDecl += ", ";
+            args += ", ";
+        }
+
+        params += typeString;
+        paramsDecl += typeString;
+        paramsDecl += ' ';
+        paramsDecl += paramName;
+        args += condMove(isMovable(type) && !isOutParam, paramName);
+    }
+
+    if((outParams.size() > 1) || (ret && outParams.size() > 0))
+    {
+        //
+        // Generate OpNameResult struct
+        //
+        list<string> dataMembers;
+        string returnValueS = "returnValue";
+
+        for(ParamDeclList::iterator q = outParams.begin(); q != outParams.end(); ++q)
+        {
+            string typeString = typeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(),
+                                             _useWstring | TypeContextCpp11);
+
+            dataMembers.push_back(typeString + " " + fixKwd((*q)->name()));
+
+            if((*q)->name() == "returnValue")
+            {
+                returnValueS = "_returnValue";
+            }
+        }
+
+        if(ret)
+        {
+            dataMembers.push_front(retS + " " + returnValueS);
+        }
+
+        H << sp;
+        H << nl << "struct " << resultStructName(name);
+        H << sb;
+        for(list<string>::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        {
+            H << nl << *q << ";";
+        }
+        H << eb << ";";
+    }
+
+
+    if(!paramList.empty())
+    {
+        params += ", ";
+        paramsDecl += ", ";
+        args += ", ";
+    }
+
+    params += "const ::Ice::Current& = ::Ice::noExplicitCurrent)";
+    paramsDecl += "const ::Ice::Current& __current)";
+    args += "__current)";
+
+    for(ParamDeclList::iterator q = inParams.begin(); q != inParams.end(); ++q)
+    {
+        if(q != inParams.begin())
+        {
+            paramsAMD += ", ";
+            argsAMD += ", ";
+        }
+        paramsAMD += typeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(),
+                                  _useWstring | TypeContextInParam | TypeContextCpp11);
+        if(isMovable((*q)->type()))
+        {
+            argsAMD += "::std::move(" + fixKwd(string(paramPrefix) + (*q)->name()) + ")";
+        }
+        else
+        {
+            argsAMD += fixKwd(string(paramPrefix) + (*q)->name());
+        }
+    }
+
+    if(ret)
+    {
+        string typeString = inputTypeToString(ret, p->returnIsOptional(), p->getMetaData(),
+                                              _useWstring | TypeContextCpp11);
+        responseParams = typeString;
+        responseParamsDecl = typeString + " __ret";
+        if(!outParams.empty())
+        {
+            responseParams += ", ";
+            responseParamsDecl += ", ";
+        }
+    }
+
+    for(ParamDeclList::iterator q = outParams.begin(); q != outParams.end(); ++q)
+    {
+        if(q != outParams.begin())
+        {
+            responseParams += ", ";
+            responseParamsDecl += ", ";
+        }
+        string typeString = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(),
+                                              _useWstring | TypeContextCpp11);
+        responseParams += typeString;
+        responseParamsDecl += typeString + " " + fixKwd(string(paramPrefix) + (*q)->name());
+    }
+
+    string isConst = ((p->mode() == Operation::Nonmutating) || p->hasMetaData("cpp:const")) ? " const" : "";
+    bool amd = (cl->hasMetaData("amd") || p->hasMetaData("amd"));
+
+    ExceptionList throws = p->throws();
+    throws.sort();
+    throws.unique();
+
+    //
+    // Arrange exceptions into most-derived to least-derived order. If we don't
+    // do this, a base exception handler can appear before a derived exception
+    // handler, causing compiler warnings and resulting in the base exception
+    // being marshaled instead of the derived exception.
+    //
+#if defined(__SUNPRO_CC)
+    throws.sort(derivedToBaseCompare);
+#else
+    throws.sort(Slice::DerivedToBaseCompare());
+#endif
+
+    string deprecateSymbol = getDeprecateSymbol(p, cl);
+    H << sp;
+    if(!amd)
+    {
+        H << nl << deprecateSymbol << "virtual " << retS << ' ' << fixKwd(name) << params << isConst << " = 0;";
+    }
+    else
+    {
+        H << nl << deprecateSymbol << "virtual void " << name << "Async(";
+        H.useCurrentPosAsIndent();
+        H << paramsAMD;
+        if(!paramsAMD.empty())
+        {
+            H << "," << nl;
+        }
+        H << "::std::function<void(" << responseParams << ")>," << nl
+          << "::std::function<void(::std::exception_ptr)>, const Ice::Current&)" << isConst << " = 0;";
+        H.restoreIndent();
+    }
+
+    H << sp;
+    H << nl << "::Ice::DispatchStatus ___" << name << "(::IceInternal::Incoming&, const ::Ice::Current&)" << isConst << ';';
+
+    C << sp;
+    C << nl << "::Ice::DispatchStatus" << nl << scope.substr(2) << "___" << name << "(::IceInternal::Incoming& __inS"
+      << ", const ::Ice::Current& __current)" << isConst;
+    C << sb;
+    C << nl << "__checkMode(" << operationModeToString(p->mode(), true) << ", __current.mode);";
+
+    if(!inParams.empty())
+    {
+        C << nl << "auto __is = __inS.startReadParams();";
+        writeAllocateCode(C, inParams, 0, true, _useWstring | TypeContextInParam | TypeContextCpp11);
+        writeUnmarshalCode(C, inParams, 0, true, _useWstring | TypeContextInParam | TypeContextCpp11);
+        if(p->sendsClasses(false))
+        {
+            C << nl << "__is->readPendingValues();";
+        }
+        C << nl << "__inS.endReadParams();";
+    }
+    else
+    {
+        C << nl << "__inS.readEmptyParams();";
+    }
+
+    if(!amd)
+    {
+        writeAllocateCode(C, outParams, 0, true, _useWstring | TypeContextCpp11);
+        if(!throws.empty())
+        {
+            C << nl << "try";
+            C << sb;
+        }
+        C << nl;
+        if(ret)
+        {
+            C << retS << " __ret = ";
+        }
+        C << fixKwd(name) << args << ';';
+        if(ret || !outParams.empty())
+        {
+            C << nl << "auto __os = __inS.__startWriteParams(" << opFormatTypeToString(p) << ");";
+            writeMarshalCode(C, outParams, p, true, TypeContextCpp11);
+            if(p->returnsClasses(false))
+            {
+                C << nl << "__os->writePendingValues();";
+            }
+            C << nl << "__inS.__endWriteParams(true);";
+        }
+        else
+        {
+            C << nl << "__inS.__writeEmptyParams();";
+        }
+        C << nl << "return ::Ice::DispatchOK;";
+        if(!throws.empty())
+        {
+            C << eb;
+            ExceptionList::const_iterator r;
+            for(r = throws.begin(); r != throws.end(); ++r)
+            {
+                C << nl << "catch(const " << fixKwd((*r)->scoped()) << "& __ex)";
+                C << sb;
+                C << nl << "__inS.__writeUserException(__ex, " << opFormatTypeToString(p) << ");";
+                C << eb;
+            }
+            C << nl << "return ::Ice::DispatchUserException;";
+        }
+    }
+    else
+    {
+        C << nl << "auto inS = ::IceInternal::IncomingAsync::create(__inS);";
+        C << nl << "auto __exception = [inS](::std::exception_ptr e)";
+        C << sb;
+        C << nl << "try";
+        C << sb;
+        C << nl << "std::rethrow_exception(e);";
+        C << eb;
+
+        for(ExceptionList::const_iterator r = throws.begin(); r != throws.end(); ++r)
+        {
+            C << nl << "catch(const " << fixKwd((*r)->scoped()) << "& __ex)";
+            C << sb;
+            C << nl <<"if(inS->__validateResponse(false))";
+            C << sb;
+            C << nl << "inS->__writeUserException(__ex, " << opFormatTypeToString(p) << ");";
+            C << nl << "inS->__response();";
+            C << eb;
+            C << eb;
+        }
+
+        C << nl << "catch(const ::std::exception& __ex)";
+        C << sb;
+        C << nl << "inS->ice_exception(__ex);";
+        C << eb;
+        C << nl << "catch(...)";
+        C << sb;
+        C << nl << "inS->ice_exception();";
+        C << eb;
+        C << eb << ";";
+
+        C << nl << "try";
+        C << sb;
+
+        C << nl << name << "Async(";
+        C.useCurrentPosAsIndent();
+        if(!argsAMD.empty())
+        {
+            C << argsAMD << ",";
+            C << nl;
+        }
+        C << "[inS](" << responseParamsDecl << ")";
+        C << sb;
+        C << nl << "if(inS->__validateResponse(true))";
+        C << sb;
+        if(ret || !outParams.empty())
+        {
+            C << nl << "auto __os = inS->__startWriteParams(" << opFormatTypeToString(p) << ");";
+            writeMarshalCode(C, outParams, p, true, TypeContextCpp11);
+            if(p->returnsClasses(false))
+            {
+                C << nl << "__os->writePendingValues();";
+            }
+            C << nl << "inS->__endWriteParams(true);";
+        }
+        else
+        {
+            C << nl << "inS->__writeEmptyParams();";
+        }
+        C << nl << "inS->__response();";
+        C << eb;
+        C << eb << ",";
+        C << nl << "__exception, __current);";
+        C.restoreIndent();
+        C << eb;
+        C << nl << "catch(...)";
+        C << sb;
+        C << nl << "__exception(std::current_exception());";
+        C << eb;
+        C << nl << "return ::Ice::DispatchAsync;";
+    }
+    C << eb;
+}
+
+Slice::Gen::Cpp11ValueVisitor::Cpp11ValueVisitor(::IceUtilInternal::Output& h,
+                                                 ::IceUtilInternal::Output& c,
+                                                 const std::string& dllExport) :
+    Cpp11ObjectVisitor(h, c, dllExport)
+{
+}
+
+bool
+Slice::Gen::Cpp11ValueVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!p->hasValueDefs())
+    {
+        return false;
+    }
+
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+    string name = fixKwd(p->name());
+    H << sp << nl << "namespace " << name << nl << '{';
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ValueVisitor::visitModuleEnd(const ModulePtr&)
+{
+    H << sp;
+    H << nl << '}';
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11ValueVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    if(p->isLocal() || p->isInterface())
+    {
+        return false;
+    }
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+
+    string name = fixKwd(p->name());
+    string scope = fixKwd(p->scope());
+    string scoped = fixKwd(p->scoped());
+    ClassList bases = p->bases();
+    ClassDefPtr base;
+    if(!bases.empty())
+    {
+        base = bases.front();
+    }
+    DataMemberList dataMembers = p->dataMembers();
+    DataMemberList allDataMembers = p->allDataMembers();
+
+    H << sp << nl << "class " << _dllClassExport << name << " : public ::Ice::ValueHelper<" << name << ", ";
+
+    if(!base || (base && base->isInterface()))
+    {
+        H << "Ice::Value";
+    }
+    else
+    {
+        H << fixKwd(base->scoped());
+    }
+    H << ">";
+    H << sb;
+    H.dec();
+    H << nl << "public:" << sp;
+    H.inc();
+
+    //
+    // In C++, a nested type cannot have the same name as the enclosing type
+    //
+
+    if(p->name() != "PointerType")
+    {
+        H << nl << "typedef ::std::shared_ptr<" << name << "> PointerType;";
+    }
+
+    // Out of line dtor to avoid weak vtable
+    H << sp;
+    H << nl << _dllMemberExport << "virtual ~" << name << "();";
+    C << sp;
+    C << nl << scoped.substr(2) << "::~" << name << "()";
+    C << sb;
+    C << eb;
+
+    vector<string> params;
+    vector<string> allTypes;
+    vector<string> allParamDecls;
+
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        params.push_back(fixKwd((*q)->name()));
+    }
+
+    for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+    {
+        string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring);
+        allTypes.push_back(typeName);
+        allParamDecls.push_back(typeName + " __ice_" + (*q)->name());
+    }
+
+    H << sp << nl << name << "() = default;";
+
+    emitOneShotConstructor(p);
+    H << sp;
+    H << nl << _dllMemberExport << "static const ::std::string& ice_staticId();";
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ValueVisitor::visitClassDefEnd(const ClassDefPtr& p)
+{
+    string scoped = fixKwd(p->scoped());
+    string scope = fixKwd(p->scope());
+    string name = fixKwd(p->name());
+    string typeId = p->flattenedScope() + p->name() + "_init.typeId";
+    ClassList bases = p->bases();
+    ClassDefPtr base;
+    if(!bases.empty() && !bases.front()->isInterface())
+    {
+        base = bases.front();
+    }
+    bool basePreserved = p->inheritsMetaData("preserve-slice");
+    bool preserved = p->hasMetaData("preserve-slice");
+
+    if(preserved && !basePreserved)
+    {
+        H << sp;
+        H << nl << "virtual void __write(::Ice::OutputStream*) const;";
+        H << nl << "virtual void __read(::Ice::InputStream*);";
+
+        C << sp;
+        C << nl << "void" << nl << scoped.substr(2) << "::__write(::Ice::OutputStream* __os) const";
+        C << sb;
+        C << nl << "__os->startValue(__slicedData);";
+        C << nl << "__writeImpl(__os);";
+        C << nl << "__os->endValue();";
+        C << eb;
+
+        C << sp;
+        C << nl << "void" << nl << scoped.substr(2) << "::__read(::Ice::InputStream* __is)";
+        C << sb;
+        C << nl << "__is->startValue();";
+        C << nl << "__readImpl(__is);";
+        C << nl << "__slicedData = __is->endValue(true);";
+        C << eb;
+    }
+
+    C << sp;
+    C << nl << "const ::std::string&" << nl << scoped.substr(2) << "::ice_staticId()";
+    C << sb;
+    C << nl << "return " << typeId << ";";
+    C << eb;
+
+    //
+    // Emit data members. Access visibility may be specified by metadata.
+    //
+    bool inProtected = false;
+    bool generateFriend = false;
+    DataMemberList dataMembers = p->dataMembers();
+    bool prot = p->hasMetaData("protected");
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        if(prot || (*q)->hasMetaData("protected"))
+        {
+            if(!inProtected)
+            {
+                H.dec();
+                H << sp << nl << "protected:";
+                H.inc();
+                inProtected = true;
+            }
+            generateFriend = true;
+        }
+        else
+        {
+            if(inProtected)
+            {
+                H.dec();
+                H << sp << nl << "public:";
+                H.inc();
+                inProtected = false;
+            }
+        }
+
+        emitDataMember(*q);
+    }
+
+    if(preserved && !basePreserved)
+    {
+        if(!inProtected)
+        {
+            H.dec();
+            H << sp << nl << "protected:";
+            H.inc();
+            inProtected = true;
+        }
+        H << sp << nl << "::std::shared_ptr<::Ice::SlicedData> __slicedData;";
+    }
+
+    if(generateFriend)
+    {
+        if(!inProtected)
+        {
+            H.dec();
+            H << sp << nl << "protected:";
+            H.inc();
+            inProtected = true;
+        }
+
+        H << sp;
+        H << nl << "template<typename T, typename S>";
+        H << nl << "friend struct Ice::StreamWriter;";
+        H << nl << "template<typename T, typename S>";
+        H << nl << "friend struct Ice::StreamReader;";
+    }
+
+    H << eb << ';';
+
+    if(!_doneStaticSymbol)
+    {
+        //
+        // We need an instance here to trigger initialization if the implementation is in a static library.
+        // But we do this only once per source file, because a single instance is sufficient to initialize
+        // all of the globals in a compilation unit.
+        //
+        _doneStaticSymbol = true;
+        H << sp << nl << "static " << fixKwd(p->name()) << " _" << p->name() << "_init;";
+    }
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11ValueVisitor::visitExceptionStart(const ExceptionPtr&)
+{
+    return false;
+}
+
+bool
+Slice::Gen::Cpp11ValueVisitor::visitStructStart(const StructPtr&)
+{
+    return false;
+}
+
+void
+Slice::Gen::Cpp11ValueVisitor::visitOperation(const OperationPtr&)
+{
+}
+
+
+bool
+Slice::Gen::Cpp11ObjectVisitor::emitVirtualBaseInitializers(const ClassDefPtr& derived, const ClassDefPtr& base)
+{
+    DataMemberList allDataMembers = base->allDataMembers();
+    if(allDataMembers.empty())
+    {
+        return false;
+    }
+
+    string upcall = "(";
+    for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+    {
+        if(q != allDataMembers.begin())
+        {
+            upcall += ", ";
+        }
+        if(isMovable((*q)->type()))
+        {
+            upcall += "::std::move(__ice_" + (*q)->name() + ")";
+        }
+        else
+        {
+            upcall += "__ice_" + (*q)->name();
+        }
+    }
+    upcall += ")";
+
+    if(base->isLocal())
+    {
+        H << nl << fixKwd(base->scoped());
+    }
+    else
+    {
+        H << nl << "Ice::ValueHelper<" << fixKwd(derived->scoped()) << ", " << fixKwd(base->scoped()) << ">";
+    }
+    H << upcall;
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ObjectVisitor::emitOneShotConstructor(const ClassDefPtr& p)
+{
+    DataMemberList allDataMembers = p->allDataMembers();
+
+    if(!allDataMembers.empty())
+    {
+        vector<string> allParamDecls;
+        DataMemberList dataMembers = p->dataMembers();
+
+        for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+        {
+            string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(),
+                                                _useWstring | TypeContextCpp11);
+            allParamDecls.push_back(typeName + " __ice_" + (*q)->name());
+        }
+
+        H << sp << nl;
+        if(allParamDecls.size() == 1)
+        {
+            H << "explicit ";
+        }
+        H << fixKwd(p->name()) << spar << allParamDecls << epar << " :";
+        H.inc();
+
+        ClassList bases = p->bases();
+
+        if(!bases.empty() && !bases.front()->isInterface())
+        {
+            if(emitVirtualBaseInitializers(p, bases.front()))
+            {
+                if(!dataMembers.empty())
+                {
+                    H << ',';
+                }
+            }
+        }
+
+        if(!dataMembers.empty())
+        {
+            H << nl;
+        }
+
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        {
+            if(q != dataMembers.begin())
+            {
+                H << ',' << nl;
+            }
+            string memberName = fixKwd((*q)->name());
+            if(isMovable((*q)->type()))
+            {
+                H << memberName << "(::std::move(" << "__ice_" << (*q)->name() << "))";
+            }
+            else
+            {
+                H << memberName << '(' << "__ice_" << (*q)->name() << ')';
+            }
+        }
+
+        H.dec();
+        H << sb;
+        H << eb;
+    }
+}
+
+Slice::Gen::Cpp11StreamVisitor::Cpp11StreamVisitor(Output& h, Output& c, const string& dllExport) :
+    H(h),
+    C(c),
+    _dllExport(dllExport)
+{
+}
+
+bool
+Slice::Gen::Cpp11StreamVisitor::visitModuleStart(const ModulePtr& m)
+{
+    if(!m->hasNonLocalContained(Contained::ContainedTypeStruct) &&
+       !m->hasNonLocalContained(Contained::ContainedTypeEnum) &&
+       !m->hasNonLocalContained(Contained::ContainedTypeException) &&
+       !m->hasNonLocalContained(Contained::ContainedTypeClass))
+    {
+        return false;
+    }
+
+    if(UnitPtr::dynamicCast(m->container()))
+    {
+        //
+        // Only emit this for the top-level module.
+        //
+        H << sp;
+        H << nl << "namespace Ice" << nl << '{';
+
+        if(m->hasNonLocalContained(Contained::ContainedTypeStruct))
+        {
+            C << sp;
+            C << nl << "namespace Ice" << nl << '{';
+        }
+    }
+    return true;
+}
+
+void
+Slice::Gen::Cpp11StreamVisitor::visitModuleEnd(const ModulePtr& m)
+{
+    if(UnitPtr::dynamicCast(m->container()))
+    {
+        //
+        // Only emit this for the top-level module.
+        //
+        H << nl << '}';
+        if(m->hasNonLocalContained(Contained::ContainedTypeStruct))
+        {
+            C << nl << '}';
+        }
+    }
+}
+
+bool
+Slice::Gen::Cpp11StreamVisitor::visitStructStart(const StructPtr& p)
+{
+    if(p->isLocal())
+    {
+        return false;
+    }
+
+    string scoped = fixKwd(p->scoped());
+
+    H << nl << "template<>";
+    H << nl << "struct StreamableTraits< " << scoped << ">";
+    H << sb;
+    H << nl << "static const StreamHelperCategory helper = StreamHelperCategoryStruct;";
+    H << nl << "static const int minWireSize = " << p->minWireSize() << ";";
+    H << nl << "static const bool fixedLength = " << (p->isVariableLength() ? "false" : "true") << ";";
+    H << eb << ";" << nl;
+
+    writeStreamHelpers(H, false, p, p->dataMembers());
+
+    return false;
+}
+
+bool
+Slice::Gen::Cpp11StreamVisitor::visitClassDefStart(const ClassDefPtr& c)
+{
+    if(!c->isLocal() && !c->isInterface())
+    {
+        writeStreamHelpers(H, true, c, c->dataMembers(), c->orderedOptionalDataMembers());
+    }
+    return false;
+}
+
+void
+Slice::Gen::Cpp11StreamVisitor::visitExceptionEnd(const ExceptionPtr& p)
+{
+    if(!p->isLocal())
+    {
+        writeStreamHelpers(H, true, p, p->dataMembers(), p->orderedOptionalDataMembers());
+    }
+}
+
+void
+Slice::Gen::Cpp11StreamVisitor::visitEnum(const EnumPtr& p)
+{
+    if(!p->isLocal())
+    {
+        string scoped = fixKwd(p->scoped());
+        H << nl << "template<>";
+        H << nl << "struct StreamableTraits< " << scoped << ">";
+        H << sb;
+        H << nl << "static const StreamHelperCategory helper = StreamHelperCategoryEnum;";
+        H << nl << "static const int minValue = " << p->minValue() << ";";
+        H << nl << "static const int maxValue = " << p->maxValue() << ";";
+        H << nl << "static const int minWireSize = " << p->minWireSize() << ";";
+        H << nl << "static const bool fixedLength = false;";
+        H << eb << ";" << nl;
+    }
+}
+
+
+Slice::Gen::Cpp11CompatibilityVisitor::Cpp11CompatibilityVisitor(Output& h, Output&, const string& dllExport) :
+    H(h),
+    _dllExport(dllExport)
+{
+}
+
+bool
+Slice::Gen::Cpp11CompatibilityVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!p->hasClassDecls())
+    {
+        return false;
+    }
+
+    string name = fixKwd(p->name());
+
+    H << sp << nl << "namespace " << name << nl << '{';
+    return true;
+}
+
+void
+Slice::Gen::Cpp11CompatibilityVisitor::visitModuleEnd(const ModulePtr&)
+{
+    H << sp;
+    H << nl << '}';
+}
+
+void
+Slice::Gen::Cpp11CompatibilityVisitor::visitClassDecl(const ClassDeclPtr& p)
+{
+    if(p->definition() && p->definition()->isDelegate())
+    {
+        return;
+    }
+
+    string name = fixKwd(p->name());
+    string scoped = fixKwd(p->scoped());
+
+    H << sp << nl << "typedef ::std::shared_ptr<" << name << "> " << p->name() << "Ptr;";
+
+    if(!p->isLocal())
+    {
+        ClassDefPtr def = p->definition();
+        if(p->isInterface() || (def && !def->allOperations().empty()))
+        {
+            H << nl << "class " << p->name() << "Prx;";
+            H << nl << "typedef ::std::shared_ptr<" << p->name() << "Prx> " << p->name() << "PrxPtr;";
+        }
+    }
+}
+
+Slice::Gen::Cpp11ImplVisitor::Cpp11ImplVisitor(Output& h, Output& c, const string& dllExport) :
+    H(h), C(c), _dllExport(dllExport), _useWstring(false)
+{
+}
+
+string
+Slice::Gen::Cpp11ImplVisitor::defaultValue(const TypePtr& type, const StringList& metaData) const
+{
+    BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
+    if(builtin)
+    {
+        switch(builtin->kind())
+        {
+            case Builtin::KindBool:
+            {
+                return "false";
+            }
+            case Builtin::KindByte:
+            case Builtin::KindShort:
+            case Builtin::KindInt:
+            case Builtin::KindLong:
+            {
+                return "0";
+            }
+            case Builtin::KindFloat:
+            case Builtin::KindDouble:
+            {
+                return "0.0";
+            }
+            case Builtin::KindString:
+            {
+                return "::std::string()";
+            }
+            case Builtin::KindValue:
+            case Builtin::KindObject:
+            case Builtin::KindObjectProxy:
+            case Builtin::KindLocalObject:
+            {
+                return "nullptr";
+            }
+        }
+    }
+    else
+    {
+        ProxyPtr prx = ProxyPtr::dynamicCast(type);
+
+        if(ProxyPtr::dynamicCast(type) || ClassDeclPtr::dynamicCast(type))
+        {
+            return "nullptr";
+        }
+
+        StructPtr st = StructPtr::dynamicCast(type);
+        if(st)
+        {
+           return fixKwd(st->scoped()) + "()";
+        }
+
+        EnumPtr en = EnumPtr::dynamicCast(type);
+        if(en)
+        {
+            EnumeratorList enumerators = en->getEnumerators();
+            return fixKwd(en->scoped() + "::" + enumerators.front()->name());
+        }
+
+        SequencePtr seq = SequencePtr::dynamicCast(type);
+        if(seq)
+        {
+            return typeToString(seq, metaData, _useWstring | TypeContextCpp11) + "()";
+        }
+
+        DictionaryPtr dict = DictionaryPtr::dynamicCast(type);
+        if(dict)
+        {
+            return fixKwd(dict->scoped()) + "()";
+        }
+    }
+
+    assert(false);
+    return "???";
+}
+
+void
+Slice::Gen::Cpp11ImplVisitor::writeReturn(Output& out, const TypePtr& type, const StringList& metaData)
+{
+    out << nl << "return " << defaultValue(type, metaData) << ";";
+}
+
+bool
+Slice::Gen::Cpp11ImplVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!p->hasClassDefs())
+    {
+        return false;
+    }
+
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+
+    string name = fixKwd(p->name());
+
+    H << sp << nl << "namespace " << name << nl << '{';
+
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ImplVisitor::visitModuleEnd(const ModulePtr&)
+{
+    H << sp;
+    H << nl << '}';
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    if(!p->isAbstract())
+    {
+        return false;
+    }
+
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+
+    string name = p->name();
+    string scope = fixKwd(p->scope());
+    string cls = scope.substr(2) + name + "I";
+    ClassList bases = p->bases();
+
+    H << sp;
+    H << nl << "class " << name << "I : ";
+    H.useCurrentPosAsIndent();
+    H << "public virtual ";
+
+    if(p->isInterface() || p->isLocal())
+    {
+        H << fixKwd(name);
+    }
+    else
+    {
+        H << fixKwd(name + "Disp");
+    }
+    H.restoreIndent();
+
+    H << sb;
+    H.dec();
+    H << nl << "public:";
+    H.inc();
+
+    OperationList ops = p->allOperations();
+
+    for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r)
+    {
+        OperationPtr op = (*r);
+        string opName = op->name();
+
+        TypePtr ret = op->returnType();
+        string retS = returnTypeToString(ret, op->returnIsOptional(), op->getMetaData(),
+                                         _useWstring | TypeContextCpp11);
+
+        ParamDeclList params = op->parameters();
+        ParamDeclList outParams;
+        ParamDeclList inParams;
+        for(ParamDeclList::const_iterator q = params.begin(); q != params.end(); ++q)
+        {
+            if((*q)->isOutParam())
+            {
+                outParams.push_back(*q);
+            }
+            else
+            {
+                inParams.push_back(*q);
+            }
+        }
+
+        if(!p->isLocal() && (p->hasMetaData("amd") || op->hasMetaData("amd")))
+        {
+            string responseParams;
+            string responseParamsDecl;
+
+            H << sp << nl << "virtual void " << opName << "Async(";
+            H.useCurrentPosAsIndent();
+            for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end(); ++q)
+            {
+                H << typeToString((*q)->type(), (*q)->optional(),
+                                  (*q)->getMetaData(), _useWstring | TypeContextInParam | TypeContextCpp11)
+                  << "," << nl;
+            }
+
+            if(ret)
+            {
+                string typeS = inputTypeToString(ret, op->returnIsOptional(), op->getMetaData(),
+                                                 _useWstring | TypeContextCpp11);
+                responseParams = typeS;
+                responseParamsDecl = typeS + " __ret";
+                if(!outParams.empty())
+                {
+                    responseParams += ", ";
+                    responseParamsDecl += ", ";
+                }
+            }
+
+            for(ParamDeclList::iterator q = outParams.begin(); q != outParams.end(); ++q)
+            {
+                if(q != outParams.begin())
+                {
+                    responseParams += ", ";
+                    responseParamsDecl += ", ";
+                }
+                string typeS = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(),
+                                                 _useWstring | TypeContextCpp11);
+                responseParams += typeS;
+                responseParamsDecl += typeS + " " + fixKwd(string(paramPrefix) + (*q)->name());
+            }
+
+            string isConst = ((op->mode() == Operation::Nonmutating) || op->hasMetaData("cpp:const")) ? " const" : "";
+
+            H << "std::function<void(" << responseParams << ")>,";
+            H << nl << "std::function<void(std::exception_ptr)>,";
+            H << nl << "const Ice::Current&)" << isConst << ';';
+            H.restoreIndent();
+
+            C << sp << nl << "void" << nl << scope << name << "I::" << opName << "Async(";
+            C.useCurrentPosAsIndent();
+            for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end(); ++q)
+            {
+                C << typeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(),
+                                  _useWstring | TypeContextInParam | TypeContextCpp11);
+                C << ' ' << fixKwd((*q)->name()) << "," << nl;
+            }
+
+            C << "std::function<void(" << responseParams << ")> " << opName << "_response,";
+            C << nl << "std::function<void(std::exception_ptr)>,";
+            C << nl << "const Ice::Current& current)" << isConst;
+            C.restoreIndent();
+            C << sb;
+
+            string result = "r";
+            for(ParamDeclList::const_iterator q = params.begin(); q != params.end(); ++q)
+            {
+                if((*q)->name() == result)
+                {
+                    result = "_" + result;
+                    break;
+                }
+            }
+
+            C << nl << opName << "_response(";
+            if(ret)
+            {
+                C << defaultValue(ret, op->getMetaData());
+            }
+            for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end(); ++q)
+            {
+                if(ret || q != outParams.begin())
+                {
+                    C << ", ";
+                }
+                C << defaultValue((*q)->type(), op->getMetaData());
+            }
+            C << ");";
+
+            C << eb;
+        }
+        else
+        {
+            H << sp << nl << "virtual " << retS << ' ' << fixKwd(opName) << '(';
+            H.useCurrentPosAsIndent();
+            ParamDeclList paramList = op->parameters();
+            for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
+            {
+                if(q != paramList.begin())
+                {
+                    H << ',' << nl;
+                }
+                StringList metaData = (*q)->getMetaData();
+                string typeString;
+                if((*q)->isOutParam())
+                {
+                    typeString = outputTypeToString((*q)->type(), (*q)->optional(), metaData,
+                                                    _useWstring | TypeContextCpp11);
+                }
+                else
+                {
+                    typeString = typeToString((*q)->type(), (*q)->optional(), metaData,
+                                              _useWstring | TypeContextInParam | TypeContextCpp11);
+                }
+                H << typeString;
+            }
+            if(!p->isLocal())
+            {
+                if(!paramList.empty())
+                {
+                    H << ',' << nl;
+                }
+                H << "const Ice::Current&";
+            }
+            H.restoreIndent();
+
+            string isConst = ((op->mode() == Operation::Nonmutating) || op->hasMetaData("cpp:const")) ? " const" : "";
+
+            H << ")" << isConst << ';';
+
+            C << sp << nl << retS << nl;
+            C << scope.substr(2) << name << "I::" << fixKwd(opName) << '(';
+            C.useCurrentPosAsIndent();
+            for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
+            {
+                if(q != paramList.begin())
+                {
+                    C << ',' << nl;
+                }
+                StringList metaData = (*q)->getMetaData();
+                string typeString;
+                if((*q)->isOutParam())
+                {
+                    C << outputTypeToString((*q)->type(), (*q)->optional(), metaData, _useWstring | TypeContextCpp11)
+                      << " "
+                      << fixKwd((*q)->name());
+                }
+                else
+                {
+                    C << typeToString((*q)->type(), (*q)->optional(), metaData,
+                                      _useWstring | TypeContextInParam | TypeContextCpp11)
+                      << " /*" << fixKwd((*q)->name()) << "*/";
+                }
+            }
+            if(!p->isLocal())
+            {
+                if(!paramList.empty())
+                {
+                    C << ',' << nl;
+                }
+                C << "const Ice::Current& current";
+            }
+            C.restoreIndent();
+            C << ')';
+            C << isConst;
+            C << sb;
+
+            for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end(); ++q)
+            {
+                C << nl << fixKwd((*q)->name()) << " = " << defaultValue((*q)->type(), op->getMetaData()) << ";";
+            }
+
+            if(ret)
+            {
+                writeReturn(C, ret, op->getMetaData());
+            }
+
+            C << eb;
+        }
+    }
+
+    H << eb << ';';
+
+    _useWstring = resetUseWstring(_useWstringHist);
+
+    return true;
+}
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
index 24bfcbac8e9..479dfc2866a 100644
--- a/cpp/src/slice2cpp/Gen.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -35,8 +35,9 @@ public:
     ~Gen();
 
     void generate(const UnitPtr&);
+    void generateChecksumMap(const UnitPtr&);
     void closeOutput();
-    
+
     static int setUseWstring(ContainedPtr, std::list<int>&, int);
     static int resetUseWstring(std::list<int>&);
 
@@ -66,16 +67,16 @@ private:
     std::vector<std::string> _includePaths;
     std::string _dllExport;
     std::string _dir;
-    bool _impl;
+    bool _implCpp98;
+    bool _implCpp11;
     bool _checksum;
-    bool _stream;
     bool _ice;
 
     class TypesVisitor : private ::IceUtil::noncopyable, public ParserVisitor
     {
     public:
 
-        TypesVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool);
+        TypesVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
 
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
@@ -98,7 +99,6 @@ private:
         ::IceUtilInternal::Output& C;
 
         std::string _dllExport;
-        bool _stream;
         bool _doneStaticSymbol;
         int _useWstring;
         std::list<int> _useWstringHist;
@@ -143,6 +143,8 @@ private:
         ::IceUtilInternal::Output& C;
 
         std::string _dllExport;
+        std::string _dllClassExport;
+        std::string _dllMemberExport;
         int _useWstring;
         std::list<int> _useWstringHist;
     };
@@ -170,7 +172,7 @@ private:
     {
     public:
 
-        ObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool);
+        ObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
 
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
@@ -194,7 +196,6 @@ private:
         ::IceUtilInternal::Output& C;
 
         std::string _dllExport;
-        bool _stream;
         bool _doneStaticSymbol;
         int _useWstring;
         std::list<int> _useWstringHist;
@@ -266,10 +267,9 @@ private:
         std::list<int> _useWstringHist;
 
         //
-        // Generate code to emit a local variable declaration and initialize it
-        // if necessary.
+        // Get the default value returned for a type
         //
-        void writeDecl(::IceUtilInternal::Output&, const std::string&, const TypePtr&, const StringList&);
+        std::string defaultValue(const TypePtr&, const StringList&) const;
 
         //
         // Generate code to return a dummy value
@@ -292,6 +292,7 @@ private:
     private:
 
         ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
 
         std::string _dllExport;
         int _useWstring;
@@ -321,7 +322,7 @@ private:
         int _useWstring;
         std::list<int> _useWstringHist;
     };
-    
+
     class StreamVisitor : private ::IceUtil::noncopyable, public ParserVisitor
     {
     public:
@@ -331,7 +332,228 @@ private:
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
         virtual bool visitStructStart(const StructPtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual void visitEnum(const EnumPtr&);
+
+    private:
+
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
+        std::string _dllExport;
+    };
+    //
+    // C++11 Visitors
+    //
+    class Cpp11DeclVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11DeclVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitUnitStart(const UnitPtr&);
+        virtual void visitUnitEnd(const UnitPtr&);
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual void visitClassDecl(const ClassDeclPtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual void visitOperation(const OperationPtr&);
+
+    private:
+
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
+
+        std::string _dllExport;
+    };
+
+    class Cpp11TypesVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11TypesVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual void visitExceptionEnd(const ExceptionPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual void visitStructEnd(const StructPtr&);
+        virtual void visitSequence(const SequencePtr&);
+        virtual void visitDictionary(const DictionaryPtr&);
+        virtual void visitEnum(const EnumPtr&);
+        virtual void visitConst(const ConstPtr&);
+        virtual void visitDataMember(const DataMemberPtr&);
+
+    private:
+
+        void emitUpcall(const ExceptionPtr&, const std::string&, bool = false);
+
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
+
+        std::string _dllExport;
+        std::string _dllClassExport;
+        std::string _dllMemberExport;
+        bool _doneStaticSymbol;
+        int _useWstring;
+        std::list<int> _useWstringHist;
+    };
+
+    class Cpp11ProxyVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11ProxyVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitUnitStart(const UnitPtr&);
+        virtual void visitUnitEnd(const UnitPtr&);
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual void visitOperation(const OperationPtr&);
+
+    private:
+
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
+
+        std::string _dllClassExport;
+        std::string _dllMemberExport;
+        int _useWstring;
+        std::list<int> _useWstringHist;
+    };
+
+
+    class Cpp11ObjectVisitor : public ParserVisitor
+    {
+    public:
+
+        Cpp11ObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+    protected:
+
+        bool emitVirtualBaseInitializers(const ClassDefPtr&, const ClassDefPtr&);
+        void emitOneShotConstructor(const ClassDefPtr&);
+        void emitDataMember(const DataMemberPtr&);
+
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
+
+        std::string _dllExport;
+        std::string _dllClassExport;
+        std::string _dllMemberExport;
+        bool _doneStaticSymbol;
+        int _useWstring;
+        std::list<int> _useWstringHist;
+    };
+
+    class Cpp11LocalObjectVisitor : private ::IceUtil::noncopyable, public Cpp11ObjectVisitor
+    {
+    public:
+
+        Cpp11LocalObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual void visitOperation(const OperationPtr&);
+    };
+
+    class Cpp11InterfaceVisitor : private ::IceUtil::noncopyable, public Cpp11ObjectVisitor
+    {
+    public:
+
+        Cpp11InterfaceVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual void visitOperation(const OperationPtr&);
+        void emitUpcall(const ClassDefPtr&, const std::string&);
+    };
+
+    class Cpp11ValueVisitor : private ::IceUtil::noncopyable, public Cpp11ObjectVisitor
+    {
+    public:
+
+        Cpp11ValueVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
         virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual void visitOperation(const OperationPtr&);
+        void emitUpcall(const ClassDefPtr&, const std::string&);
+    };
+
+    class Cpp11AsyncVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11AsyncVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual void visitOperation(const OperationPtr&);
+
+    private:
+
+        ::IceUtilInternal::Output& H;
+
+        std::string _dllExport;
+        int _useWstring;
+        std::list<int> _useWstringHist;
+    };
+
+    class Cpp11AsyncImplVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11AsyncImplVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitUnitStart(const UnitPtr&);
+        virtual void visitUnitEnd(const UnitPtr&);
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual void visitOperation(const OperationPtr&);
+
+    private:
+
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
+
+        std::string _dllExport;
+        int _useWstring;
+        std::list<int> _useWstringHist;
+    };
+
+    class Cpp11StreamVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11StreamVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitExceptionEnd(const ExceptionPtr&);
         virtual void visitEnum(const EnumPtr&);
 
     private:
@@ -341,6 +563,53 @@ private:
         std::string _dllExport;
     };
 
+
+    class Cpp11CompatibilityVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11CompatibilityVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual void visitClassDecl(const ClassDeclPtr&);
+
+    private:
+
+        ::IceUtilInternal::Output& H;
+        std::string _dllExport;
+    };
+
+    class Cpp11ImplVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11ImplVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+
+    private:
+
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
+
+        std::string _dllExport;
+        int _useWstring;
+        std::list<int> _useWstringHist;
+
+        //
+        // Generate code to return a dummy value
+        //
+        void writeReturn(::IceUtilInternal::Output&, const TypePtr&, const StringList&);
+
+        //
+        // Get the default value returned for a type
+        //
+        std::string defaultValue(const TypePtr&, const StringList&) const;
+    };
+
 private:
 
     class MetaDataVisitor : public ParserVisitor
@@ -372,7 +641,38 @@ private:
         StringSet _history;
     };
 
+    class NormalizeMetaDataVisitor : public ParserVisitor
+    {
+    public:
+
+        explicit NormalizeMetaDataVisitor(bool);
+
+        virtual bool visitUnitStart(const UnitPtr&);
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual void visitClassDecl(const ClassDeclPtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual void visitExceptionEnd(const ExceptionPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual void visitStructEnd(const StructPtr&);
+        virtual void visitOperation(const OperationPtr&);
+        virtual void visitDataMember(const DataMemberPtr&);
+        virtual void visitSequence(const SequencePtr&);
+        virtual void visitDictionary(const DictionaryPtr&);
+        virtual void visitEnum(const EnumPtr&);
+        virtual void visitConst(const ConstPtr&);
+
+    private:
+
+        StringList normalize(const StringList&);
+
+        bool _cpp11;
+    };
+
     static void validateMetaData(const UnitPtr&);
+    static void normalizeMetaData(const UnitPtr&, bool);
 };
 
 }
diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index 6b09d176bd6..66e9bcf2269 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -73,7 +73,8 @@ usage(const char* n)
         "--include-dir DIR        Use DIR as the header include directory in source files.\n"
         "--output-dir DIR         Create files in the directory DIR.\n"
         "--dll-export SYMBOL      Use SYMBOL for DLL exports.\n"
-        "--impl                   Generate sample implementations.\n"
+        "--impl-c++98             Generate sample implementations for C++98 mapping.\n"
+        "--impl-c++11             Generate sample implementations for C++11 mapping.\n"
         "--depend                 Generate Makefile dependencies.\n"
         "--depend-xml             Generate dependencies in XML format.\n"
         "--depend-file FILE       Write dependencies to FILE instead of standard output.\n"
@@ -81,7 +82,6 @@ usage(const char* n)
         "--ice                    Allow reserved Ice prefix in Slice identifiers.\n"
         "--underscore             Allow underscores in Slice identifiers.\n"
         "--checksum               Generate checksums for Slice definitions.\n"
-        "--stream                 Generate marshaling support for public stream API.\n"
         ;
 }
 
@@ -102,7 +102,8 @@ compile(int argc, char* argv[])
     opts.addOpt("", "include-dir", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "output-dir", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "dll-export", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "impl");
+    opts.addOpt("", "impl-c++98");
+    opts.addOpt("", "impl-c++11");
     opts.addOpt("", "depend");
     opts.addOpt("", "depend-xml");
     opts.addOpt("", "depend-file", IceUtilInternal::Options::NeedArg, "");
@@ -110,7 +111,6 @@ compile(int argc, char* argv[])
     opts.addOpt("", "ice");
     opts.addOpt("", "underscore");
     opts.addOpt("", "checksum");
-    opts.addOpt("", "stream");
 
     bool validate = false;
     for(int i = 0; i < argc; ++i)
@@ -182,7 +182,9 @@ compile(int argc, char* argv[])
 
     string dllExport = opts.optArg("dll-export");
 
-    bool impl = opts.isSet("impl");
+    bool implCpp98 = opts.isSet("impl-c++98");
+    
+    bool implCpp11 = opts.isSet("impl-c++11");
 
     bool depend = opts.isSet("depend");
 
@@ -198,8 +200,6 @@ compile(int argc, char* argv[])
 
     bool checksum = opts.isSet("checksum");
 
-    bool stream = opts.isSet("stream");
-
     if(args.empty())
     {
         getErrorStream() << argv[0] << ": error: no input file" << endl;
@@ -219,6 +219,16 @@ compile(int argc, char* argv[])
         }
         return EXIT_FAILURE;
     }
+    
+    if(implCpp98 && implCpp11)
+    {
+        getErrorStream() << argv[0] << ": error: cannot specify both --impl-c++98 and --impl-c++11" << endl;
+        if(!validate)
+        {
+            usage(argv[0]);
+        }
+        return EXIT_FAILURE;
+    }
 
     if(validate)
     {
@@ -326,7 +336,7 @@ compile(int argc, char* argv[])
                     try
                     {
                         Gen gen(icecpp->getBaseName(), headerExtension, sourceExtension, extraHeaders, include,
-                                includePaths, dllExport, output, impl, checksum, stream, ice);
+                                includePaths, dllExport, output, implCpp98, implCpp11, checksum, ice);
                         gen.generate(u);
                     }
                     catch(const Slice::FileException& ex)
diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile
deleted file mode 100644
index 3af754207f8..00000000000
--- a/cpp/src/slice2cpp/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-NAME		= $(bindir)/slice2cpp$(EXE_EXT)
-
-TARGETS		= $(NAME)
-
-OBJS		= Gen.o \
-		  Main.o
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I.. $(CPPFLAGS)
-
-$(NAME): $(OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK)
-
-install:: all
-	$(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/slice2cpp.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/slice2cpp/Makefile.mak b/cpp/src/slice2cpp/Makefile.mak
deleted file mode 100644
index 6e0efe9a147..00000000000
--- a/cpp/src/slice2cpp/Makefile.mak
+++ /dev/null
@@ -1,49 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2cpp.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= .\Gen.obj \
-		  .\Main.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-RES_FILE        = Slice2Cpp.res
-
-$(NAME): $(OBJS) Slice2Cpp.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \
-		$(BASELIBS) $(RES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Cpp.res
-
-install:: all
-	copy $(NAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(NAME:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/slice2cpp/Slice2Cpp.rc b/cpp/src/slice2cpp/Slice2Cpp.rc
index f7c47855132..04d83296360 100644
--- a/cpp/src/slice2cpp/Slice2Cpp.rc
+++ b/cpp/src/slice2cpp/Slice2Cpp.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to C++ Translator\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "slice2cpp\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2cpp.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cpp/msbuild/packages.config b/cpp/src/slice2cpp/msbuild/packages.config
new file mode 100644
index 00000000000..88735dc0077
--- /dev/null
+++ b/cpp/src/slice2cpp/msbuild/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" />
+  <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
new file mode 100644
index 00000000000..16a69b83a0b
--- /dev/null
+++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{763F88BB-37FD-4BCC-9D13-A7103596EA06}</ProjectGuid>
+    <RootNamespace>slice2cpp</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Gen.cpp" />
+    <ClCompile Include="..\Main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Slice2Cpp.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Gen.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj">
+      <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj">
+      <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" />
+    <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj.filters b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj.filters
new file mode 100644
index 00000000000..7da0829adee
--- /dev/null
+++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj.filters
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{8EB6FF19-8937-44E6-B2B9-95011E58BAB7}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{6CB2FD02-0536-4B80-88F4-599F4282F634}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{ACD7D6F4-3B28-4319-B9AF-3564023394C6}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Gen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Slice2Cpp.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Gen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/slice2cs/.depend.mak b/cpp/src/slice2cs/.depend.mak
deleted file mode 100755
index 1d925283bc3..00000000000
--- a/cpp/src/slice2cs/.depend.mak
+++ /dev/null
@@ -1,45 +0,0 @@
-
-Gen.obj: \
-	Gen.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "Gen.h" \
-    "$(includedir)\Slice\CsUtil.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\Slice\Checksum.h" \
-    "$(includedir)\Slice\DotNetNames.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\Slice\Util.h" \
-
-Main.obj: \
-	Main.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Slice\Preprocessor.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "Gen.h" \
-    "$(includedir)\Slice\CsUtil.h" \
diff --git a/cpp/src/slice2cs/.gitignore b/cpp/src/slice2cs/.gitignore
deleted file mode 100644
index 720f44c7047..00000000000
--- a/cpp/src/slice2cs/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp
index a177b99a816..b3b1cf9718a 100644
--- a/cpp/src/Slice/CsUtil.cpp
+++ b/cpp/src/slice2cs/CsUtil.cpp
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#include <Slice/CsUtil.h>
-#include <Slice/DotNetNames.h>
+#include <CsUtil.h>
+#include <DotNetNames.h>
 #include <Slice/Util.h>
 #include <IceUtil/Functional.h>
 
@@ -36,7 +36,7 @@ lookupKwd(const string& name, int baseTypes, bool mangleCasts = false)
     //
     static const string keywordList[] =
     {
-        "abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked", "class", "const",
+        "abstract", "as", "async", "await", "base", "bool", "break", "byte", "case", "catch", "char", "checked", "class", "const",
         "continue", "decimal", "default", "delegate", "do", "double", "else", "enum", "event", "explicit", "extern",
         "false", "finally", "fixed", "float", "for", "foreach", "goto", "if", "implicit", "in", "int", "interface",
         "internal", "is", "lock", "long", "namespace", "new", "null", "object", "operator", "out", "override",
@@ -191,6 +191,10 @@ Slice::CsGenerator::getOptionalFormat(const TypePtr& type)
             assert(false);
             break;
         }
+        case Builtin::KindValue:
+        {
+            return "Ice.OptionalFormat.Class";
+        }
         }
     }
 
@@ -277,7 +281,8 @@ Slice::CsGenerator::typeToString(const TypePtr& type, bool optional)
         "string",
         "Ice.Object",
         "Ice.ObjectPrx",
-        "_System.Object"
+        "_System.Object",
+        "Ice.Object" // Ice.Value
     };
 
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
@@ -295,11 +300,6 @@ Slice::CsGenerator::typeToString(const TypePtr& type, bool optional)
     SequencePtr seq = SequencePtr::dynamicCast(type);
     if(seq)
     {
-        if(seq->hasMetaData("clr:collection"))
-        {
-            return fixId(seq->scoped());
-        }
-
         string prefix = "clr:generic:";
         string meta;
         if(seq->findMetaData(prefix, meta))
@@ -328,11 +328,6 @@ Slice::CsGenerator::typeToString(const TypePtr& type, bool optional)
     DictionaryPtr d = DictionaryPtr::dynamicCast(type);
     if(d)
     {
-        if(d->hasMetaData("clr:collection"))
-        {
-            return fixId(d->scoped());
-        }
-
         string prefix = "clr:generic:";
         string meta;
         string typeName;
@@ -369,6 +364,7 @@ Slice::CsGenerator::isValueType(const TypePtr& type)
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
             case Builtin::KindLocalObject:
+            case Builtin::KindValue:
             {
                 return false;
                 break;
@@ -436,19 +432,9 @@ void
 Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out,
                                               const TypePtr& type,
                                               const string& param,
-                                              bool marshal,
-                                              bool streamingAPI)
+                                              bool marshal)
 {
-    string stream;
-
-    if(marshal)
-    {
-        stream = streamingAPI ? "outS__" : "os__";
-    }
-    else
-    {
-        stream = streamingAPI ? "inS__" : "is__";
-    }
+    string stream = marshal ? "os__" : "is__";
 
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
     if(builtin)
@@ -552,14 +538,15 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out,
                 break;
             }
             case Builtin::KindObject:
+            case Builtin::KindValue:
             {
                 if(marshal)
                 {
-                    out << nl << stream << ".writeObject(" << param << ");";
+                    out << nl << stream << ".writeValue(" << param << ");";
                 }
                 else
                 {
-                    out << nl << stream << ".readObject(" << param << ");";
+                    out << nl << stream << ".readValue(" << param << ");";
                 }
                 break;
             }
@@ -591,21 +578,11 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out,
         string typeS = typeToString(type);
         if(marshal)
         {
-            out << nl << typeS << "Helper.write";
-            if(!streamingAPI)
-            {
-                out << "__";
-            }
-            out << "(" << stream << ", " << param << ");";
+            out << nl << typeS << "Helper.write(" << stream << ", " << param << ");";
         }
         else
         {
-            out << nl << param << " = " << typeS << "Helper.read";
-            if(!streamingAPI)
-            {
-                out << "__";
-            }
-            out << "(" << stream << ");";
+            out << nl << param << " = " << typeS << "Helper.read(" << stream << ");";
         }
         return;
     }
@@ -615,11 +592,11 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out,
     {
         if(marshal)
         {
-            out << nl << stream << ".writeObject(" << param << ");";
+            out << nl << stream << ".writeValue(" << param << ");";
         }
         else
         {
-            out << nl << stream << ".readObject(" << param << ");";
+            out << nl << stream << ".readValue(" << param << ");";
         }
         return;
     }
@@ -629,27 +606,24 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out,
     {
         if(marshal)
         {
-            const string write = streamingAPI ? "ice_write" : "write__";
             if(!isValueType(st))
             {
-                out << nl << typeToString(st) << "." << write << "(" << stream << ", " << param << ");";
+                out << nl << typeToString(st) << ".write(" << stream << ", " << param << ");";
             }
             else
             {
-                out << nl << param << "." << write << "(" << stream << ");";
+                out << nl << param << ".write__(" << stream << ");";
             }
         }
         else
         {
             if(!isValueType(st))
             {
-                const string r = streamingAPI ? "ice_read" : "read__";
-                out << nl << param << " = " << typeToString(type) << "." << r << "(" << stream << ", " << param << ");";
+                out << nl << param << " = " << typeToString(type) << ".read(" << stream << ");";
             }
             else
             {
-                const string read = streamingAPI ? "ice_read" : "read__";
-                out << nl << param << "." << read << "(" << stream << ");";
+                out << nl << param << ".read__(" << stream << ");";
             }
         }
         return;
@@ -660,28 +634,12 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out,
     {
         if(marshal)
         {
-            if(streamingAPI)
-            {
-                out << nl << "if((int)" << param << " < " << en->minValue()
-                    << " || (int)" << param << " > " << en->maxValue() << ")";
-                out << sb;
-                out << nl << "throw new Ice.MarshalException(\"enumerator out of range\");";
-                out << eb;
-            }
             out << nl << stream << ".writeEnum((int)" << param << ", " << en->maxValue() << ");";
         }
         else
         {
             out << nl << param << " = (" << fixId(en->scoped()) << ')' << stream << ".readEnum(" << en->maxValue()
                 << ");";
-            if(streamingAPI)
-            {
-                out << nl << "if((int)" << param << " < " << en->minValue() << " || (int)" << param << " > "
-                    << en->maxValue() << ")";
-                out << sb;
-                out << nl << "throw new Ice.MarshalException(\"enumerator out of range\");";
-                out << eb;
-            }
         }
         return;
     }
@@ -689,7 +647,7 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out,
     SequencePtr seq = SequencePtr::dynamicCast(type);
     if(seq)
     {
-        writeSequenceMarshalUnmarshalCode(out, seq, param, marshal, streamingAPI, true);
+        writeSequenceMarshalUnmarshalCode(out, seq, param, marshal, true);
         return;
     }
 
@@ -719,19 +677,9 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
                                                       const TypePtr& type,
                                                       const string& param,
                                                       int tag,
-                                                      bool marshal,
-                                                      bool streamingAPI)
+                                                      bool marshal)
 {
-    string stream;
-
-    if(marshal)
-    {
-        stream = streamingAPI ? "outS__" : "os__";
-    }
-    else
-    {
-        stream = streamingAPI ? "inS__" : "is__";
-    }
+    string stream = marshal ? "os__" : "is__";
 
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
     if(builtin)
@@ -835,14 +783,15 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
                 break;
             }
             case Builtin::KindObject:
+            case Builtin::KindValue:
             {
                 if(marshal)
                 {
-                    out << nl << stream << ".writeObject(" << tag << ", " << param << ");";
+                    out << nl << stream << ".writeValue(" << tag << ", " << param << ");";
                 }
                 else
                 {
-                    out << nl << stream << ".readObject(" << tag << ", " << param << ");";
+                    out << nl << stream << ".readValue(" << tag << ", " << param << ");";
                 }
                 break;
             }
@@ -874,23 +823,23 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
     {
         if(marshal)
         {
-            out << nl << "if(" << param << ".HasValue && " << stream << ".writeOpt(" << tag
+            out << nl << "if(" << param << ".HasValue && " << stream << ".writeOptional(" << tag
                 << ", Ice.OptionalFormat.FSize))";
             out << sb;
             out << nl << "int pos__ = " << stream << ".startSize();";
-            writeMarshalUnmarshalCode(out, type, param + ".Value", marshal, streamingAPI);
+            writeMarshalUnmarshalCode(out, type, param + ".Value", marshal);
             out << nl << stream << ".endSize(pos__);";
             out << eb;
         }
         else
         {
-            out << nl << "if(" << stream << ".readOpt(" << tag << ", Ice.OptionalFormat.FSize))";
+            out << nl << "if(" << stream << ".readOptional(" << tag << ", Ice.OptionalFormat.FSize))";
             out << sb;
             out << nl << stream << ".skip(4);";
             string tmp = "tmpVal__";
             string typeS = typeToString(type);
             out << nl << typeS << ' ' << tmp << ';';
-            writeMarshalUnmarshalCode(out, type, tmp, marshal, streamingAPI);
+            writeMarshalUnmarshalCode(out, type, tmp, marshal);
             out << nl << param << " = new Ice.Optional<" << typeS << ">(" << tmp << ");";
             out << eb;
             out << nl << "else";
@@ -906,11 +855,11 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
     {
         if(marshal)
         {
-            out << nl << stream << ".writeObject(" << tag << ", " << param << ");";
+            out << nl << stream << ".writeValue(" << tag << ", " << param << ");";
         }
         else
         {
-            out << nl << stream << ".readObject(" << tag << ", " << param << ");";
+            out << nl << stream << ".readValue(" << tag << ", " << param << ");";
         }
         return;
     }
@@ -920,7 +869,7 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
     {
         if(marshal)
         {
-            out << nl << "if(" << param << ".HasValue && " << stream << ".writeOpt(" << tag << ", "
+            out << nl << "if(" << param << ".HasValue && " << stream << ".writeOptional(" << tag << ", "
                 << getOptionalFormat(st) << "))";
             out << sb;
             if(st->isVariableLength())
@@ -931,7 +880,7 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
             {
                 out << nl << stream << ".writeSize(" << st->minWireSize() << ");";
             }
-            writeMarshalUnmarshalCode(out, type, param + ".Value", marshal, streamingAPI);
+            writeMarshalUnmarshalCode(out, type, param + ".Value", marshal);
             if(st->isVariableLength())
             {
                 out << nl << stream << ".endSize(pos__);";
@@ -940,7 +889,7 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
         }
         else
         {
-            out << nl << "if(" << stream << ".readOpt(" << tag << ", " << getOptionalFormat(st) << "))";
+            out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getOptionalFormat(st) << "))";
             out << sb;
             if(st->isVariableLength())
             {
@@ -960,7 +909,7 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
             {
                 out << nl << typeS << ' ' << tmp << " = null;";
             }
-            writeMarshalUnmarshalCode(out, type, tmp, marshal, streamingAPI);
+            writeMarshalUnmarshalCode(out, type, tmp, marshal);
             out << nl << param << " = new Ice.Optional<" << typeS << ">(" << tmp << ");";
             out << eb;
             out << nl << "else";
@@ -984,12 +933,12 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
         }
         else
         {
-            out << nl << "if(" << stream << ".readOpt(" << tag << ", Ice.OptionalFormat.Size))";
+            out << nl << "if(" << stream << ".readOptional(" << tag << ", Ice.OptionalFormat.Size))";
             out << sb;
             string typeS = typeToString(type);
             string tmp = "tmpVal__";
             out << nl << typeS << ' ' << tmp << ';';
-            writeMarshalUnmarshalCode(out, type, tmp, marshal, streamingAPI);
+            writeMarshalUnmarshalCode(out, type, tmp, marshal);
             out << nl << param << " = new Ice.Optional<" << typeS << ">(" << tmp << ");";
             out << eb;
             out << nl << "else";
@@ -1003,7 +952,7 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
     SequencePtr seq = SequencePtr::dynamicCast(type);
     if(seq)
     {
-        writeOptionalSequenceMarshalUnmarshalCode(out, seq, param, tag, marshal, streamingAPI);
+        writeOptionalSequenceMarshalUnmarshalCode(out, seq, param, tag, marshal);
         return;
     }
 
@@ -1013,7 +962,7 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
     TypePtr valueType = d->valueType();
     if(marshal)
     {
-        out << nl << "if(" << param << ".HasValue && " << stream << ".writeOpt(" << tag << ", "
+        out << nl << "if(" << param << ".HasValue && " << stream << ".writeOptional(" << tag << ", "
             << getOptionalFormat(d) << "))";
         out << sb;
         if(keyType->isVariableLength() || valueType->isVariableLength())
@@ -1026,7 +975,7 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
                 << (keyType->minWireSize() + valueType->minWireSize()) << " + (" << param
                 << ".Value.Count > 254 ? 5 : 1));";
         }
-        writeMarshalUnmarshalCode(out, type, param + ".Value", marshal, streamingAPI);
+        writeMarshalUnmarshalCode(out, type, param + ".Value", marshal);
         if(keyType->isVariableLength() || valueType->isVariableLength())
         {
             out << nl << stream << ".endSize(pos__);";
@@ -1035,7 +984,7 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
     }
     else
     {
-        out << nl << "if(" << stream << ".readOpt(" << tag << ", " << getOptionalFormat(d) << "))";
+        out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getOptionalFormat(d) << "))";
         out << sb;
         if(keyType->isVariableLength() || valueType->isVariableLength())
         {
@@ -1048,7 +997,7 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
         string typeS = typeToString(type);
         string tmp = "tmpVal__";
         out << nl << typeS << ' ' << tmp << " = new " << typeS << "();";
-        writeMarshalUnmarshalCode(out, type, tmp, marshal, streamingAPI);
+        writeMarshalUnmarshalCode(out, type, tmp, marshal);
         out << nl << param << " = new Ice.Optional<" << typeS << ">(" << tmp << ");";
         out << eb;
         out << nl << "else";
@@ -1063,18 +1012,9 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                                                       const SequencePtr& seq,
                                                       const string& param,
                                                       bool marshal,
-                                                      bool streamingAPI,
                                                       bool useHelper)
 {
-    string stream;
-    if(marshal)
-    {
-        stream = streamingAPI ? "outS__" : "os__";
-    }
-    else
-    {
-        stream = streamingAPI ? "inS__" : "is__";
-    }
+    string stream = marshal ? "os__" : "is__";
 
     if(useHelper)
     {
@@ -1129,8 +1069,8 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
             isCustom = true;
         }
     }
-    const bool isCollection = seq->hasMetaData("clr:collection");
-    const bool isArray = !isGeneric && !isCollection;
+
+    const bool isArray = !isGeneric;
     const string limitID = isArray ? "Length" : "Count";
 
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
@@ -1138,6 +1078,7 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
     {
         switch(builtin->kind())
         {
+            case Builtin::KindValue:
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
             {
@@ -1170,7 +1111,8 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                                 << "> e__ = " << param << ".GetEnumerator();";
                             out << nl << "while(e__.MoveNext())";
                             out << sb;
-                            string func = builtin->kind() == Builtin::KindObject ? "writeObject" : "writeProxy";
+                            string func = (builtin->kind() == Builtin::KindObject ||
+                                           builtin->kind() == Builtin::KindValue) ? "writeValue" : "writeProxy";
                             out << nl << stream << '.' << func << "(e__.Current);";
                             out << eb;
                         }
@@ -1179,7 +1121,8 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                     {
                         out << nl << "for(int ix__ = 0; ix__ < " << param << '.' << limitID << "; ++ix__)";
                         out << sb;
-                        string func = builtin->kind() == Builtin::KindObject ? "writeObject" : "writeProxy";
+                        string func = (builtin->kind() == Builtin::KindObject ||
+                                       builtin->kind() == Builtin::KindValue) ? "writeValue" : "writeProxy";
                         out << nl << stream << '.' << func << '(' << param << "[ix__]);";
                         out << eb;
                     }
@@ -1190,7 +1133,7 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                     out << nl << "int " << param << "_lenx = " << stream << ".readAndCheckSeqSize("
                         << static_cast<unsigned>(builtin->minWireSize()) << ");";
                     out << nl << param << " = new ";
-                    if(builtin->kind() == Builtin::KindObject)
+                    if((builtin->kind() == Builtin::KindObject || builtin->kind() == Builtin::KindValue))
                     {
                         if(isArray)
                         {
@@ -1215,7 +1158,6 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                         }
                         out << nl << "for(int ix__ = 0; ix__ < " << param << "_lenx; ++ix__)";
                         out << sb;
-                        out << nl << stream << ".readObject(";
                         string patcherName;
                         if(isCustom)
                         {
@@ -1233,8 +1175,9 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                         {
                             patcherName = "Sequence";
                         }
-                        out << "new IceInternal." << patcherName << "Patcher<Ice.Object>(\"::Ice::Object\", "
-                            << param << ", ix__));";
+                        out << nl << "IceInternal." << patcherName << "Patcher<Ice.Object> p__ = new IceInternal."
+                            << patcherName << "Patcher<Ice.Object>(\"::Ice::Object\", " << param << ", ix__);";
+                        out << nl << stream << ".readValue(p__.patch);";
                     }
                     else
                     {
@@ -1297,52 +1240,16 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                     {
                         out << nl << stream << ".write" << func << "Seq(" << param << ");";
                     }
-                    else if(isCollection)
-                    {
-                        out << nl << stream << ".write" << func << "Seq(" << param << " == null ? null : "
-                            << param << ".ToArray());";
-                    }
                     else if(isCustom)
                     {
-                        if(streamingAPI)
-                        {
-                            out << nl << stream << ".writeSize(" << param << '.' << limitID << ");";
-                            out << nl << "_System.Collections.Generic.IEnumerator<" << typeS
-                                << "> e__ = " << param << ".GetEnumerator();";
-                            out << nl << "while(e__.MoveNext())";
-                            out << sb;
-                            out << nl << stream << ".write" << func << "(e__.Current);";
-                            out << eb;
-                        }
-                        else
-                        {
-                            out << nl << stream << ".write" << func << "Seq(" << param << " == null ? 0 : "
-                                << param << ".Count, " << param << ");";
-                        }
+                        out << nl << stream << ".write" << func << "Seq(" << param << " == null ? 0 : "
+                            << param << ".Count, " << param << ");";
                     }
                     else
                     {
                         assert(isGeneric);
-                        if(!streamingAPI)
-                        {
-                            out << nl << stream << ".write" << func << "Seq(" << param << " == null ? 0 : "
-                                << param << ".Count, " << param << ");";
-                        }
-                        else if(isLinkedList)
-                        {
-                            out << nl << stream << ".writeSize(" << param << '.' << limitID << ");";
-                            out << nl << "_System.Collections.Generic.IEnumerator<" << typeS
-                                << "> e__ = " << param << ".GetEnumerator();";
-                            out << nl << "while(e__.MoveNext())";
-                            out << sb;
-                            out << nl << stream << ".write" << func << "(e__.Current);";
-                            out << eb;
-                        }
-                        else
-                        {
-                            out << nl << stream << ".write" << func << "Seq(" << param << " == null ? null : "
-                                << param << ".ToArray());";
-                        }
+                        out << nl << stream << ".write" << func << "Seq(" << param << " == null ? 0 : "
+                            << param << ".Count, " << param << ");";
                     }
                 }
                 else
@@ -1363,37 +1270,10 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                         out << eb;
                         out << eb;
                     }
-                    else if(isCollection)
-                    {
-                        out << nl << param << " = new " << fixId(seq->scoped())
-                            << '(' << stream << ".read" << func << "Seq());";
-                    }
                     else
                     {
                         assert(isGeneric);
-                        if(streamingAPI)
-                        {
-                            if(isStack)
-                            {
-                                //
-                                // Stacks are marshaled in top-to-bottom order. The "Stack(type[])"
-                                // constructor assumes the array is in bottom-to-top order, so we
-                                // read the array first, then reverse it.
-                                //
-                                out << nl << typeS << "[] arr__ = " << stream << ".read" << func << "Seq();";
-                                out << nl << "_System.Array.Reverse(arr__);";
-                                out << nl << param << " = new " << typeToString(seq) << "(arr__);";
-                            }
-                            else
-                            {
-                                out << nl << param << " = new " << typeToString(seq) << '(' << stream
-                                    << ".read" << func << "Seq());";
-                            }
-                        }
-                        else
-                        {
-                            out << nl << stream << ".read" << func << "Seq(out " << param << ");";
-                        }
+                        out << nl << stream << ".read" << func << "Seq(out " << param << ");";
                     }
                 }
                 break;
@@ -1424,14 +1304,14 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                     << "> e__ = " << param << ".GetEnumerator();";
                 out << nl << "while(e__.MoveNext())";
                 out << sb;
-                out << nl << stream << ".writeObject(e__.Current);";
+                out << nl << stream << ".writeValue(e__.Current);";
                 out << eb;
             }
             else
             {
                 out << nl << "for(int ix__ = 0; ix__ < " << param << '.' << limitID << "; ++ix__)";
                 out << sb;
-                out << nl << stream << ".writeObject(" << param << "[ix__]);";
+                out << nl << stream << ".writeValue(" << param << "[ix__]);";
                 out << eb;
             }
             out << eb;
@@ -1487,8 +1367,7 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
             string scoped = ContainedPtr::dynamicCast(type)->scoped();
             out << nl << "IceInternal." << patcherName << "Patcher<" << typeS << "> spx = new IceInternal."
                 << patcherName << "Patcher<" << typeS << ">(\"" << scoped << "\", " << param << ", ix__);";
-            out << nl << stream << ".readObject(";
-            out << "spx);";
+            out << nl << stream << ".readValue(spx.patch);";
             out << eb;
             out << eb;
         }
@@ -1573,7 +1452,7 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                 }
             }
             call += ".";
-            call += streamingAPI ? "ice_write" : "write__";
+            call += "write__";
             call += "(" + stream + ");";
             out << nl << call;
             out << eb;
@@ -1618,26 +1497,12 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                 {
                     out << nl << v << "[ix__] = new " << typeS << "();";
                 }
-                if(streamingAPI)
-                {
-                    out << nl << v << "[ix__].ice_read(" << stream << ");";
-                }
-                else
-                {
-                    out << nl << v << "[ix__].read__(" << stream << ");";
-                }
+                out << nl << v << "[ix__].read__(" << stream << ");";
             }
             else
             {
                 out << nl << typeS << " val__ = new " << typeS << "();";
-                if(streamingAPI)
-                {
-                    out << nl << "val__.ice_read(" << stream << ");";
-                }
-                else
-                {
-                    out << nl << "val__.read__(" << stream << ");";
-                }
+                out << nl << "val__.read__(" << stream << ");";
                 out << nl << param << "." << addMethod << "(val__);";
             }
             out << eb;
@@ -1764,10 +1629,6 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
     if(marshal)
     {
         func = "write";
-        if(!streamingAPI && ProxyPtr::dynamicCast(type))
-        {
-           func += "__";
-        }
         out << nl << "if(" << param << " == null)";
         out << sb;
         out << nl << stream << ".writeSize(0);";
@@ -1810,10 +1671,6 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
     else
     {
         func = "read";
-        if(!streamingAPI && ProxyPtr::dynamicCast(type))
-        {
-           func += "__";
-        }
         out << sb;
         out << nl << "int szx__ = " << stream << ".readAndCheckSeqSize("
             << static_cast<unsigned>(type->minWireSize()) << ");";
@@ -1866,25 +1723,16 @@ Slice::CsGenerator::writeOptionalSequenceMarshalUnmarshalCode(Output& out,
                                                               const SequencePtr& seq,
                                                               const string& param,
                                                               int tag,
-                                                              bool marshal,
-                                                              bool streamingAPI)
+                                                              bool marshal)
 {
-    string stream;
-    if(marshal)
-    {
-        stream = streamingAPI ? "outS__" : "os__";
-    }
-    else
-    {
-        stream = streamingAPI ? "inS__" : "is__";
-    }
+    string stream = marshal ? "os__" : "is__";
 
     const TypePtr type = seq->type();
     const string typeS = typeToString(type);
     const string seqS = typeToString(seq);
 
     string meta;
-    const bool isArray = !seq->findMetaData("clr:generic:", meta) && !seq->hasMetaData("clr:collection");
+    const bool isArray = !seq->findMetaData("clr:generic:", meta);
     const string length = isArray ? param + ".Value.Length" : param + ".Value.Count";
 
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
@@ -1909,7 +1757,7 @@ Slice::CsGenerator::writeOptionalSequenceMarshalUnmarshalCode(Output& out,
             {
                 if(isSerializable)
                 {
-                    out << nl << "if(" << param << ".HasValue && " << stream << ".writeOpt(" << tag
+                    out << nl << "if(" << param << ".HasValue && " << stream << ".writeOptional(" << tag
                         << ", Ice.OptionalFormat.VSize))";
                     out << sb;
                     out << nl << stream << ".writeSerializable(" << param << ".Value);";
@@ -1930,7 +1778,7 @@ Slice::CsGenerator::writeOptionalSequenceMarshalUnmarshalCode(Output& out,
             }
             else
             {
-                out << nl << "if(" << stream << ".readOpt(" << tag << ", " << getOptionalFormat(seq) << "))";
+                out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getOptionalFormat(seq) << "))";
                 out << sb;
                 if(builtin->isVariableLength())
                 {
@@ -1942,7 +1790,7 @@ Slice::CsGenerator::writeOptionalSequenceMarshalUnmarshalCode(Output& out,
                 }
                 string tmp = "tmpVal__";
                 out << nl << seqS << ' ' << tmp << ';';
-                writeSequenceMarshalUnmarshalCode(out, seq, tmp, marshal, streamingAPI, true);
+                writeSequenceMarshalUnmarshalCode(out, seq, tmp, marshal, true);
                 out << nl << param << " = new Ice.Optional<" << seqS << ">(" << tmp << ");";
                 out << eb;
                 out << nl << "else";
@@ -1953,27 +1801,28 @@ Slice::CsGenerator::writeOptionalSequenceMarshalUnmarshalCode(Output& out,
             break;
         }
 
+        case Builtin::KindValue:
         case Builtin::KindObject:
         case Builtin::KindObjectProxy:
         {
             if(marshal)
             {
-                out << nl << "if(" << param << ".HasValue && " << stream << ".writeOpt(" << tag << ", "
+                out << nl << "if(" << param << ".HasValue && " << stream << ".writeOptional(" << tag << ", "
                     << getOptionalFormat(seq) << "))";
                 out << sb;
                 out << nl << "int pos__ = " << stream << ".startSize();";
-                writeSequenceMarshalUnmarshalCode(out, seq, param + ".Value", marshal, streamingAPI, true);
+                writeSequenceMarshalUnmarshalCode(out, seq, param + ".Value", marshal, true);
                 out << nl << stream << ".endSize(pos__);";
                 out << eb;
             }
             else
             {
-                out << nl << "if(" << stream << ".readOpt(" << tag << ", " << getOptionalFormat(seq) << "))";
+                out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getOptionalFormat(seq) << "))";
                 out << sb;
                 out << nl << stream << ".skip(4);";
                 string tmp = "tmpVal__";
                 out << nl << seqS << ' ' << tmp << ';';
-                writeSequenceMarshalUnmarshalCode(out, seq, tmp, marshal, streamingAPI, true);
+                writeSequenceMarshalUnmarshalCode(out, seq, tmp, marshal, true);
                 out << nl << param << " = new Ice.Optional<" << seqS << ">(" << tmp << ");";
                 out << eb;
                 out << nl << "else";
@@ -1996,7 +1845,7 @@ Slice::CsGenerator::writeOptionalSequenceMarshalUnmarshalCode(Output& out,
     {
         if(marshal)
         {
-            out << nl << "if(" << param << ".HasValue && " << stream << ".writeOpt(" << tag << ", "
+            out << nl << "if(" << param << ".HasValue && " << stream << ".writeOptional(" << tag << ", "
                 << getOptionalFormat(seq) << "))";
             out << sb;
             if(st->isVariableLength())
@@ -2008,7 +1857,7 @@ Slice::CsGenerator::writeOptionalSequenceMarshalUnmarshalCode(Output& out,
                 out << nl << stream << ".writeSize(" << param << ".Value == null ? 1 : " << length << " * "
                     << st->minWireSize() << " + (" << length << " > 254 ? 5 : 1));";
             }
-            writeSequenceMarshalUnmarshalCode(out, seq, param + ".Value", marshal, streamingAPI, true);
+            writeSequenceMarshalUnmarshalCode(out, seq, param + ".Value", marshal, true);
             if(st->isVariableLength())
             {
                 out << nl << stream << ".endSize(pos__);";
@@ -2017,7 +1866,7 @@ Slice::CsGenerator::writeOptionalSequenceMarshalUnmarshalCode(Output& out,
         }
         else
         {
-            out << nl << "if(" << stream << ".readOpt(" << tag << ", " << getOptionalFormat(seq) << "))";
+            out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getOptionalFormat(seq) << "))";
             out << sb;
             if(st->isVariableLength())
             {
@@ -2029,7 +1878,7 @@ Slice::CsGenerator::writeOptionalSequenceMarshalUnmarshalCode(Output& out,
             }
             string tmp = "tmpVal__";
             out << nl << seqS << ' ' << tmp << ';';
-            writeSequenceMarshalUnmarshalCode(out, seq, tmp, marshal, streamingAPI, true);
+            writeSequenceMarshalUnmarshalCode(out, seq, tmp, marshal, true);
             out << nl << param << " = new Ice.Optional<" << seqS << ">(" << tmp << ");";
             out << eb;
             out << nl << "else";
@@ -2045,22 +1894,22 @@ Slice::CsGenerator::writeOptionalSequenceMarshalUnmarshalCode(Output& out,
     //
     if(marshal)
     {
-        out << nl << "if(" << param << ".HasValue && " << stream << ".writeOpt(" << tag << ", "
+        out << nl << "if(" << param << ".HasValue && " << stream << ".writeOptional(" << tag << ", "
             << getOptionalFormat(seq) << "))";
         out << sb;
         out << nl << "int pos__ = " << stream << ".startSize();";
-        writeSequenceMarshalUnmarshalCode(out, seq, param + ".Value", marshal, streamingAPI, true);
+        writeSequenceMarshalUnmarshalCode(out, seq, param + ".Value", marshal, true);
         out << nl << stream << ".endSize(pos__);";
         out << eb;
     }
     else
     {
-        out << nl << "if(" << stream << ".readOpt(" << tag << ", " << getOptionalFormat(seq) << "))";
+        out << nl << "if(" << stream << ".readOptional(" << tag << ", " << getOptionalFormat(seq) << "))";
         out << sb;
         out << nl << stream << ".skip(4);";
         string tmp = "tmpVal__";
         out << nl << seqS << ' ' << tmp << ';';
-        writeSequenceMarshalUnmarshalCode(out, seq, tmp, marshal, streamingAPI, true);
+        writeSequenceMarshalUnmarshalCode(out, seq, tmp, marshal, true);
         out << nl << param << " = new Ice.Optional<" << seqS << ">(" << tmp << ");";
         out << eb;
         out << nl << "else";
@@ -2200,6 +2049,7 @@ Slice::CsGenerator::writeSerializeDeserializeCode(Output &out,
                 }
                 break;
             }
+            case Builtin::KindValue:
             case Builtin::KindObject:
             case Builtin::KindLocalObject:
             {
@@ -2497,7 +2347,6 @@ Slice::CsGenerator::MetaDataVisitor::visitConst(const ConstPtr& p)
 void
 Slice::CsGenerator::MetaDataVisitor::validate(const ContainedPtr& cont)
 {
-    static set<string> collectionWarnings;
     const string msg = "ignoring invalid metadata";
 
     StringList localMetaData = cont->getMetaData();
@@ -2514,14 +2363,6 @@ Slice::CsGenerator::MetaDataVisitor::validate(const ContainedPtr& cont)
                 SequencePtr seq = SequencePtr::dynamicCast(cont);
                 if(seq)
                 {
-                    if(s.substr(prefix.size()) == "collection")
-                    {
-                        if(collectionWarnings.find(cont->file()) == collectionWarnings.end()) {
-                            emitWarning(cont->file(), cont->line(), "the \"" + s + "\" metadata has been deprecated");
-                            collectionWarnings.insert(cont->file());
-                        }
-                        continue;
-                    }
                     static const string clrGenericPrefix = prefix + "generic:";
                     if(s.find(clrGenericPrefix) == 0)
                     {
@@ -2530,7 +2371,8 @@ Slice::CsGenerator::MetaDataVisitor::validate(const ContainedPtr& cont)
                         {
                             ClassDeclPtr cd = ClassDeclPtr::dynamicCast(seq->type());
                             BuiltinPtr builtin = BuiltinPtr::dynamicCast(seq->type());
-                            if(!cd && !(builtin && builtin->kind() == Builtin::KindObject))
+                            if(!cd && !(builtin && (builtin->kind() == Builtin::KindObject ||
+                                                    builtin->kind() == Builtin::KindValue)))
                             {
                                 continue;
                             }
@@ -2544,8 +2386,7 @@ Slice::CsGenerator::MetaDataVisitor::validate(const ContainedPtr& cont)
                     if(s.find(clrSerializablePrefix) == 0)
                     {
                         string meta;
-                        if(cont->findMetaData(prefix + "collection", meta)
-                           || cont->findMetaData(prefix + "generic:", meta))
+                        if(cont->findMetaData(prefix + "generic:", meta))
                         {
                             emitWarning(cont->file(), cont->line(), msg + " `" + meta + "':\n" +
                                         "serialization can only be used with the array mapping for byte sequences");
@@ -2588,14 +2429,6 @@ Slice::CsGenerator::MetaDataVisitor::validate(const ContainedPtr& cont)
                 }
                 else if(DictionaryPtr::dynamicCast(cont))
                 {
-                    if(s.substr(prefix.size()) == "collection")
-                    {
-                        if(collectionWarnings.find(cont->file()) == collectionWarnings.end()) {
-                            emitWarning(cont->file(), cont->line(), "the \"" + s + "\" metadata has been deprecated");
-                            collectionWarnings.insert(cont->file());
-                        }
-                        continue;
-                    }
                     static const string clrGenericPrefix = prefix + "generic:";
                     if(s.find(clrGenericPrefix) == 0)
                     {
@@ -2625,5 +2458,19 @@ Slice::CsGenerator::MetaDataVisitor::validate(const ContainedPtr& cont)
                 _history.insert(s);
             }
         }
+
+        if(_history.count(s) == 0)
+        {
+            if(s == "delegate")
+            {
+                ClassDefPtr cl = ClassDefPtr::dynamicCast(cont);
+                if(cl && cl->isDelegate())
+                {
+                    continue;
+                }
+                emitWarning(cont->file(), cont->line(), msg + " `" + s + "'");
+                _history.insert(s);
+            }
+        }
     }
 }
diff --git a/cpp/src/slice2cs/CsUtil.h b/cpp/src/slice2cs/CsUtil.h
new file mode 100644
index 00000000000..2401ae1db84
--- /dev/null
+++ b/cpp/src/slice2cs/CsUtil.h
@@ -0,0 +1,91 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef CS_UTIL_H
+#define CS_UTIL_H
+
+#include <Slice/Parser.h>
+#include <IceUtil/OutputUtil.h>
+
+namespace Slice
+{
+
+class CsGenerator : private ::IceUtil::noncopyable
+{
+public:
+
+    virtual ~CsGenerator() {};
+
+    //
+    // Convert a dimension-less array declaration to one with a dimension.
+    //
+    static std::string toArrayAlloc(const std::string& decl, const std::string& sz);
+
+    //
+    // Validate all metadata in the unit with a "cs:" prefix.
+    //
+    static void validateMetaData(const UnitPtr&);
+
+protected:
+    static std::string fixId(const std::string&, int = 0, bool = false);
+    static std::string fixId(const ContainedPtr&, int = 0, bool = false);
+    static std::string getOptionalFormat(const TypePtr&);
+    static std::string getStaticId(const TypePtr&);
+    static std::string typeToString(const TypePtr&, bool = false);
+    static bool isValueType(const TypePtr&);
+    static bool isSerializable(const TypePtr&);
+
+    //
+    // Generate code to marshal or unmarshal a type
+    //
+    void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool);
+    void writeOptionalMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, int, bool);
+    void writeSequenceMarshalUnmarshalCode(::IceUtilInternal::Output&, const SequencePtr&, const std::string&,
+                                           bool, bool);
+    void writeOptionalSequenceMarshalUnmarshalCode(::IceUtilInternal::Output&, const SequencePtr&, const std::string&,
+                                                   int, bool);
+
+    void writeSerializeDeserializeCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool, int, bool);
+
+private:
+
+    class MetaDataVisitor : public ParserVisitor
+    {
+    public:
+
+        virtual bool visitUnitStart(const UnitPtr&);
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual void visitClassDecl(const ClassDeclPtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual void visitExceptionEnd(const ExceptionPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual void visitStructEnd(const StructPtr&);
+        virtual void visitOperation(const OperationPtr&);
+        virtual void visitParamDecl(const ParamDeclPtr&);
+        virtual void visitDataMember(const DataMemberPtr&);
+        virtual void visitSequence(const SequencePtr&);
+        virtual void visitDictionary(const DictionaryPtr&);
+        virtual void visitEnum(const EnumPtr&);
+        virtual void visitConst(const ConstPtr&);
+
+    private:
+
+        void validate(const ContainedPtr&);
+
+        std::string _fileName;
+        StringSet _history;
+    };
+};
+
+}
+
+#endif
diff --git a/cpp/src/Slice/DotNetNames.cpp b/cpp/src/slice2cs/DotNetNames.cpp
index 1aedcc94af3..6db04897318 100644
--- a/cpp/src/Slice/DotNetNames.cpp
+++ b/cpp/src/slice2cs/DotNetNames.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#include <Slice/DotNetNames.h>
+#include <DotNetNames.h>
 #include <ctype.h>
 #include <cstring>
 
diff --git a/cpp/src/Freeze/PingObject.ice b/cpp/src/slice2cs/DotNetNames.h
index 17b431b3eb8..f4ee205e13d 100644
--- a/cpp/src/Freeze/PingObject.ice
+++ b/cpp/src/slice2cs/DotNetNames.h
@@ -7,16 +7,28 @@
 //
 // **********************************************************************
 
-#pragma once
+#ifndef DOTNETNAMES_H
+#define DOTNETNAMES_H
 
-[["cpp:header-ext:h"]]
+#include <string>
 
-module Freeze
+namespace Slice
 {
 
-class PingObject
+namespace DotNet
 {
-};
 
+enum BaseType
+{
+    Object=1, ICloneable=2, Exception=4, END=8
 };
 
+extern const char * manglePrefix;
+
+std::string mangleName(const std::string&, int baseTypes = 0);
+
+}
+
+}
+
+#endif
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 59c2ccae3ad..0e87c4c6050 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -12,20 +12,23 @@
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/InputUtil.h>
 #include <Gen.h>
+
 #include <limits>
 #include <sys/stat.h>
+
 #ifndef _WIN32
-#include <unistd.h>
+#   include <unistd.h>
 #else
-#include <direct.h>
+#   include <direct.h>
 #endif
+
 #include <IceUtil/Iterator.h>
 #include <IceUtil/UUID.h>
-#include <IceUtil/Unicode.h>
+#include <IceUtil/StringConverter.h>
 #include <Slice/Checksum.h>
-#include <Slice/DotNetNames.h>
 #include <Slice/FileTracker.h>
 #include <Slice/Util.h>
+#include <DotNetNames.h>
 #include <string.h>
 
 using namespace std;
@@ -52,22 +55,7 @@ u16CodePoint(unsigned short value)
 void
 writeU8Buffer(const vector<unsigned char>& u8buffer, ::IceUtilInternal::Output& out)
 {
-    vector<unsigned short> u16buffer;
-    IceUtilInternal::ConversionResult result = convertUTF8ToUTF16(u8buffer, u16buffer, IceUtil::lenientConversion);
-    switch(result)
-    {
-        case conversionOK:
-            break;
-        case sourceExhausted:
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source exhausted");
-        case sourceIllegal:
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source illegal");
-        default:
-        {
-            assert(0);
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
-        }
-    }
+    vector<unsigned short> u16buffer = toUTF16(u8buffer);
 
     for(vector<unsigned short>::const_iterator c = u16buffer.begin(); c != u16buffer.end(); ++c)
     {
@@ -190,6 +178,7 @@ Slice::CsVisitor::writeMarshalUnmarshalParams(const ParamDeclList& params, const
                 _out << nl << "IceInternal.ParamPatcher<" << typeS << "> " << param
                      << " = new IceInternal.ParamPatcher<" << typeS << ">(" << getStaticId(type) << ");";
             }
+            param += ".patch";
         }
 
         if((*pli)->optional())
@@ -198,7 +187,7 @@ Slice::CsVisitor::writeMarshalUnmarshalParams(const ParamDeclList& params, const
         }
         else
         {
-            writeMarshalUnmarshalCode(_out, type, param, marshal, false);
+            writeMarshalUnmarshalCode(_out, type, param, marshal);
         }
     }
 
@@ -223,11 +212,12 @@ Slice::CsVisitor::writeMarshalUnmarshalParams(const ParamDeclList& params, const
                 _out << nl << "IceInternal.ParamPatcher<" << typeS << "> " << param
                      << " = new IceInternal.ParamPatcher<" << typeS << ">(" << getStaticId(ret) << ");";
             }
+            param += ".patch";
         }
 
         if(!op->returnIsOptional())
         {
-            writeMarshalUnmarshalCode(_out, ret, param, marshal, false);
+            writeMarshalUnmarshalCode(_out, ret, param, marshal);
         }
     }
 
@@ -253,8 +243,8 @@ Slice::CsVisitor::writeMarshalUnmarshalParams(const ParamDeclList& params, const
     {
         if(checkReturnType && op->returnTag() < (*pli)->tag())
         {
-            const string param = !marshal && isClassType(ret) ? "ret__PP" : "ret__";
-            writeOptionalMarshalUnmarshalCode(_out, ret, param, op->returnTag(), marshal, false);
+            const string param = !marshal && isClassType(ret) ? "ret__PP.patch" : "ret__";
+            writeOptionalMarshalUnmarshalCode(_out, ret, param, op->returnTag(), marshal);
             checkReturnType = false;
         }
 
@@ -263,16 +253,16 @@ Slice::CsVisitor::writeMarshalUnmarshalParams(const ParamDeclList& params, const
 
         if(!marshal && isClassType(type))
         {
-            param = (*pli)->name() + "__PP";
+            param = (*pli)->name() + "__PP.patch";
         }
 
-        writeOptionalMarshalUnmarshalCode(_out, type, param, (*pli)->tag(), marshal, false);
+        writeOptionalMarshalUnmarshalCode(_out, type, param, (*pli)->tag(), marshal);
     }
 
     if(checkReturnType)
     {
-        const string param = !marshal && isClassType(ret) ? "ret__PP" : "ret__";
-        writeOptionalMarshalUnmarshalCode(_out, ret, param, op->returnTag(), marshal, false);
+        const string param = !marshal && isClassType(ret) ? "ret__PP.patch" : "ret__";
+        writeOptionalMarshalUnmarshalCode(_out, ret, param, op->returnTag(), marshal);
     }
 }
 
@@ -299,11 +289,11 @@ Slice::CsVisitor::writeMarshalDataMember(const DataMemberPtr& member, const stri
 {
     if(member->optional())
     {
-        writeOptionalMarshalUnmarshalCode(_out, member->type(), name, member->tag(), true, false);
+        writeOptionalMarshalUnmarshalCode(_out, member->type(), name, member->tag(), true);
     }
     else
     {
-        writeMarshalUnmarshalCode(_out, member->type(), name, true, false);
+        writeMarshalUnmarshalCode(_out, member->type(), name, true);
     }
 }
 
@@ -323,319 +313,17 @@ Slice::CsVisitor::writeUnmarshalDataMember(const DataMemberPtr& member, const st
             ostr << ", " << patchIter++;
             patcher += ostr.str();
         }
-        patcher += ")";
+        patcher += ").patch";
     }
 
     if(member->optional())
     {
-        writeOptionalMarshalUnmarshalCode(_out, member->type(), classType ? patcher : name, member->tag(), false,
-                                          false);
+        writeOptionalMarshalUnmarshalCode(_out, member->type(), classType ? patcher : name, member->tag(), false);
     }
     else
     {
-        writeMarshalUnmarshalCode(_out, member->type(), classType ? patcher : name, false, false);
-    }
-}
-
-void
-Slice::CsVisitor::writeStreamMarshalDataMember(const DataMemberPtr& member, const string& name)
-{
-    if(!member->optional())
-    {
-        writeMarshalUnmarshalCode(_out, member->type(), name, true, true);
-        return;
-    }
-
-    const string flag = name + ".HasValue";
-    const string value = name + ".Value";
-
-    BuiltinPtr builtin = BuiltinPtr::dynamicCast(member->type());
-    if(builtin)
-    {
-        _out << nl << "if(" << flag << " && outS__.writeOptional(" << member->tag() << ", "
-             << getOptionalFormat(member->type()) << "))";
-        _out << sb;
-        if(builtin->kind() == Builtin::KindObjectProxy)
-        {
-            _out << nl << "int pos__ = outS__.startSize();";
-        }
-        writeMarshalUnmarshalCode(_out, member->type(), value, true, true);
-        if(builtin->kind() == Builtin::KindObjectProxy)
-        {
-            _out << nl << "outS__.endSize(pos__);";
-        }
-        _out << eb;
-        return;
-    }
-
-    SequencePtr seq = SequencePtr::dynamicCast(member->type());
-    if(seq)
-    {
-        string meta;
-        const bool serializable = seq->findMetaData("clr:serializable:", meta);
-        const bool isArray = !seq->findMetaData("clr:generic:", meta) && !seq->hasMetaData("clr:collection");
-        const string length = isArray ? value + ".Length" : value + ".Count";
-
-        _out << nl << "if(" << flag << " && outS__.writeOptional(" << member->tag() << ", "
-             << getOptionalFormat(member->type()) << "))";
-        _out << sb;
-
-        BuiltinPtr b = BuiltinPtr::dynamicCast(seq->type());
-
-        if(serializable)
-        {
-            writeMarshalUnmarshalCode(_out, member->type(), value, true, true);
-        }
-        else if(b)
-        {
-            switch(b->kind())
-            {
-            case Builtin::KindByte:
-            case Builtin::KindBool:
-                writeMarshalUnmarshalCode(_out, member->type(), value, true, true);
-                break;
-            case Builtin::KindShort:
-            case Builtin::KindInt:
-            case Builtin::KindFloat:
-            case Builtin::KindLong:
-            case Builtin::KindDouble:
-                _out << nl << "outS__.writeSize(" << value << " == null ? 1 : " << length << " * " << b->minWireSize()
-                     << " + (" << length << " > 254 ? 5 : 1));";
-                writeMarshalUnmarshalCode(_out, member->type(), value, true, true);
-                break;
-            case Builtin::KindString:
-            case Builtin::KindObject:
-            case Builtin::KindObjectProxy:
-            {
-                _out << nl << "int pos__ = outS__.startSize();";
-                writeMarshalUnmarshalCode(_out, member->type(), value, true, true);
-                _out << nl << "outS__.endSize(pos__);";
-                break;
-            }
-            case Builtin::KindLocalObject:
-            {
-                assert(false);
-                break;
-            }
-            }
-        }
-        else
-        {
-            StructPtr st = StructPtr::dynamicCast(seq->type());
-            if(st && !st->isVariableLength())
-            {
-                _out << nl << "outS__.writeSize(" << value << " == null ? 1 : " << length << " * " << st->minWireSize()
-                     << " + (" << length << " > 254 ? 5 : 1));";
-                writeMarshalUnmarshalCode(_out, member->type(), value, true, true);
-            }
-            else
-            {
-                _out << nl << "int pos__ = outS__.startSize();";
-                writeMarshalUnmarshalCode(_out, member->type(), value, true, true);
-                _out << nl << "outS__.endSize(pos__);";
-            }
-        }
-
-        _out << eb;
-        return;
-    }
-
-    DictionaryPtr d = DictionaryPtr::dynamicCast(member->type());
-    if(d)
-    {
-        _out << nl << "if(" << flag << " && outS__.writeOptional(" << member->tag() << ", "
-             << getOptionalFormat(member->type()) << "))";
-        _out << sb;
-
-        if(d->keyType()->isVariableLength() || d->valueType()->isVariableLength())
-        {
-            _out << nl << "int pos__ = outS__.startSize();";
-        }
-        else
-        {
-            _out << nl << "outS__.writeSize(" << value << " == null ? 1 : " << value << ".Count * "
-                 << (d->keyType()->minWireSize() + d->valueType()->minWireSize()) << " + (" << value
-                 << ".Count > 254 ? 5 : 1));";
-        }
-
-        writeMarshalUnmarshalCode(_out, member->type(), value, true, true);
-        if(d->keyType()->isVariableLength() || d->valueType()->isVariableLength())
-        {
-            _out << nl << "outS__.endSize(pos__);";
-        }
-        _out << eb;
-        return;
-    }
-
-    StructPtr st = StructPtr::dynamicCast(member->type());
-    if(st)
-    {
-        _out << nl << "if(" << flag << " && outS__.writeOptional(" << member->tag() << ", "
-             << getOptionalFormat(member->type()) << "))";
-        _out << sb;
-
-        if(st->isVariableLength())
-        {
-            _out << nl << "int pos__ = outS__.startSize();";
-        }
-        else
-        {
-            _out << nl << "outS__.writeSize(" << st->minWireSize() << ");";
-        }
-
-        writeMarshalUnmarshalCode(_out, member->type(), value, true, true);
-        if(st->isVariableLength())
-        {
-            _out << nl << "outS__.endSize(pos__);";
-        }
-        _out << eb;
-        return;
+        writeMarshalUnmarshalCode(_out, member->type(), classType ? patcher : name, false);
     }
-
-    EnumPtr en = EnumPtr::dynamicCast(member->type());
-    if(en)
-    {
-        _out << nl << "if(" << flag << " && outS__.writeOptional(" << member->tag() << ", "
-             << getOptionalFormat(member->type()) << "))";
-        _out << sb;
-        writeMarshalUnmarshalCode(_out, member->type(), value, true, true);
-        _out << eb;
-        return;
-    }
-
-    ProxyPtr pr = ProxyPtr::dynamicCast(member->type());
-    if(pr)
-    {
-        _out << nl << "if(" << flag << " && outS__.writeOptional(" << member->tag() << ", "
-             << getOptionalFormat(member->type()) << "))";
-        _out << sb;
-        _out << nl << "int pos__ = outS__.startSize();";
-        writeMarshalUnmarshalCode(_out, member->type(), value, true, true);
-        _out << nl << "outS__.endSize(pos__);";
-        _out << eb;
-        return;
-    }
-
-    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(member->type());
-    assert(cl);
-    _out << nl << "if(" << flag << " && outS__.writeOptional(" << member->tag() << ", "
-         << getOptionalFormat(member->type()) << "))";
-    _out << sb;
-    writeMarshalUnmarshalCode(_out, member->type(), value, true, true);
-    _out << eb;
-}
-
-void
-Slice::CsVisitor::writeStreamUnmarshalDataMember(const DataMemberPtr& member, const string& name, bool needPatcher,
-                                                 int& patchIter)
-{
-    const bool classType = isClassType(member->type());
-
-    string patcher;
-    if(classType)
-    {
-        patcher = "new Patcher__(" + getStaticId(member->type()) + ", this";
-        if(needPatcher)
-        {
-            ostringstream ostr;
-            ostr << ", " << patchIter++;
-            patcher += ostr.str();
-        }
-        patcher += ")";
-    }
-
-    if(!member->optional())
-    {
-        writeMarshalUnmarshalCode(_out, member->type(), classType ? patcher : name, false, true);
-        return;
-    }
-
-    _out << nl << "if(inS__.readOptional(" << member->tag() << ", "
-         << getOptionalFormat(member->type()) << "))";
-    _out << sb;
-
-    BuiltinPtr builtin = BuiltinPtr::dynamicCast(member->type());
-    if(builtin && builtin->kind() == Builtin::KindObjectProxy)
-    {
-        _out << nl << "inS__.skip(4);";
-    }
-
-    SequencePtr seq = SequencePtr::dynamicCast(member->type());
-    if(seq)
-    {
-        BuiltinPtr b = BuiltinPtr::dynamicCast(seq->type());
-        if(!b || (b->kind() != Builtin::KindByte && b->kind() != Builtin::KindBool))
-        {
-            if(seq->type()->isVariableLength())
-            {
-                _out << nl << "inS__.skip(4);";
-            }
-            else
-            {
-                _out << nl << "inS__.skipSize();";
-            }
-        }
-    }
-
-    DictionaryPtr d = DictionaryPtr::dynamicCast(member->type());
-    if(d)
-    {
-        if(d->keyType()->isVariableLength() || d->valueType()->isVariableLength())
-        {
-            _out << nl << "inS__.skip(4);";
-        }
-        else
-        {
-            _out << nl << "inS__.skipSize();";
-        }
-    }
-
-    StructPtr st = StructPtr::dynamicCast(member->type());
-    if(st)
-    {
-        if(st->isVariableLength())
-        {
-            _out << nl << "inS__.skip(4);";
-        }
-        else
-        {
-            _out << nl << "inS__.skipSize();";
-        }
-    }
-
-    ProxyPtr pr = ProxyPtr::dynamicCast(member->type());
-    if(pr)
-    {
-        _out << nl << "inS__.skip(4);";
-    }
-
-    const string typeS = typeToString(member->type());
-    const string tmp = "tmpValue__";
-
-    if(st)
-    {
-        if(isValueType(st))
-        {
-            _out << nl << typeS << ' ' << tmp << " = new " << typeS << "();";
-        }
-        else
-        {
-            _out << nl << typeS << ' ' << tmp << " = null;";
-        }
-    }
-    else if(!classType)
-    {
-        _out << nl << typeS << ' ' << tmp << ';';
-    }
-
-    writeMarshalUnmarshalCode(_out, member->type(), classType ? patcher : tmp, false, true);
-
-    if(!classType)
-    {
-        _out << nl << name << " = new " << typeToString(member->type(), true) << '(' << tmp << ");";
-    }
-
-    _out << eb;
 }
 
 void
@@ -706,7 +394,7 @@ Slice::CsVisitor::writeInheritedOperations(const ClassDefPtr& p)
 }
 
 void
-Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
+Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p)
 {
     string name = fixId(p->name());
     string scoped = p->scoped();
@@ -933,7 +621,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
             //
             // Unmarshal 'in' parameters.
             //
-            _out << nl << "IceInternal.BasicStream is__ = inS__.startReadParams();";
+            _out << nl << "Ice.InputStream is__ = inS__.startReadParams();";
             for(ParamDeclList::const_iterator pli = inParams.begin(); pli != inParams.end(); ++pli)
             {
                 string param = fixId((*pli)->name());
@@ -967,7 +655,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
             writeMarshalUnmarshalParams(inParams, 0, false);
             if(op->sendsClasses(false))
             {
-                _out << nl << "is__.readPendingObjects();";
+                _out << nl << "is__.readPendingValues();";
             }
             _out << nl << "inS__.endReadParams();";
         }
@@ -1036,12 +724,12 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
             //
             if(!outParams.empty() || ret)
             {
-                _out << nl << "IceInternal.BasicStream os__ = inS__.startWriteParams__("
+                _out << nl << "Ice.OutputStream os__ = inS__.startWriteParams__("
                      << opFormatTypeToString(op) << ");";
                 writeMarshalUnmarshalParams(outParams, op, true);
                 if(op->returnsClasses(false))
                 {
-                    _out << nl << "os__.writePendingObjects();";
+                    _out << nl << "os__.writePendingValues();";
                 }
                 _out << nl << "inS__.endWriteParams__(true);";
             }
@@ -1348,11 +1036,11 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
             emitGeneratedCodeAttribute();
         }
 
-        _out << nl << "public " << qualifier << "void write__(IceInternal.BasicStream os__)";
+        _out << nl << "public " << qualifier << "void write__(Ice.OutputStream os__)";
         _out << sb;
-        _out << nl << "os__.startWriteObject(slicedData__);";
+        _out << nl << "os__.startValue(slicedData__);";
         _out << nl << "writeImpl__(os__);";
-        _out << nl << "os__.endWriteObject();";
+        _out << nl << "os__.endValue();";
         _out << eb;
 
         _out << sp;
@@ -1360,97 +1048,32 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
         {
             emitGeneratedCodeAttribute();
         }
-        _out << nl << "public " << qualifier << "void read__(IceInternal.BasicStream is__)";
+        _out << nl << "public " << qualifier << "void read__(Ice.InputStream is__)";
         _out << sb;
-        _out << nl << "is__.startReadObject();";
+        _out << nl << "is__.startValue();";
         _out << nl << "readImpl__(is__);";
-        _out << nl << "slicedData__ = is__.endReadObject(true);";
+        _out << nl << "slicedData__ = is__.endValue(true);";
         _out << eb;
-
-        if(stream)
-        {
-            _out << sp;
-            if(!p->isInterface())
-            {
-                emitGeneratedCodeAttribute();
-            }
-            _out << nl << "public " << qualifier << "void write__(Ice.OutputStream outS__)";
-            _out << sb;
-            _out << nl << "outS__.startObject(slicedData__);";
-            _out << nl << "writeImpl__(outS__);";
-            _out << nl << "outS__.endObject();";
-            _out << eb;
-
-             _out << sp;
-             if(!p->isInterface())
-             {
-                 emitGeneratedCodeAttribute();
-             }
-             _out << nl << "public " << qualifier << "void read__(Ice.InputStream inS__)";
-             _out << sb;
-             _out << nl << "inS__.startObject();";
-             _out << nl << "readImpl__(inS__);";
-             _out << nl << "slicedData__ = inS__.endObject(true);";
-             _out << eb;
-        }
-        else if (!p->isInterface() && !hasBaseClass)
-        {
-            _out << sp;
-            emitGeneratedCodeAttribute();
-            _out << nl << "public virtual void write__(Ice.OutputStream outS__)";
-            _out << sb;
-            _out << nl << "outS__.startObject(null);";
-            _out << nl << "writeImpl__(outS__);";
-            _out << nl << "outS__.endObject();";
-            _out << eb;
-
-             _out << sp;
-            emitGeneratedCodeAttribute();
-             _out << nl << "public virtual void read__(Ice.InputStream inS__)";
-             _out << sb;
-             _out << nl << "inS__.startObject();";
-             _out << nl << "readImpl__(inS__);";
-             _out << nl << "inS__.endObject(false);";
-             _out << eb;
-        }
     }
     else if (!p->isInterface() && !hasBaseClass)
     {
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "public virtual void write__(IceInternal.BasicStream os__)";
+        _out << nl << "public virtual void write__(Ice.OutputStream os__)";
         _out << sb;
-        _out << nl << "os__.startWriteObject(null);";
+        _out << nl << "os__.startValue(null);";
         _out << nl << "writeImpl__(os__);";
-        _out << nl << "os__.endWriteObject();";
+        _out << nl << "os__.endValue();";
         _out << eb;
 
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "public virtual void read__(IceInternal.BasicStream is__)";
+        _out << nl << "public virtual void read__(Ice.InputStream is__)";
         _out << sb;
-        _out << nl << "is__.startReadObject();";
+        _out << nl << "is__.startValue();";
         _out << nl << "readImpl__(is__);";
-        _out << nl << "is__.endReadObject(false);";
-        _out << eb;
-
-        _out << sp;
-        emitGeneratedCodeAttribute();
-        _out << nl << "public virtual void write__(Ice.OutputStream outS__)";
-        _out << sb;
-        _out << nl << "outS__.startObject(null);";
-        _out << nl << "writeImpl__(outS__);";
-        _out << nl << "outS__.endObject();";
+        _out << nl << "is__.endValue(false);";
         _out << eb;
-
-         _out << sp;
-        emitGeneratedCodeAttribute();
-         _out << nl << "public virtual void read__(Ice.InputStream inS__)";
-         _out << sb;
-         _out << nl << "inS__.startObject();";
-         _out << nl << "readImpl__(inS__);";
-         _out << nl << "inS__.endObject(false);";
-         _out << eb;
     }
 
     _out << sp;
@@ -1458,9 +1081,9 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
     {
         emitGeneratedCodeAttribute();
     }
-    _out << nl << "protected " << qualifier << "void writeImpl__(IceInternal.BasicStream os__)";
+    _out << nl << "protected " << qualifier << "void writeImpl__(Ice.OutputStream os__)";
     _out << sb;
-    _out << nl << "os__.startWriteSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");";
+    _out << nl << "os__.startSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");";
     for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
     {
         if(!(*d)->optional())
@@ -1472,7 +1095,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
     {
         writeMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true));
     }
-    _out << nl << "os__.endWriteSlice();";
+    _out << nl << "os__.endSlice();";
     if(base)
     {
         _out << nl << "base.writeImpl__(os__);";
@@ -1491,7 +1114,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
         {
             _out << "new ";
         }
-        _out << "class Patcher__ : IceInternal.Patcher";
+        _out << "class Patcher__";
         _out << sb;
         if (p->isInterface())
         {
@@ -1506,8 +1129,9 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
         {
             _out << ", int member";
         }
-        _out << ") : base(type)";
+        _out << ")";
         _out << sb;
+        _out << nl << "_type = type;";
         _out << nl << "_instance = (" << name << ")instance;";
         if(classMembers.size() > 1)
         {
@@ -1515,7 +1139,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
         }
         _out << eb;
 
-        _out << sp << nl << "public override void patch(Ice.Object v)";
+        _out << sp << nl << "public void patch(Ice.Object v)";
         _out << sb;
         _out << nl << "try";
         _out << sb;
@@ -1608,11 +1232,12 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
         _out << eb;
         _out << nl << "catch(_System.InvalidCastException)";
         _out << sb;
-        _out << nl << "IceInternal.Ex.throwUOE(type(), v.ice_id());";
+        _out << nl << "IceInternal.Ex.throwUOE(_type, v.ice_id());";
         _out << eb;
         _out << eb;
 
-        _out << sp << nl << "private " << name << " _instance;";
+        _out << sp << nl << "private string _type;";
+        _out << nl << "private " << name << " _instance;";
         if(classMembers.size() > 1)
         {
             _out << nl << "private int _member;";
@@ -1626,9 +1251,9 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
     {
         emitGeneratedCodeAttribute();
     }
-    _out << nl << "protected " << qualifier << "void readImpl__(IceInternal.BasicStream is__)";
+    _out << nl << "protected " << qualifier << "void readImpl__(Ice.InputStream is__)";
     _out << sb;
-    _out << nl << "is__.startReadSlice();";
+    _out << nl << "is__.startSlice();";
     int patchIter = 0;
     const bool needCustomPatcher = classMembers.size() > 1;
     for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
@@ -1642,90 +1267,13 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
     {
         writeUnmarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), needCustomPatcher, patchIter);
     }
-    _out << nl << "is__.endReadSlice();";
+    _out << nl << "is__.endSlice();";
     if(base)
     {
         _out << nl << "base.readImpl__(is__);";
     }
     _out << eb;
 
-    //
-    // Write streaming API.
-    //
-    if(stream)
-    {
-        _out << sp;
-        if(!p->isInterface())
-        {
-            emitGeneratedCodeAttribute();
-        }
-        _out << nl << "protected " << qualifier << "void writeImpl__(Ice.OutputStream outS__)";
-        _out << sb;
-        _out << nl << "outS__.startSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");";
-        for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
-        {
-            if(!(*d)->optional())
-            {
-                writeStreamMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true));
-            }
-        }
-        for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
-        {
-            writeStreamMarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true));
-        }
-        _out << nl << "outS__.endSlice();";
-        if(base)
-        {
-            _out << nl << "base.writeImpl__(outS__);";
-        }
-        _out << eb;
-
-        _out << sp;
-        if(!p->isInterface())
-        {
-            emitGeneratedCodeAttribute();
-        }
-        _out << nl << "protected " << qualifier << "void readImpl__(Ice.InputStream inS__)";
-        _out << sb;
-        _out << nl << "inS__.startSlice();";
-        patchIter = 0;
-        for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
-        {
-            if(!(*d)->optional())
-            {
-                writeStreamUnmarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), needCustomPatcher,
-                                               patchIter);
-            }
-        }
-        for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
-        {
-            writeStreamUnmarshalDataMember(*d, fixId(*d, DotNet::ICloneable, true), needCustomPatcher,
-                                           patchIter);
-        }
-        _out << nl << "inS__.endSlice();";
-        if(base)
-        {
-            _out << nl << "base.readImpl__(inS__);";
-        }
-        _out << eb;
-    }
-    else if (!p->isInterface() && !hasBaseClass)
-    {
-        _out << sp;
-        emitGeneratedCodeAttribute();
-        _out << nl << "protected virtual void writeImpl__(Ice.OutputStream os__)";
-        _out << sb;
-        _out << nl << "throw new Ice.MarshalException(\"class was not generated with stream support\");";
-        _out << eb;
-
-                _out << sp;
-        emitGeneratedCodeAttribute();
-        _out << nl << "protected virtual void readImpl__(Ice.InputStream is__)";
-        _out << sb;
-        _out << nl << "throw new Ice.MarshalException(\"class was not generated with stream support\");";
-        _out << eb;
-    }
-
     if(preserved && !basePreserved)
     {
         _out << sp << nl << "protected Ice.SlicedData slicedData__;";
@@ -1733,7 +1281,8 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
 
     _out << sp << nl << "#endregion"; // Marshalling support
 
-    if(!p->isInterface() && !hasBaseClass) {
+    if(!p->isInterface() && !hasBaseClass)
+    {
         _out << sp << nl << "#region ICloneable members";
 
         _out << sp;
@@ -2883,9 +2432,8 @@ Slice::CsVisitor::writeDocCommentParam(const OperationPtr& p, ParamDir paramType
 }
 
 Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir,
-                bool impl, bool implTie, bool stream)
-    : _includePaths(includePaths),
-      _stream(stream)
+                bool impl, bool implTie)
+    : _includePaths(includePaths)
 {
     string fileBase = base;
     string::size_type pos = base.find_last_of("/\\");
@@ -2964,7 +2512,7 @@ Slice::Gen::generate(const UnitPtr& p)
     CompactIdVisitor compactIdVisitor(_out);
     p->visit(&compactIdVisitor, false);
 
-    TypesVisitor typesVisitor(_out, _stream);
+    TypesVisitor typesVisitor(_out);
     p->visit(&typesVisitor, false);
 
     //
@@ -2980,10 +2528,10 @@ Slice::Gen::generate(const UnitPtr& p)
     OpsVisitor opsVisitor(_out);
     p->visit(&opsVisitor, false);
 
-    HelperVisitor helperVisitor(_out, _stream);
+    HelperVisitor helperVisitor(_out);
     p->visit(&helperVisitor, false);
 
-    DispatcherVisitor dispatcherVisitor(_out, _stream);
+    DispatcherVisitor dispatcherVisitor(_out);
     p->visit(&dispatcherVisitor, false);
 
     AsyncVisitor asyncVisitor(_out);
@@ -3149,8 +2697,8 @@ Slice::Gen::CompactIdVisitor::visitClassDefStart(const ClassDefPtr& p)
     return false;
 }
 
-Slice::Gen::TypesVisitor::TypesVisitor(IceUtilInternal::Output& out, bool stream)
-    : CsVisitor(out), _stream(stream)
+Slice::Gen::TypesVisitor::TypesVisitor(IceUtilInternal::Output& out)
+    : CsVisitor(out)
 {
 }
 
@@ -3161,25 +2709,12 @@ Slice::Gen::TypesVisitor::visitModuleStart(const ModulePtr& p)
     if(p->hasOnlyDictionaries(dicts))
     {
         //
-        // If this module contains only dictionaries and they
-        // all use the new dictionary mapping, we don't need to generate
+        // If this module contains only dictionaries, we don't need to generate
         // anything for the dictionary types. The early return prevents
-        // an empty namespace from being emitted--the namespace will
-        // be emitted later by the dictionary helper (which is generated
-        // for both old and new dictionaries).
+        // an empty namespace from being emitted, the namespace will
+        // be emitted later by the dictionary helper .
         //
-        bool foundOld = false;
-        for(DictionaryList::const_iterator i = dicts.begin(); i != dicts.end() && !foundOld; ++i)
-        {
-            if((*i)->hasMetaData("clr:collection"))
-            {
-                foundOld = true;
-            }
-        }
-        if(!foundOld)
-        {
-            return false;
-        }
+        return false;
     }
 
     string name = fixId(p->name());
@@ -3206,52 +2741,20 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
     ClassList bases = p->bases();
     bool hasBaseClass = !bases.empty() && !bases.front()->isInterface();
 
-    if(!p->isLocal() && _stream)
-    {
-        _out << sp;
-        emitGeneratedCodeAttribute();
-        _out << nl << "public sealed class " << name << "Helper";
-        _out << sb;
-
-        _out << sp << nl << "public " << name << "Helper(Ice.InputStream inS__)";
-        _out << sb;
-        _out << nl << "_in = inS__;";
-        _out << nl << "_pp = new IceInternal.ParamPatcher<" << scoped << ">(\"" << p->scoped() << "\");";
-        _out << eb;
-
-        _out << sp << nl << "public static void write(Ice.OutputStream outS__, " << fixId(name) << " v__)";
-        _out << sb;
-        _out << nl << "outS__.writeObject(v__);";
-        _out << eb;
-
-        _out << sp << nl << "public void read()";
-        _out << sb;
-        _out << nl << "_in.readObject(_pp);";
-        _out << eb;
-
-        _out << sp << nl << "public " << scoped << " value";
-        _out << sb;
-        _out << nl << "get";
-        _out << sb;
-        _out << nl << "return (" << scoped << ")_pp.value;";
-        _out << eb;
-        _out << eb;
-
-        _out << sp << nl << "public static Ice.OptionalFormat optionalFormat()";
-        _out << sb;
-        _out << nl << "return " << getOptionalFormat(p->declaration()) << ';';
-        _out << eb;
-
-        _out << sp << nl << "private Ice.InputStream _in;";
-        _out << nl << "private IceInternal.ParamPatcher<" << scoped << "> _pp;";
-
-        _out << eb;
-    }
-
     StringList baseNames;
 
     _out << sp;
     emitAttributes(p);
+
+    if(p->isDelegate())
+    {
+        emitComVisibleAttribute();
+        OperationPtr o = p->allOperations().front();
+        _out << nl << "public delegate " << typeToString(o->returnType(), o->returnIsOptional()) << " ";
+        _out << fixId(name) << spar << getParams(o) << epar << ";";
+        return false;
+    }
+
     if(p->isInterface())
     {
         emitComVisibleAttribute();
@@ -3272,15 +2775,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
     {
         emitComVisibleAttribute();
         emitPartialTypeAttributes();
-
-        _out.zeroIndent();
-        _out << nl << "#if !SILVERLIGHT";
-        _out.restoreIndent();
         _out << nl << "[_System.Serializable]";
-        _out.zeroIndent();
-        _out << nl << "#endif";
-        _out.restoreIndent();
-
         if(p->allOperations().size() > 0) // See bug 4747
         {
             _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Design\", \"CA1012\")]";
@@ -3471,7 +2966,7 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
 
     if(!p->isInterface() && !p->isLocal())
     {
-        writeDispatchAndMarshalling(p, _stream);
+        writeDispatchAndMarshalling(p);
     }
 
     _out << eb;
@@ -3558,7 +3053,7 @@ Slice::Gen::TypesVisitor::visitOperation(const OperationPtr& p)
              << spar << params << "Ice.Current current__" << epar << ';';
     }
 
-    if(isLocal && (classDef->hasMetaData("async") || p->hasMetaData("async")))
+    if(isLocal && (classDef->hasMetaData("async-oneway") || p->hasMetaData("async-oneway")))
     {
         vector<string> paramsNewAsync = getParamsAsync(p, false);
 
@@ -3607,116 +3102,8 @@ void
 Slice::Gen::TypesVisitor::visitSequence(const SequencePtr& p)
 {
     //
-    // No need to generate anything if the sequence is mapped as an array.
-    //
-    if(!p->hasMetaData("clr:collection"))
-    {
-        return;
-    }
-
-    //
-    // No need to generate anything for custom sequences.
-    //
-    string prefix = "clr:type:";
-    string meta;
-    if(p->findMetaData(prefix, meta))
-    {
-        return;
-    }
-
-    //
-    // No need to generate anything for serializable sequences.
+    // No need to generate anything for sequences.
     //
-    prefix = "clr:serializable:";
-    if(p->findMetaData(prefix, meta))
-    {
-        return;
-    }
-
-    string name = fixId(p->name());
-    string s = typeToString(p->type());
-
-    _out << sp;
-
-    emitDeprecate(p, 0, _out, "type");
-
-    emitAttributes(p);
-    emitComVisibleAttribute();
-    emitGeneratedCodeAttribute();
-    if(isSerializable(p->type()))
-    {
-        _out.zeroIndent();
-        _out << nl << "#if !SILVERLIGHT";
-        _out.restoreIndent();
-        _out << nl << "[_System.Serializable]";
-        _out.zeroIndent();
-        _out << nl << "#endif";
-        _out.restoreIndent();
-    }
-    _out << nl << "public class " << name
-         << " : IceInternal.CollectionBase<" << s << ">, _System.ICloneable";
-    _out << sb;
-
-    _out << sp << nl << "#region Constructors";
-
-    _out << sp << nl << "public " << name << "() : base()";
-    _out << sb;
-    _out << eb;
-
-    _out << sp << nl << "public " << name << "(int capacity) : base(capacity)";
-    _out << sb;
-    _out << eb;
-
-    _out << sp << nl << "public " << name << "(" << s << "[] a__) : base(a__)";
-    _out << sb;
-    _out << eb;
-
-    _out << sp << nl << "public " << name << "(_System.Collections.Generic.IEnumerable<" << s << "> l__) : base(l__)";
-    _out << sb;
-    _out << eb;
-
-    _out << sp << nl << "#endregion"; // Constructors
-
-    _out << sp << nl << "#region Implicit conversion to generic List";
-
-    _out << sp << nl << "public static implicit operator _System.Collections.Generic.List<"
-         << s << ">(" << name << " s__)";
-    _out << sb;
-    _out << nl << "return s__.list_;";
-    _out << eb;
-
-    _out << sp << nl << "#endregion"; // Implicit conversion to generic List
-
-    _out << sp << nl << "#region Operations returning a new sequence";
-
-    _out << sp << nl << "public virtual " << name << " GetRange(int index, int count)";
-    _out << sb;
-    _out << nl << "_System.Collections.Generic.List<" << s << "> l = list_.GetRange(index, count);";
-    _out << nl << name << " r = new " << name << "(l.Count);";
-    _out << nl << "r.list_.AddRange(l);";
-    _out << nl << "return r;";
-    _out << eb;
-
-    _out << sp << nl << "public static " << name << " Repeat(" << s << " value, int count)";
-    _out << sb;
-    _out << nl << name << " r = new " << name << "(count);";
-    _out << nl << "for(int i = 0; i < count; ++i)";
-    _out << sb;
-    _out << nl << "r.Add(value);";
-    _out << eb;
-    _out << nl << "return r;";
-    _out << eb;
-
-    _out << sp << nl << "public object Clone()";
-    _out << sb;
-    _out << nl << name << " s = new " << name << "(Count);";
-    _out << nl << "s.list_.AddRange(list_);";
-    _out << nl << "return s;";
-    _out << eb;
-
-    _out << sp << nl << "#endregion"; // Operations returning a new sequence
-
-    _out << eb;
 }
 
 bool
@@ -3734,14 +3121,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
     // Suppress FxCop diagnostic about a missing constructor MyException(String).
     //
     _out << nl << "[_System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Design\", \"CA1032\")]";
-
-    _out.zeroIndent();
-    _out << nl << "#if !SILVERLIGHT";
-    _out.restoreIndent();
     _out << nl << "[_System.Serializable]";
-    _out.zeroIndent();
-    _out << nl << "#endif";
-    _out.restoreIndent();
 
     emitPartialTypeAttributes();
     _out << nl << "public partial class " << name << " : ";
@@ -3843,11 +3223,6 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         _out << nl << "initDM__();";
     }
     _out << eb;
-
-    _out.zeroIndent();
-    _out << nl << "#if !SILVERLIGHT";
-    _out.restoreIndent();
-
     _out << sp;
     emitGeneratedCodeAttribute();
     _out << nl << "public " << name << "(_System.Runtime.Serialization.SerializationInfo info__, "
@@ -3860,10 +3235,6 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
     }
     _out << eb;
 
-    _out.zeroIndent();
-    _out << nl << "#endif";
-    _out.restoreIndent();
-
     if(!allDataMembers.empty())
     {
         if(!dataMembers.empty())
@@ -3916,9 +3287,9 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 
     _out << sp;
     emitGeneratedCodeAttribute();
-    _out << nl << "public override string ice_name()";
+    _out << nl << "public override string ice_id()";
     _out << sb;
-    _out << nl << "return \"" << p->scoped().substr(2) << "\";";
+    _out << nl << "return \"" << p->scoped() << "\";";
     _out << eb;
 
     _out << sp << nl << "#region Object members";
@@ -3970,10 +3341,6 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 
     if(!dataMembers.empty())
     {
-        _out.zeroIndent();
-        _out << nl << "#if !SILVERLIGHT";
-        _out.restoreIndent();
-
         _out << sp;
         emitGeneratedCodeAttribute();
         _out << nl << "public override void GetObjectData(_System.Runtime.Serialization.SerializationInfo info__, "
@@ -3986,10 +3353,6 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         }
         _out << sp << nl << "base.GetObjectData(info__, context__);";
         _out << eb;
-
-        _out.zeroIndent();
-        _out << nl << "#endif";
-        _out.restoreIndent();
     }
 
     _out << sp << nl << "#endregion"; // Object members
@@ -4026,54 +3389,33 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         {
             _out << sp;
             emitGeneratedCodeAttribute();
-            _out << nl << "public override void write__(IceInternal.BasicStream os__)";
+            _out << nl << "public override void write__(Ice.OutputStream os__)";
             _out << sb;
-            _out << nl << "os__.startWriteException(slicedData__);";
+            _out << nl << "os__.startException(slicedData__);";
             _out << nl << "writeImpl__(os__);";
-            _out << nl << "os__.endWriteException();";
+            _out << nl << "os__.endException();";
             _out << eb;
 
             _out << sp;
             emitGeneratedCodeAttribute();
-            _out << nl << "public override void read__(IceInternal.BasicStream is__)";
+            _out << nl << "public override void read__(Ice.InputStream is__)";
             _out << sb;
-            _out << nl << "is__.startReadException();";
+            _out << nl << "is__.startException();";
             _out << nl << "readImpl__(is__);";
-            _out << nl << "slicedData__ = is__.endReadException(true);";
+            _out << nl << "slicedData__ = is__.endException(true);";
             _out << eb;
-
-            if(_stream)
-            {
-                _out << sp;
-                emitGeneratedCodeAttribute();
-                _out << nl << "public override void write__(Ice.OutputStream outS__)";
-                _out << sb;
-                _out << nl << "outS__.startException(slicedData__);";
-                _out << nl << "writeImpl__(outS__);";
-                _out << nl << "outS__.endException();";
-                _out << eb;
-
-                _out << sp;
-                emitGeneratedCodeAttribute();
-                _out << nl << "public override void read__(Ice.InputStream inS__)";
-                _out << sb;
-                _out << nl << "inS__.startException();";
-                _out << nl << "readImpl__(inS__);";
-                _out << nl << "slicedData__ = inS__.endException(true);";
-                _out << eb;
-            }
         }
 
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "protected override void writeImpl__(IceInternal.BasicStream os__)";
+        _out << nl << "protected override void writeImpl__(Ice.OutputStream os__)";
         _out << sb;
-        _out << nl << "os__.startWriteSlice(\"" << scoped << "\", -1, " << (!base ? "true" : "false") << ");";
+        _out << nl << "os__.startSlice(\"" << scoped << "\", -1, " << (!base ? "true" : "false") << ");";
         for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
             writeMarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception));
         }
-        _out << nl << "os__.endWriteSlice();";
+        _out << nl << "os__.endSlice();";
         if(base)
         {
             _out << nl << "base.writeImpl__(os__);";
@@ -4090,15 +3432,16 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
             {
                 _out << "new ";
             }
-            _out << "class Patcher__ : IceInternal.Patcher";
+            _out << "class Patcher__";
             _out << sb;
             _out << sp << nl << "internal Patcher__(string type, Ice.Exception instance";
             if(classMembers.size() > 1)
             {
                 _out << ", int member";
             }
-            _out << ") : base(type)";
+            _out << ")";
             _out << sb;
+            _out << nl << "_type = type;";
             _out << nl << "_instance = (" << name << ")instance;";
             if(classMembers.size() > 1)
             {
@@ -4106,7 +3449,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
             }
             _out << eb;
 
-            _out << sp << nl << "public override void patch(Ice.Object v)";
+            _out << sp << nl << "public void patch(Ice.Object v)";
             _out << sb;
             _out << nl << "try";
             _out << sb;
@@ -4213,11 +3556,12 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
             _out << eb;
             _out << nl << "catch(_System.InvalidCastException)";
             _out << sb;
-            _out << nl << "IceInternal.Ex.throwUOE(type(), v.ice_id());";
+            _out << nl << "IceInternal.Ex.throwUOE(_type, v.ice_id());";
             _out << eb;
             _out << eb;
 
-            _out << sp << nl << "private " << name << " _instance;";
+            _out << sp << nl << "private string _type;";
+            _out << nl << "private " << name << " _instance;";
             if(classMembers.size() > 1)
             {
                 _out << nl << "private int _member;";
@@ -4227,9 +3571,9 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "protected override void readImpl__(IceInternal.BasicStream is__)";
+        _out << nl << "protected override void readImpl__(Ice.InputStream is__)";
         _out << sb;
-        _out << nl << "is__.startReadSlice();";
+        _out << nl << "is__.startSlice();";
 
         int patchIter = 0;
         const bool needCustomPatcher = classMembers.size() > 1;
@@ -4237,50 +3581,13 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         {
             writeUnmarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception), needCustomPatcher, patchIter);
         }
-        _out << nl << "is__.endReadSlice();";
+        _out << nl << "is__.endSlice();";
         if(base)
         {
             _out << nl << "base.readImpl__(is__);";
         }
         _out << eb;
 
-        if(_stream)
-        {
-            _out << sp;
-            emitGeneratedCodeAttribute();
-            _out << nl << "protected override void writeImpl__(Ice.OutputStream outS__)";
-            _out << sb;
-            _out << nl << "outS__.startSlice(\"" << scoped << "\", -1, " << (!base ? "true" : "false") << ");";
-            for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
-            {
-                writeStreamMarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception));
-            }
-            _out << nl << "outS__.endSlice();";
-            if(base)
-            {
-                _out << nl << "base.writeImpl__(outS__);";
-            }
-            _out << eb;
-
-            _out << sp;
-            emitGeneratedCodeAttribute();
-            _out << nl << "protected override void readImpl__(Ice.InputStream inS__)";
-            _out << sb;
-            _out << nl << "inS__.startSlice();";
-            patchIter = 0;
-            for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
-            {
-                writeStreamUnmarshalDataMember(*q, fixId((*q)->name(), DotNet::Exception), needCustomPatcher,
-                                               patchIter);
-            }
-            _out << nl << "inS__.endSlice();";
-            if(base)
-            {
-                _out << nl << "base.readImpl__(inS__);";
-            }
-            _out << eb;
-        }
-
         if((!base || (base && !base->usesClasses(false))) && p->usesClasses(false))
         {
             _out << sp;
@@ -4307,48 +3614,13 @@ Slice::Gen::TypesVisitor::visitStructStart(const StructPtr& p)
 {
     string name = fixId(p->name());
 
-    if(!p->isLocal() && _stream)
-    {
-        _out << sp;
-        emitGeneratedCodeAttribute();
-        _out << nl << "public sealed class " << p->name() << "Helper";
-        _out << sb;
-
-        _out << sp << nl << "public static void write(Ice.OutputStream outS__, " << name << " v__)";
-        _out << sb;
-        _out << nl << "v__.ice_write(outS__);";
-        _out << eb;
-
-        _out << sp << nl << "public static " << name << " read(Ice.InputStream inS__)";
-        _out << sb;
-        _out << nl << name << " v__ = new " << name << "();";
-        _out << nl << "v__.ice_read(inS__);";
-        _out << nl << "return v__;";
-        _out << eb;
-
-        _out << sp << nl << "public static Ice.OptionalFormat optionalFormat()";
-        _out << sb;
-        _out << nl << "return " << getOptionalFormat(p) << ';';
-        _out << eb;
-
-        _out << eb;
-    }
-
     _out << sp;
 
     emitDeprecate(p, 0, _out, "type");
 
     emitAttributes(p);
     emitPartialTypeAttributes();
-
-    _out.zeroIndent();
-    _out << nl << "#if !SILVERLIGHT";
-    _out.restoreIndent();
     _out << nl << "[_System.Serializable]";
-    _out.zeroIndent();
-    _out << nl << "#endif";
-    _out.restoreIndent();
-
     _out << nl << "public partial " << (isValueType(p) ? "struct" : "class") << ' ' << name;
 
     StringList baseNames;
@@ -4538,7 +3810,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
 
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "public void write__(IceInternal.BasicStream os__)";
+        _out << nl << "public void write__(Ice.OutputStream os__)";
         _out << sb;
         for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
@@ -4550,15 +3822,16 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         {
             _out << sp;
             emitGeneratedCodeAttribute();
-            _out << nl << "public sealed class Patcher__ : IceInternal.Patcher";
+            _out << nl << "public sealed class Patcher__";
             _out << sb;
             _out << sp << nl << "internal Patcher__(string type, " << name << " instance";
             if(classMembers.size() > 1)
             {
                 _out << ", int member";
             }
-            _out << ") : base(type)";
+            _out << ")";
             _out << sb;
+            _out << nl << "_type = type;";
             _out << nl << "_instance = instance;";
             if(classMembers.size() > 1)
             {
@@ -4566,7 +3839,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
             }
             _out << eb;
 
-            _out << sp << nl << "public override void patch(Ice.Object v)";
+            _out << sp << nl << "public void patch(Ice.Object v)";
             _out << sb;
             _out << nl << "try";
             _out << sb;
@@ -4607,12 +3880,12 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
             _out << eb;
             _out << nl << "catch(_System.InvalidCastException)";
             _out << sb;
-            _out << nl << "IceInternal.Ex.throwUOE(type(), v.ice_id());";
+            _out << nl << "IceInternal.Ex.throwUOE(_type, v.ice_id());";
             _out << eb;
             _out << eb;
 
-            _out << sp << nl << "private " << name;
-            _out << " _instance;";
+            _out << sp << nl << "private string _type;";
+            _out << nl << "private " << name << " _instance;";
             if(classMembers.size() > 1)
             {
                 _out << nl << "private int _member;";
@@ -4622,7 +3895,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
 
         _out << sp;
         emitGeneratedCodeAttribute();
-        _out << nl << "public void read__(IceInternal.BasicStream is__)";
+        _out << nl << "public void read__(Ice.InputStream is__)";
         _out << sb;
         int patchIter = 0;
         const bool needCustomPatcher = classMembers.size() > 1;
@@ -4633,11 +3906,12 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         }
         _out << eb;
 
+        _out << sp;
+        emitGeneratedCodeAttribute();
+        _out << nl << "public static void write(Ice.OutputStream os__, " << name << " v__)";
+        _out << sb;
         if(isClass)
         {
-            emitGeneratedCodeAttribute();
-            _out << nl << "public static void write__(IceInternal.BasicStream os__, " << name << " v__)";
-            _out << sb;
             _out << nl << "if(v__ == null)";
             _out << sb;
             _out << nl << "nullMarshalValue__.write__(os__);";
@@ -4646,73 +3920,21 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
             _out << sb;
             _out << nl << "v__.write__(os__);";
             _out << eb;
-            _out << eb;
-
-            _out << sp;
-            emitGeneratedCodeAttribute();
-            _out << nl << "public static " << name << " read__(IceInternal.BasicStream is__, " << name << " v__)";
-            _out << sb;
-            _out << nl << "if(v__ == null)";
-            _out << sb;
-            _out << nl << "v__ = new " << name << "();";
-            _out << eb;
-            _out << nl << "v__.read__(is__);";
-            _out << nl << "return v__;";
-            _out << eb;
         }
-
-        if(_stream)
+        else
         {
-            _out << sp;
-            emitGeneratedCodeAttribute();
-            _out << nl << "public void ice_write(Ice.OutputStream outS__)";
-            _out << sb;
-            for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
-            {
-                writeStreamMarshalDataMember(*q, fixId(*q, isClass ? DotNet::ICloneable : 0));
-            }
-            _out << eb;
-
-            _out << sp;
-            emitGeneratedCodeAttribute();
-            _out << nl << "public void ice_read(Ice.InputStream inS__)";
-            _out << sb;
-            patchIter = 0;
-            for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
-            {
-                writeStreamUnmarshalDataMember(*q, fixId(*q, isClass ? DotNet::ICloneable : 0), needCustomPatcher,
-                                               patchIter);
-            }
-            _out << eb;
-
-            if(isClass)
-            {
-                emitGeneratedCodeAttribute();
-                _out << nl << "public static void ice_write(Ice.OutputStream outS__, " << name << " v__)";
-                _out << sb;
-                _out << nl << "if(v__ == null)";
-                _out << sb;
-                _out << nl << "nullMarshalValue__.ice_write(outS__);";
-                _out << eb;
-                _out << nl << "else";
-                _out << sb;
-                _out << nl << "v__.ice_write(outS__);";
-                _out << eb;
-                _out << eb;
-
-                _out << sp;
-                emitGeneratedCodeAttribute();
-                _out << nl << "public static " << name << " ice_read(Ice.InputStream inS__, " << name << " v__)";
-                _out << sb;
-                _out << nl << "if(v__ == null)";
-                _out << sb;
-                _out << nl << "v__ = new " << name << "();";
-                _out << eb;
-                _out << nl << "v__.ice_read(inS__);";
-                _out << nl << "return v__;";
-                _out << eb;
-            }
+            _out << nl << "v__.write__(os__);";
         }
+        _out << eb;
+
+        _out << sp;
+        emitGeneratedCodeAttribute();
+        _out << nl << "public static " << name << " read(Ice.InputStream is__)";
+        _out << sb;
+        _out << nl << name << " v__ = new " << name << "();";
+        _out << nl << "v__.read__(is__);";
+        _out << nl << "return v__;";
+        _out << eb;
 
         if(isClass)
         {
@@ -4727,68 +3949,6 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
 void
 Slice::Gen::TypesVisitor::visitDictionary(const DictionaryPtr& p)
 {
-    if(!p->hasMetaData("clr:collection"))
-    {
-        return;
-    }
-
-    string name = fixId(p->name());
-    string ks = typeToString(p->keyType());
-    string vs = typeToString(p->valueType());
-
-    _out << sp;
-    emitDeprecate(p, 0, _out, "type");
-    emitAttributes(p);
-    emitComVisibleAttribute();
-    emitGeneratedCodeAttribute();
-    if(isSerializable(p->keyType()) && isSerializable(p->valueType()))
-    {
-        _out.zeroIndent();
-        _out << nl << "#if !SILVERLIGHT";
-        _out.restoreIndent();
-        _out << nl << "[_System.Serializable]";
-        _out.zeroIndent();
-        _out << nl << "#endif";
-        _out.restoreIndent();
-    }
-    _out << nl << "public class " << name
-         << " : IceInternal.DictionaryBase<" << ks << ", " << vs << ">, _System.ICloneable";
-    _out << sb;
-
-    _out << sp << nl << "#region " << name << " members";
-
-    _out << sp << nl << "public void AddRange(" << name << " d__)";
-    _out << sb;
-    _out << nl << "foreach(_System.Collections.Generic.KeyValuePair<" << ks << ", " << vs << "> e in d__.dict_)";
-    _out << sb;
-    _out << nl << "try";
-    _out << sb;
-    _out << nl << "dict_.Add(e.Key, e.Value);";
-    _out << eb;
-    _out << nl << "catch(_System.ArgumentException)";
-    _out << sb;
-    _out << nl << "// ignore";
-    _out << eb;
-    _out << eb;
-    _out << eb;
-
-    _out << sp << nl << "#endregion"; // <name> members
-
-    _out << sp << nl << "#region ICloneable members";
-
-    _out << sp << nl << "public object Clone()";
-    _out << sb;
-    _out << nl << name << " d = new " << name << "();";
-    _out << nl << "foreach(_System.Collections.Generic.KeyValuePair<" << ks << ", " << vs <<"> e in dict_)";
-    _out << sb;
-    _out << nl << "d.dict_.Add(e.Key, e.Value);";
-    _out << eb;
-    _out << nl << "return d;";
-    _out << eb;
-
-    _out << sp << nl << "#endregion"; // ICloneable members
-
-    _out << eb;
 }
 
 void
@@ -4819,30 +3979,27 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
     }
     _out << eb;
 
-    if(!p->isLocal() && _stream)
+    if(!p->isLocal())
     {
         _out << sp;
         emitGeneratedCodeAttribute();
         _out << nl << "public sealed class " << p->name() << "Helper";
         _out << sb;
-
-        _out << sp << nl << "public static void write(Ice.OutputStream outS__, " << scoped << " v__)";
+        _out << sp;
+        _out << nl << "public static void write(Ice.OutputStream os__, " << name << " v__)";
         _out << sb;
-        writeMarshalUnmarshalCode(_out, p, "v__", true, true);
+        writeMarshalUnmarshalCode(_out, p, "v__", true);
         _out << eb;
 
-        _out << sp << nl << "public static " << scoped << " read(Ice.InputStream inS__)";
+        _out << sp;
+        emitGeneratedCodeAttribute();
+        _out << nl << "public static " << name << " read(Ice.InputStream is__)";
         _out << sb;
-        _out << nl << scoped << " v__;";
-        writeMarshalUnmarshalCode(_out, p, "v__", false, true);
+        _out << nl << name << " v__;";
+        writeMarshalUnmarshalCode(_out, p, "v__", false);
         _out << nl << "return v__;";
         _out << eb;
 
-        _out << sp << nl << "public static Ice.OptionalFormat optionalFormat()";
-        _out << sb;
-        _out << nl << "return " << getOptionalFormat(p) << ';';
-        _out << eb;
-
         _out << eb;
     }
 }
@@ -4918,13 +4075,7 @@ Slice::Gen::TypesVisitor::visitDataMember(const DataMemberPtr& p)
 
     if(!isSerializable(p->type()))
     {
-        _out.zeroIndent();
-        _out << nl << "#if !SILVERLIGHT";
-        _out.restoreIndent();
         _out << nl << "[_System.NonSerialized]";
-        _out.zeroIndent();
-        _out << nl << "#endif";
-        _out.restoreIndent();
     }
 
     if(isProperty)
@@ -5014,7 +4165,7 @@ Slice::Gen::TypesVisitor::writeMemberEquals(const DataMemberList& dataMembers, i
                 string meta;
                 bool isSerializable = seq->findMetaData("clr:serializable:", meta);
                 bool isGeneric = seq->findMetaData("clr:generic:", meta);
-                bool isArray = !isSerializable && !isGeneric && !seq->hasMetaData("clr:collection");
+                bool isArray = !isSerializable && !isGeneric;
                 if(isArray)
                 {
                     //
@@ -5030,34 +4181,17 @@ Slice::Gen::TypesVisitor::writeMemberEquals(const DataMemberList& dataMembers, i
                     _out << nl << "if(!IceUtilInternal.Collections.SequenceEquals(" << memberName << ", o__."
                          << memberName << "))";
                 }
-                else
-                {
-                    //
-                    // Equals() for CollectionBase has value semantics.
-                    //
-                    _out << nl << "if(!" << memberName << ".Equals(o__." << memberName << "))";
-                }
             }
             else
             {
                 DictionaryPtr dict = DictionaryPtr::dynamicCast(memberType);
                 if(dict)
                 {
-                    if(dict->hasMetaData("clr:collection"))
-                    {
-                        //
-                        // Equals() for DictionaryBase has value semantics.
-                        //
-                        _out << nl << "if(!" << memberName << ".Equals(o__." << memberName << "))";
-                    }
-                    else
-                    {
-                        //
-                        // Equals() for generic types does not have value semantics.
-                        //
-                        _out << nl << "if(!IceUtilInternal.Collections.DictionaryEquals(" << memberName << ", o__."
-                             << memberName << "))";
-                    }
+                    //
+                    // Equals() for generic types does not have value semantics.
+                    //
+                    _out << nl << "if(!IceUtilInternal.Collections.DictionaryEquals(" << memberName << ", o__."
+                            << memberName << "))";
                 }
                 else
                 {
@@ -5280,9 +4414,9 @@ Slice::Gen::AsyncDelegateVisitor::visitOperation(const OperationPtr& p)
     ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container());
 
     //
-    // We also generate delegates for local twoway-style operations marked with "async" metadata.
+    // We also generate delegates for local twoway-style operations marked with "async-oneway" metadata.
     //
-    if(cl->isLocal() && (!(cl->hasMetaData("async") || p->hasMetaData("async")) || !p->returnsData()))
+    if(cl->isLocal() && (!(cl->hasMetaData("async-oneway") || p->hasMetaData("async-oneway")) || !p->returnsData()))
     {
         return;
     }
@@ -5448,8 +4582,8 @@ Slice::Gen::OpsVisitor::writeOperations(const ClassDefPtr& p, bool noCurrent)
     _out << eb;
 }
 
-Slice::Gen::HelperVisitor::HelperVisitor(IceUtilInternal::Output& out, bool stream)
-    : CsVisitor(out), _stream(stream)
+Slice::Gen::HelperVisitor::HelperVisitor(IceUtilInternal::Output& out)
+    : CsVisitor(out)
 {
 }
 
@@ -5583,15 +4717,18 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
         }
 
         _out << "end_" << op->name() << "(";
-        if(!outParams.empty()) {
-            for(ParamDeclList::const_iterator p = outParams.begin(); p != outParams.end(); ++p) {
+        if(!outParams.empty())
+        {
+            for(ParamDeclList::const_iterator p = outParams.begin(); p != outParams.end(); ++p)
+            {
                 _out << "out " << fixId((*p)->name()) << ", ";
             }
         }
         _out << "begin_" << op->name() << "(";
         if(!inParams.empty())
         {
-            for(ParamDeclList::const_iterator p = inParams.begin(); p != inParams.end(); ++p) {
+            for(ParamDeclList::const_iterator p = inParams.begin(); p != inParams.end(); ++p)
+            {
                 _out << fixId((*p)->name()) << ", ";
             }
         }
@@ -5724,7 +4861,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
             }
             _out << nl << "catch(Ice.UserException ex__)";
             _out << sb;
-            _out << nl << "throw new Ice.UnknownUserException(ex__.ice_name(), ex__);";
+            _out << nl << "throw new Ice.UnknownUserException(ex__.ice_id(), ex__);";
             _out << eb;
             _out << eb;
 
@@ -5734,7 +4871,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
                 {
                     _out << nl << retS << " ret__;";
                 }
-                _out << nl << "IceInternal.BasicStream is__ = outAsync__.startReadParams();";
+                _out << nl << "Ice.InputStream is__ = outAsync__.startReadParams();";
                 for(ParamDeclList::const_iterator pli = outParams.begin(); pli != outParams.end(); ++pli)
                 {
                     string param = fixId((*pli)->name());
@@ -5781,7 +4918,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
                 writeMarshalUnmarshalParams(outParams, op, false);
                 if(op->returnsClasses(false))
                 {
-                    _out << nl << "is__.readPendingObjects();";
+                    _out << nl << "is__.readPendingValues();";
                 }
                 _out << nl << "outAsync__.endReadParams();";
                 writePostUnmarshalParams(outParams, op);
@@ -5841,12 +4978,11 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
 
         if(!inParams.empty())
         {
-            _out << nl << "IceInternal.BasicStream os__ = result__.startWriteParams("
-                 << opFormatTypeToString(op) << ");";
+            _out << nl << "Ice.OutputStream os__ = result__.startWriteParams(" << opFormatTypeToString(op) << ");";
             writeMarshalUnmarshalParams(inParams, 0, true);
             if(op->sendsClasses(false))
             {
-                _out << nl << "os__.writePendingObjects();";
+                _out << nl << "os__.writePendingValues();";
             }
             _out << nl << "result__.endWriteParams();";
         }
@@ -6081,12 +5217,12 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
 
     _out << sp << nl << "#region Marshaling support";
 
-    _out << sp << nl << "public static void write__(IceInternal.BasicStream os__, " << name << "Prx v__)";
+    _out << sp << nl << "public static void write(Ice.OutputStream os__, " << name << "Prx v__)";
     _out << sb;
     _out << nl << "os__.writeProxy(v__);";
     _out << eb;
 
-    _out << sp << nl << "public static " << name << "Prx read__(IceInternal.BasicStream is__)";
+    _out << sp << nl << "public static " << name << "Prx read(Ice.InputStream is__)";
     _out << sb;
     _out << nl << "Ice.ObjectPrx proxy = is__.readProxy();";
     _out << nl << "if(proxy != null)";
@@ -6098,32 +5234,6 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
     _out << nl << "return null;";
     _out << eb;
 
-    if(_stream)
-    {
-        _out << sp << nl << "public static void write(Ice.OutputStream outS__, " << name << "Prx v__)";
-        _out << sb;
-        _out << nl << "outS__.writeProxy(v__);";
-        _out << eb;
-
-        _out << sp << nl << "public static " << name << "Prx read(Ice.InputStream inS__)";
-        _out << sb;
-        _out << nl << "Ice.ObjectPrx proxy = inS__.readProxy();";
-        _out << nl << "if(proxy != null)";
-        _out << sb;
-        _out << nl << name << "PrxHelper result = new " << name << "PrxHelper();";
-        _out << nl << "result.copyFrom__(proxy);";
-        _out << nl << "return result;";
-        _out << eb;
-        _out << nl << "return null;";
-        _out << eb;
-
-        _out << sp << nl << "public static Ice.OptionalFormat optionalFormat()";
-        _out << sb;
-        _out << nl << "return Ice.OptionalFormat.FSize;";
-        _out << eb;
-
-    }
-
     _out << sp << nl << "#endregion"; // Marshaling support
 
     return true;
@@ -6153,38 +5263,18 @@ Slice::Gen::HelperVisitor::visitSequence(const SequencePtr& p)
     _out << nl << "public sealed class " << p->name() << "Helper";
     _out << sb;
 
-    _out << sp << nl << "public static void write(IceInternal.BasicStream os__, " << typeS << " v__)";
+    _out << sp << nl << "public static void write(Ice.OutputStream os__, " << typeS << " v__)";
     _out << sb;
-    writeSequenceMarshalUnmarshalCode(_out, p, "v__", true, false, false);
+    writeSequenceMarshalUnmarshalCode(_out, p, "v__", true, false);
     _out << eb;
 
-    _out << sp << nl << "public static " << typeS << " read(IceInternal.BasicStream is__)";
+    _out << sp << nl << "public static " << typeS << " read(Ice.InputStream is__)";
     _out << sb;
     _out << nl << typeS << " v__;";
-    writeSequenceMarshalUnmarshalCode(_out, p, "v__", false, false, false);
+    writeSequenceMarshalUnmarshalCode(_out, p, "v__", false, false);
     _out << nl << "return v__;";
     _out << eb;
 
-    if(_stream)
-    {
-        _out << sp << nl << "public static void write(Ice.OutputStream outS__, " << typeS << " v__)";
-        _out << sb;
-        writeSequenceMarshalUnmarshalCode(_out, p, "v__", true, true, false);
-        _out << eb;
-
-        _out << sp << nl << "public static " << typeS << " read(Ice.InputStream inS__)";
-        _out << sb;
-        _out << nl << typeS << " v__;";
-        writeSequenceMarshalUnmarshalCode(_out, p, "v__", false, true, false);
-        _out << nl << "return v__;";
-        _out << eb;
-
-        _out << sp << nl << "public static Ice.OptionalFormat optionalFormat()";
-        _out << sb;
-        _out << nl << "return " << getOptionalFormat(p) << ';';
-        _out << eb;
-    }
-
     _out << eb;
 
     string prefix = "clr:generic:";
@@ -6238,7 +5328,6 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
     TypePtr value = p->valueType();
 
     string meta;
-    bool isNewMapping = !p->hasMetaData("clr:collection");
 
     string prefix = "clr:generic:";
     string genericType;
@@ -6253,9 +5342,7 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
 
     string keyS = typeToString(key);
     string valueS = typeToString(value);
-    string name = isNewMapping
-                        ? "_System.Collections.Generic." + genericType + "<" + keyS + ", " + valueS + ">"
-                        : fixId(p->name());
+    string name = "_System.Collections.Generic." + genericType + "<" + keyS + ", " + valueS + ">";
 
     _out << sp;
     emitGeneratedCodeAttribute();
@@ -6264,7 +5351,7 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
 
     _out << sp << nl << "public static void write(";
     _out.useCurrentPosAsIndent();
-    _out << "IceInternal.BasicStream os__,";
+    _out << "Ice.OutputStream os__,";
     _out << nl << name << " v__)";
     _out.restoreIndent();
     _out << sb;
@@ -6276,20 +5363,11 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
     _out << sb;
     _out << nl << "os__.writeSize(v__.Count);";
     _out << nl << "foreach(_System.Collections.";
-    if(isNewMapping)
-    {
-        _out << "Generic.KeyValuePair<" << keyS << ", " << valueS << ">";
-    }
-    else
-    {
-        _out << "DictionaryEntry";
-    }
+    _out << "Generic.KeyValuePair<" << keyS << ", " << valueS << ">";
     _out << " e__ in v__)";
     _out << sb;
-    string keyArg = isNewMapping ? string("e__.Key") : "((" + keyS + ")e__.Key)";
-    writeMarshalUnmarshalCode(_out, key, keyArg, true, false);
-    string valueArg = isNewMapping ? string("e__.Value") : "((" + valueS + ")e__.Value)";
-    writeMarshalUnmarshalCode(_out, value, valueArg, true, false);
+    writeMarshalUnmarshalCode(_out, key, "e__.Key", true);
+    writeMarshalUnmarshalCode(_out, value, "e__.Value", true);
     _out << eb;
     _out << eb;
     _out << eb;
@@ -6298,15 +5376,16 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
 
     if(hasClassValue)
     {
-        _out << sp << nl << "public sealed class Patcher__ : IceInternal.Patcher";
+        _out << sp << nl << "public sealed class Patcher__";
         _out << sb;
-        _out << sp << nl << "internal Patcher__(string type, " << name << " m, " << keyS << " key) : base(type)";
+        _out << sp << nl << "internal Patcher__(string type, " << name << " m, " << keyS << " key)";
         _out << sb;
+        _out << nl << "_type = type;";
         _out << nl << "_m = m;";
         _out << nl << "_key = key;";
         _out << eb;
 
-        _out << sp << nl << "public override void patch(Ice.Object v)";
+        _out << sp << nl << "public void patch(Ice.Object v)";
         _out << sb;
         if(ClassDeclPtr::dynamicCast(value))
         {
@@ -6316,7 +5395,7 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
             _out << eb;
             _out << nl << "catch(_System.InvalidCastException)";
             _out << sb;
-            _out << nl << "IceInternal.Ex.throwUOE(type(), v.ice_id());";
+            _out << nl << "IceInternal.Ex.throwUOE(_type, v.ice_id());";
             _out << eb;
         }
         else
@@ -6325,12 +5404,13 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
         }
         _out << eb;
 
-        _out << sp << nl << "private " << name << " _m;";
+        _out << sp << nl << "private string _type;";
+        _out << nl << "private " << name << " _m;";
         _out << nl << "private " << keyS << " _key;";
         _out << eb;
     }
 
-    _out << sp << nl << "public static " << name << " read(IceInternal.BasicStream is__)";
+    _out << sp << nl << "public static " << name << " read(Ice.InputStream is__)";
     _out << sb;
     _out << nl << "int sz__ = is__.readSize();";
     _out << nl << name << " r__ = new " << name << "();";
@@ -6349,12 +5429,12 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
             _out << nl << "k__ = null;";
         }
     }
-    writeMarshalUnmarshalCode(_out, key, "k__", false, false);
+    writeMarshalUnmarshalCode(_out, key, "k__", false);
 
     string patcher;
     if(hasClassValue)
     {
-        patcher = "new Patcher__(" + getStaticId(value) + ", r__, k__)";
+        patcher = "new Patcher__(" + getStaticId(value) + ", r__, k__).patch";
     }
     else
     {
@@ -6373,7 +5453,7 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
             }
         }
     }
-    writeMarshalUnmarshalCode(_out, value, hasClassValue ? patcher : "v__", false, false);
+    writeMarshalUnmarshalCode(_out, value, hasClassValue ? patcher : "v__", false);
     if(!hasClassValue)
     {
         _out << nl << "r__[k__] = v__;";
@@ -6382,90 +5462,11 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
     _out << nl << "return r__;";
     _out << eb;
 
-    if(_stream)
-    {
-        _out << sp << nl << "public static void write(Ice.OutputStream outS__, " << name << " v__)";
-        _out << sb;
-        _out << nl << "if(v__ == null)";
-        _out << sb;
-        _out << nl << "outS__.writeSize(0);";
-        _out << eb;
-        _out << nl << "else";
-        _out << sb;
-        _out << nl << "outS__.writeSize(v__.Count);";
-        _out << nl << "foreach(_System.Collections.";
-        if(isNewMapping)
-        {
-            _out << nl << "Generic.KeyValuePair<" << keyS << ", " << valueS << ">";
-        }
-        else
-        {
-            _out << nl << "DictionaryEntry";
-        }
-        _out << " e__ in v__)";
-        _out << sb;
-        writeMarshalUnmarshalCode(_out, key, keyArg, true, true);
-        writeMarshalUnmarshalCode(_out, value, valueArg, true, true);
-        _out << eb;
-        _out << eb;
-        _out << eb;
-
-        _out << sp << nl << "public static " << name << " read(Ice.InputStream inS__)";
-        _out << sb;
-        _out << nl << "int sz__ = inS__.readSize();";
-        _out << nl << name << " r__ = new " << name << "();";
-        _out << nl << "for(int i__ = 0; i__ < sz__; ++i__)";
-        _out << sb;
-        _out << nl << keyS << " k__;";
-        StructPtr st = StructPtr::dynamicCast(key);
-        if(st)
-        {
-            if(isValueType(st))
-            {
-                _out << nl << "k__ = new " << typeToString(key) << "();";
-            }
-            else
-            {
-                _out << nl << "k__ = null;";
-            }
-        }
-        writeMarshalUnmarshalCode(_out, key, "k__", false, true);
-        if(!hasClassValue)
-        {
-            _out << nl << valueS << " v__;";
-            StructPtr st = StructPtr::dynamicCast(value);
-            if(st)
-            {
-                if(isValueType(st))
-                {
-                    _out << nl << "v__ = new " << typeToString(value) << "();";
-                }
-                else
-                {
-                    _out << nl << "v__ = null;";
-                }
-            }
-        }
-        writeMarshalUnmarshalCode(_out, value, hasClassValue ? patcher : "v__", false, true);
-        if(!hasClassValue)
-        {
-            _out << nl << "r__[k__] = v__;";
-        }
-        _out << eb;
-        _out << nl << "return r__;";
-        _out << eb;
-
-        _out << sp << nl << "public static Ice.OptionalFormat optionalFormat()";
-        _out << sb;
-        _out << nl << "return " << getOptionalFormat(p) << ';';
-        _out << eb;
-    }
-
     _out << eb;
 }
 
-Slice::Gen::DispatcherVisitor::DispatcherVisitor(::IceUtilInternal::Output &out, bool stream)
-    : CsVisitor(out), _stream(stream)
+Slice::Gen::DispatcherVisitor::DispatcherVisitor(::IceUtilInternal::Output &out)
+    : CsVisitor(out)
 {
 }
 
@@ -6558,7 +5559,7 @@ Slice::Gen::DispatcherVisitor::visitClassDefStart(const ClassDefPtr& p)
 
     writeInheritedOperations(p);
 
-    writeDispatchAndMarshalling(p, _stream);
+    writeDispatchAndMarshalling(p);
 
     _out << eb;
 
@@ -6678,11 +5679,11 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
         {
             _out << nl << "try";
             _out << sb;
-            _out << nl << "IceInternal.BasicStream os__ = startWriteParams__(" << opFormatTypeToString(p) << ");";
+            _out << nl << "Ice.OutputStream os__ = startWriteParams__(" << opFormatTypeToString(p) << ");";
             writeMarshalUnmarshalParams(outParams, p, true);
             if(p->returnsClasses(false))
             {
-                _out << nl << "os__.writePendingObjects();";
+                _out << nl << "os__.writePendingValues();";
             }
             _out << nl << "endWriteParams__(true);";
             _out << eb;
diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h
index a602ad33b78..7550ea270ac 100644
--- a/cpp/src/slice2cs/Gen.h
+++ b/cpp/src/slice2cs/Gen.h
@@ -10,7 +10,7 @@
 #ifndef GEN_H
 #define GEN_H
 
-#include <Slice/CsUtil.h>
+#include <CsUtil.h>
 
 namespace Slice
 {
@@ -29,11 +29,9 @@ protected:
     void writePostUnmarshalParams(const ParamDeclList&, const OperationPtr&);
     void writeMarshalDataMember(const DataMemberPtr&, const std::string&);
     void writeUnmarshalDataMember(const DataMemberPtr&, const std::string&, bool, int&);
-    void writeStreamMarshalDataMember(const DataMemberPtr&, const std::string&);
-    void writeStreamUnmarshalDataMember(const DataMemberPtr&, const std::string&, bool, int&);
 
     virtual void writeInheritedOperations(const ClassDefPtr&);
-    virtual void writeDispatchAndMarshalling(const ClassDefPtr&, bool);
+    virtual void writeDispatchAndMarshalling(const ClassDefPtr&);
     virtual std::vector<std::string> getParams(const OperationPtr&);
     virtual std::vector<std::string> getParamsAsync(const OperationPtr&, bool);
     virtual std::vector<std::string> getParamsAsyncCB(const OperationPtr&, bool, bool);
@@ -82,7 +80,6 @@ public:
         const std::vector<std::string>&,
         const std::string&,
         bool,
-        bool,
         bool);
     ~Gen();
 
@@ -100,8 +97,6 @@ private:
 
     std::vector<std::string> _includePaths;
 
-    bool _stream;
-
     void printHeader();
 
     class UnitVisitor : public CsVisitor
@@ -128,7 +123,7 @@ private:
     {
     public:
 
-        TypesVisitor(::IceUtilInternal::Output&, bool);
+        TypesVisitor(::IceUtilInternal::Output&);
 
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
@@ -149,8 +144,6 @@ private:
 
         void writeMemberHashCode(const DataMemberList&, int);
         void writeMemberEquals(const DataMemberList&, int);
-
-        bool _stream;
     };
 
     class AsyncDelegateVisitor : public CsVisitor
@@ -197,7 +190,7 @@ private:
     {
     public:
 
-        HelperVisitor(::IceUtilInternal::Output&, bool);
+        HelperVisitor(::IceUtilInternal::Output&);
 
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
@@ -205,25 +198,17 @@ private:
         virtual void visitClassDefEnd(const ClassDefPtr&);
         virtual void visitSequence(const SequencePtr&);
         virtual void visitDictionary(const DictionaryPtr&);
-
-    private:
-
-        bool _stream;
     };
 
     class DispatcherVisitor : public CsVisitor
     {
     public:
 
-        DispatcherVisitor(::IceUtilInternal::Output&, bool);
+        DispatcherVisitor(::IceUtilInternal::Output&);
 
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
         virtual bool visitClassDefStart(const ClassDefPtr&);
-
-    private:
-
-        bool _stream;
     };
 
     class AsyncVisitor : public CsVisitor
diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp
index e8aaebebcda..5850c2cb640 100644
--- a/cpp/src/slice2cs/Main.cpp
+++ b/cpp/src/slice2cs/Main.cpp
@@ -14,7 +14,7 @@
 #include <Slice/Preprocessor.h>
 #include <Slice/FileTracker.h>
 #include <Slice/Util.h>
-#include <Gen.h>
+#include "Gen.h"
 
 using namespace std;
 using namespace Slice;
@@ -78,7 +78,6 @@ usage(const char* n)
         "--ice                   Allow reserved Ice prefix in Slice identifiers.\n"
         "--underscore            Allow underscores in Slice identifiers.\n"
         "--checksum              Generate checksums for Slice definitions.\n"
-        "--stream                Generate marshaling support for public stream API.\n"
         ;
 }
 
@@ -104,7 +103,6 @@ compile(int argc, char* argv[])
     opts.addOpt("", "ice");
     opts.addOpt("", "underscore");
     opts.addOpt("", "checksum");
-    opts.addOpt("", "stream");
 
     bool validate = false;
     for(int i = 0; i < argc; ++i)
@@ -186,8 +184,6 @@ compile(int argc, char* argv[])
 
     bool checksum = opts.isSet("checksum");
 
-    bool stream = opts.isSet("stream");
-
     if(args.empty())
     {
         getErrorStream() << argv[0] << ": error: no input file" << endl;
@@ -322,7 +318,7 @@ compile(int argc, char* argv[])
                 {
                     try
                     {
-                        Gen gen(icecpp->getBaseName(), includePaths, output, impl, implTie, stream);
+                        Gen gen(icecpp->getBaseName(), includePaths, output, impl, implTie);
                         gen.generate(p);
                         if(tie)
                         {
diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile
deleted file mode 100644
index e46c1005dd6..00000000000
--- a/cpp/src/slice2cs/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-NAME		= $(bindir)/slice2cs
-
-TARGETS		= $(NAME)
-
-OBJS		= Gen.o \
-		  Main.o
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I.. $(CPPFLAGS)
-
-$(NAME): $(OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK)
-
-install:: all
-	$(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/slice2cs.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/slice2cs/Makefile.mak b/cpp/src/slice2cs/Makefile.mak
deleted file mode 100644
index ac748e4fabd..00000000000
--- a/cpp/src/slice2cs/Makefile.mak
+++ /dev/null
@@ -1,49 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2cs.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= .\Gen.obj \
-		  .\Main.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-RES_FILE        = Slice2Cs.res
-
-$(NAME): $(OBJS) Slice2Cs.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \
-		$(BASELIBS) $(RES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Cs.res
-
-install:: all
-	copy $(NAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(NAME:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/slice2cs/Slice2Cs.rc b/cpp/src/slice2cs/Slice2Cs.rc
index 174785ed336..54ebf2b17a8 100644
--- a/cpp/src/slice2cs/Slice2Cs.rc
+++ b/cpp/src/slice2cs/Slice2Cs.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to C# Translator\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "slice2cs\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2cs.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cs/msbuild/packages.config b/cpp/src/slice2cs/msbuild/packages.config
new file mode 100644
index 00000000000..88735dc0077
--- /dev/null
+++ b/cpp/src/slice2cs/msbuild/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" />
+  <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
new file mode 100644
index 00000000000..7708db7883e
--- /dev/null
+++ b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{7BF9F3E4-46CA-491B-A349-624C45212A19}</ProjectGuid>
+    <RootNamespace>slice2cs</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Gen.cpp" />
+    <ClCompile Include="..\Main.cpp" />
+    <ClCompile Include="..\CsUtil.cpp" />
+    <ClCompile Include="..\DotNetNames.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Slice2Cs.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Gen.h" />
+    <ClInclude Include="..\CsUtil.h" />
+    <ClInclude Include="..\DotNetNames.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj">
+      <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj">
+      <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" />
+    <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj.filters b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj.filters
new file mode 100644
index 00000000000..a1c8e3d7b1d
--- /dev/null
+++ b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj.filters
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{B0615C59-1C5B-474F-9B1D-593673178D8D}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{3C25EFE2-FDEA-462F-87EE-24F248BB2E8F}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{572D960A-AB1C-4489-8BF3-B9C237B7F0F3}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Gen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CsUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\DotNetNames.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Slice2Cs.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Gen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CsUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\DotNetNames.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/slice2freeze/.depend.mak b/cpp/src/slice2freeze/.depend.mak
deleted file mode 100755
index 91efa2f3260..00000000000
--- a/cpp/src/slice2freeze/.depend.mak
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Main.obj: \
-	Main.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Slice\Preprocessor.h" \
-    "$(includedir)\Slice\CPlusPlusUtil.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
diff --git a/cpp/src/slice2freeze/.gitignore b/cpp/src/slice2freeze/.gitignore
deleted file mode 100644
index 720f44c7047..00000000000
--- a/cpp/src/slice2freeze/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
deleted file mode 100644
index 3e2e5e82e79..00000000000
--- a/cpp/src/slice2freeze/Main.cpp
+++ /dev/null
@@ -1,2142 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <IceUtil/DisableWarnings.h>
-#include <IceUtil/Options.h>
-#include <IceUtil/CtrlCHandler.h>
-#include <IceUtil/Mutex.h>
-#include <IceUtil/MutexPtrLock.h>
-#include <Slice/Preprocessor.h>
-#include <Slice/CPlusPlusUtil.h>
-#include <Slice/FileTracker.h>
-#include <Slice/Util.h>
-#include <IceUtil/OutputUtil.h>
-#include <IceUtil/StringUtil.h>
-#include <cstring>
-
-using namespace std;
-using namespace IceUtil;
-using namespace IceUtilInternal;
-using namespace Slice;
-
-namespace
-{
-
-IceUtil::Mutex* globalMutex = 0;
-bool interrupted = false;
-
-class Init
-{
-public:
-
-    Init()
-    {
-        globalMutex = new IceUtil::Mutex;
-    }
-
-    ~Init()
-    {
-        delete globalMutex;
-        globalMutex = 0;
-    }
-};
-
-Init init;
-
-string ICE_ENCODING_COMPARE = "Freeze::IceEncodingCompare";
-
-}
-
-void
-interruptedCallback(int /*signal*/)
-{
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex);
-
-    interrupted = true;
-}
-
-class MetaDataVisitor : public ParserVisitor
-{
-public:
-
-    MetaDataVisitor() :
-        _useWstring(false)
-    {
-    }
-
-    virtual bool visitModuleStart(const ModulePtr& p)
-    {
-        setUseWstring(p);
-        return true;
-    }
-
-    virtual void visitModuleEnd(const ModulePtr&)
-    {
-        resetUseWstring();
-    }
-
-    virtual bool visitClassDefStart(const ClassDefPtr& p)
-    {
-        setUseWstring(p);
-        checkMetaData(p->dataMembers());
-        resetUseWstring();
-        return true;
-    }
-
-    virtual bool visitStructStart(const StructPtr& p)
-    {
-        setUseWstring(p);
-        checkMetaData(p->dataMembers());
-        resetUseWstring();
-        return true;
-    }
-
-private:
-
-    void checkMetaData(const DataMemberList& dataMembers)
-    {
-        for(DataMemberList::const_iterator p = dataMembers.begin(); p != dataMembers.end(); ++p)
-        {
-            BuiltinPtr builtin = BuiltinPtr::dynamicCast((*p)->type());
-            if(builtin && builtin->kind() == Builtin::KindString)
-            {
-                StringList metaData = (*p)->getMetaData();
-                for(StringList::const_iterator q = metaData.begin(); q != metaData.end(); ++q)
-                {
-                    if(*q == "cpp:type:string" || *q == "cpp:type:wstring")
-                    {
-                        continue;
-                    }
-                }
-                metaData.push_back(_useWstring ? "cpp:type:wstring" : "cpp:type:string");
-                (*p)->setMetaData(metaData);
-            }
-        }
-    }
-
-    void setUseWstring(ContainedPtr p)
-    {
-        _useWstringHist.push_back(_useWstring);
-        StringList metaData = p->getMetaData();
-        if(find(metaData.begin(), metaData.end(), "cpp:type:wstring") != metaData.end())
-        {
-            _useWstring = true;
-        }
-        else if(find(metaData.begin(), metaData.end(), "cpp:type:string") != metaData.end())
-        {
-            _useWstring = false;
-        }
-    }
-
-    void resetUseWstring()
-    {
-        _useWstring = _useWstringHist.back();
-        _useWstringHist.pop_back();
-    }
-
-    bool _useWstring;
-    std::list<bool> _useWstringHist;
-};
-
-struct DictIndex
-{
-    string member;
-    bool caseSensitive;
-    bool sort;
-    string userCompare;
-
-    bool operator==(const DictIndex& rhs) const
-    {
-        return member == rhs.member;
-    }
-
-    bool operator!=(const DictIndex& rhs) const
-    {
-        return member != rhs.member;
-    }
-};
-
-struct Dict
-{
-    string name;
-    string key;
-    StringList keyMetaData;
-    string value;
-    StringList valueMetaData;
-    bool sort;
-    string userCompare;
-
-    vector<DictIndex> indices;
-};
-
-struct Index
-{
-    string name;
-    string type;
-    string member;
-    bool caseSensitive;
-};
-
-struct IndexType
-{
-    TypePtr type;
-    StringList metaData;
-};
-
-void
-usage(const char* n)
-{
-    getErrorStream() << "Usage: " << n << " [options] file-base [slice-files...]\n";
-    getErrorStream() <<
-        "Options:\n"
-        "-h, --help            Show this message.\n"
-        "-v, --version         Display the Ice version.\n"
-        "--validate               Validate command line options.\n"
-        "--header-ext EXT      Use EXT instead of the default `h' extension.\n"
-        "--source-ext EXT      Use EXT instead of the default `cpp' extension.\n"
-        "--add-header HDR[,GUARD]\n"
-        "                      Add #include for HDR (with guard GUARD) to\n"
-        "                      generated source file.\n"
-        "-DNAME                Define NAME as 1.\n"
-        "-DNAME=DEF            Define NAME as DEF.\n"
-        "-UNAME                Remove any definition for NAME.\n"
-        "-IDIR                 Put DIR in the include file search path.\n"
-        "-E                    Print preprocessor output on stdout.\n"
-        "--include-dir DIR     Use DIR as the header include directory in\n"
-        "                      source files.\n"
-        "--dll-export SYMBOL   Use SYMBOL for DLL exports.\n"
-        "--dict NAME,KEY,VALUE[,sort[,COMPARE]]\n"
-        "                      Create a Freeze dictionary with the name NAME,\n"
-        "                      using KEY as key, and VALUE as value. This\n"
-        "                      option may be specified multiple times for\n"
-        "                      different names. NAME may be a scoped name.\n"
-        "                      By default, keys are sorted using their binary\n"
-        "                      Ice-encoding representation. Use 'sort' to sort\n"
-        "                      with the COMPARE functor class. COMPARE's default\n"
-        "                      value is std::less<KEY>\n"
-        "--index NAME,TYPE,MEMBER[,{case-sensitive|case-insensitive}]\n"
-        "                      Create a Freeze evictor index with the name\n"
-        "                      NAME for member MEMBER of class TYPE. This\n"
-        "                      option may be specified multiple times for\n"
-        "                      different names. NAME may be a scoped name.\n"
-        "                      When member is a string, the case can be\n"
-        "                      sensitive or insensitive (default is sensitive).\n"
-        "--dict-index DICT[,MEMBER][,{case-sensitive|case-insensitive}]\n"
-        "                 [,sort[,COMPARE]]\n"
-        "                      Add an index to dictionary DICT. If MEMBER is \n"
-        "                      specified, then DICT's VALUE must be a class or\n"
-        "                      a struct, and MEMBER must designate a member of\n"
-        "                      VALUE. Otherwise, the entire VALUE is used for \n"
-        "                      indexing. When the secondary key is a string, \n"
-        "                      the case can be sensitive or insensitive (default\n"
-        "                      is sensitive).\n"
-        "                      By default, keys are sorted using their binary\n"
-        "                      Ice-encoding representation. Use 'sort' to sort\n"
-        "                      with the COMPARE functor class. COMPARE's default\n"
-        "                      value is std::less<secondary key type>.\n"
-        "--output-dir DIR      Create files in the directory DIR.\n"
-        "--depend              Generate dependencies for input Slice files.\n"
-        "--depend-xml          Generate dependencies in XML format.\n"
-        "--depend-file FILE    Write dependencies to FILE instead of standard output.\n"
-        "-d, --debug           Print debug messages.\n"
-        "--ice                 Allow reserved Ice prefix in Slice identifiers.\n"
-        "--underscore          Allow underscores in Slice identifiers.\n"
-        ;
-}
-
-void
-checkIdentifier(string t, string s)
-{
-    if(s.empty() || (!IceUtilInternal::isAlpha(s[0]) && s[0] != '_'))
-    {
-        ostringstream os;
-        os << t << "' is not a valid type name";
-        throw os.str();
-    }
-
-    for(unsigned int i = 1; i < s.size(); ++i)
-    {
-        if(!isalnum(static_cast<unsigned char>(s[i])) && s[i] != '_')
-        {
-            ostringstream os;
-            os << t << "' is not a valid type name";
-            throw os.str();
-        }
-    }
-}
-
-void
-printFreezeTypes(Output& out, const vector<Dict>& dicts, const vector<Index>& indices)
-{
-    out << '\n';
-    out << "\n// Freeze types in this file:";
-    for(vector<Dict>::const_iterator p = dicts.begin(); p != dicts.end(); ++p)
-    {
-        out << "\n// name=\"" << p->name << "\", key=\""
-            << p->key << "\", value=\"" << p->value << "\"";
-    }
-
-    for(vector<Index>::const_iterator q = indices.begin(); q != indices.end(); ++q)
-    {
-        out << "\n// name=\"" << q->name << "\", type=\"" << q->type
-            << "\", member=\"" << q->member << "\"";
-        if(q->caseSensitive == false)
-        {
-            out << " (case insensitive)";
-        }
-    }
-    out << '\n';
-}
-
-template<class T>
-inline string
-getCompare(const T& t, const string& keyType)
-{
-    if(t.sort)
-    {
-        if(t.userCompare == "")
-        {
-            return "std::less< " + keyType + ">";
-        }
-        else
-        {
-            return t.userCompare;
-        }
-    }
-    else
-    {
-        return ICE_ENCODING_COMPARE;
-    }
-}
-
-string
-getTypeId(const TypePtr& type, const StringList& metaData)
-{
-    string typeId = type->typeId();
-    BuiltinPtr builtInType = BuiltinPtr::dynamicCast(type);
-    if(builtInType &&  builtInType->kind() == Builtin::KindString && metaData.size() != 0 &&
-       metaData.front() == "cpp:type:wstring")
-    {
-        typeId = "wstring";
-    }
-    return typeId;
-}
-
-void
-writeDictH(const string& name, const Dict& dict, const vector<IndexType> indexTypes, const TypePtr& keyType,
-           const StringList& keyMetaData, const TypePtr& valueType, const StringList& valueMetaData, Output& H,
-           const string& dllExport)
-{
-    const string keyTypeS = typeToString(keyType, keyMetaData);
-    const string valueTypeS = typeToString(valueType, valueMetaData);
-    const string compare = getCompare(dict, keyTypeS);
-    const string keyCodec = string("::Freeze::MapKeyCodec< ") + keyTypeS + " >";
-    const string valueCodec =
-        string(valueType->usesClasses() ? "::Freeze::MapObjectValueCodec" : "::Freeze::MapValueCodec") +
-        "< " + valueTypeS + " >";
-
-    const string templateParams = string("< ") + keyTypeS + ", " + valueTypeS + ", " + keyCodec + ", " + valueCodec +
-        ", " + compare + " >";
-
-    const string keyCompareParams = string("< ") + keyTypeS + ", " + keyCodec + ", " + compare + " >";
-
-    vector<string> capitalizedMembers;
-
-    for(size_t i = 0; i < dict.indices.size(); ++i)
-    {
-        const string& member = dict.indices[i].member;
-        if(!member.empty())
-        {
-            string capitalizedMember = member;
-            capitalizedMember[0] = toupper(static_cast<unsigned char>(capitalizedMember[0]));
-            capitalizedMembers.push_back(capitalizedMember);
-        }
-        else
-        {
-            capitalizedMembers.push_back("Value");
-        }
-    }
-
-    H << sp << nl << "class " << dllExport << name
-      << " : public Freeze::Map" << templateParams;
-    H << sb;
-    H.dec();
-    H << sp << nl << "public:";
-    H << sp;
-    H.inc();
-
-    //
-    // Typedefs
-    //
-    /*
-    H << nl << "typedef std::pair<const " << keyTypeS << ", const " << valueTypeS << " > value_type;";
-
-    H << nl << "typedef Freeze::Iterator" << templateParams << " iterator;";
-    H << nl << "typedef Freeze::ConstIterator" << templateParams << " const_iterator;";
-    H << nl << "typedef size_t size_type;";
-    H << nl << "typedef ptrdiff_t difference_type;";
-    */
-
-    //
-    // Nested index classes
-    //
-
-    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
-    {
-        string className = capitalizedMembers[i] + "Index";
-
-        string indexCompare = getCompare(dict.indices[i], typeToString(indexTypes[i].type, indexTypes[i].metaData));
-
-        string indexCompareParams = string("< ") + typeToString(indexTypes[i].type, indexTypes[i].metaData) + ", "
-            + className + ", " + indexCompare + " >";
-
-        H << sp << nl << "class " << dllExport << className
-          << " : public Freeze::MapIndex" << indexCompareParams;
-        H << sb;
-
-        H.dec();
-        H << sp << nl << "public:";
-        H << sp;
-        H.inc();
-        H << nl << capitalizedMembers[i] << "Index(const std::string&, const "
-          << indexCompare << "& = " << indexCompare << "());";
-
-        H << sp;
-
-        //
-        // Codec
-        //
-        H << nl << "static void write(" << inputTypeToString(indexTypes[i].type, 0, indexTypes[i].metaData)
-          << ", Freeze::Key&, const Ice::CommunicatorPtr&, const Ice::EncodingVersion&);";
-
-        H << nl << "static void read("
-          << typeToString(indexTypes[i].type, indexTypes[i].metaData)
-          << "&, const Freeze::Key&, const ::Ice::CommunicatorPtr&, const Ice::EncodingVersion&);";
-
-        H.dec();
-        H << sp << nl << "protected:";
-        H << sp;
-        H.inc();
-
-        H << nl << "virtual void marshalKey(const Freeze::Value&, Freeze::Key&) const;";
-
-        H << eb << ';';
-    }
-
-    //
-    // Constructors
-    //
-    H << sp;
-    H << nl << name << "(const Freeze::ConnectionPtr&, const std::string&, "
-      << "bool = true, const " << compare << "& = " << compare << "());";
-    H << sp;
-    H << nl << "template <class _InputIterator>"
-      << nl << name << "(const Freeze::ConnectionPtr& __connection, "
-      << "const std::string& __dbName, bool __createDb, _InputIterator __first, _InputIterator __last, "
-      << "const " << compare << "& __compare = " << compare << "())";
-    H.inc();
-    if(capitalizedMembers.empty())
-    {
-        H << nl << ": Freeze::Map" << templateParams <<"(__connection, __dbName, keyTypeId(), valueTypeId(), "
-          << "__createDb, __first, __last, __compare)";
-        H.dec();
-        H << sb;
-        H << eb;
-    }
-    else
-    {
-        H << nl << ": Freeze::Map" << templateParams <<"(__connection->getCommunicator(), __connection->getEncoding())";
-        H.dec();
-        H << sb;
-        H << nl << "Freeze::KeyCompareBasePtr __keyCompare = "
-          << "new Freeze::KeyCompare" << keyCompareParams << "(__compare, this->_communicator, this->_encoding);";
-        H << nl << "std::vector<Freeze::MapIndexBasePtr> __indices;";
-        for(size_t i = 0; i < capitalizedMembers.size(); ++i)
-        {
-            string indexName = dict.indices[i].member;
-            if(indexName.empty())
-            {
-                indexName = "index";
-            }
-            indexName = string("\"") + indexName + "\"";
-
-            H << nl << "__indices.push_back(new " << capitalizedMembers[i] << "Index(" << indexName << "));";
-        }
-        H << nl << "this->_helper.reset(Freeze::MapHelper::create(__connection, __dbName, keyTypeId(), valueTypeId(), "
-          << "__keyCompare, __indices, __createDb));";
-        H << nl << "while(__first != __last)";
-        H << sb;
-        H << nl << "put(*__first);";
-        H << nl << "++__first;";
-        H << eb;
-        H << eb;
-
-        //
-        // Recreate
-        //
-        H << sp << nl << "static void recreate(const Freeze::ConnectionPtr&, const std::string&, "
-          << "const " << compare << "& = " << compare << "());";
-    }
-
-    H << sp;
-    H << nl << "static std::string keyTypeId();";
-    H << nl << "static std::string valueTypeId();";
-
-    //
-    // Find, begin, lowerBound, upperBound, equalRange and count functions
-    //
-    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
-    {
-        H << sp;
-        H << nl << "iterator findBy" << capitalizedMembers[i]
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << ", bool = true);";
-        H << nl << "const_iterator findBy" << capitalizedMembers[i]
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << ", bool = true) const;";
-
-        H << nl << "iterator beginFor" << capitalizedMembers[i] << "();";
-        H << nl << "const_iterator beginFor" << capitalizedMembers[i] << "() const;";
-
-        H << nl << "iterator endFor" << capitalizedMembers[i] << "();";
-        H << nl << "const_iterator endFor" << capitalizedMembers[i] << "() const;";
-
-        H << nl << "iterator lowerBoundFor" << capitalizedMembers[i]
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << ");";
-        H << nl << "const_iterator lowerBoundFor" << capitalizedMembers[i]
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << ") const;";
-
-        H << nl << "iterator upperBoundFor" << capitalizedMembers[i]
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << ");";
-        H << nl << "const_iterator upperBoundFor" << capitalizedMembers[i]
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << ") const;";
-
-        H << nl << "std::pair<iterator, iterator> equalRangeFor"
-          << capitalizedMembers[i] << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData)
-          << ");";
-
-        H << nl << "std::pair<const_iterator, const_iterator> equalRangeFor"
-          << capitalizedMembers[i] << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData)
-          << ") const;";
-
-        string countFunction = dict.indices[i].member.empty() ? string("valueCount")
-            : dict.indices[i].member + "Count";
-
-        H << nl << "int " << countFunction
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << ") const;";
-
-    }
-
-    H << eb << ';';
-}
-
-void
-writeDictC(const string& name, const string& absolute, const Dict& dict, const vector<IndexType> indexTypes,
-           const TypePtr& keyType, const StringList& keyMetaData, const TypePtr& valueType,
-           const StringList& valueMetaData, Output& C)
-{
-    const string keyTypeS = typeToString(keyType, keyMetaData);
-    const string valueTypeS = typeToString(valueType, valueMetaData);
-    const string compare = getCompare(dict, keyTypeS);
-    const string keyCodec = string("::Freeze::MapKeyCodec< ") + keyTypeS + " >";
-    const string valueCodec =
-        string(valueType->usesClasses() ? "::Freeze::MapObjectValueCodec" : "::Freeze::MapValueCodec") +
-        "< " + valueTypeS + " >";
-
-    const string templateParams = string("< ") + keyTypeS + ", " + valueTypeS + ", " + keyCodec + ", " + valueCodec +
-        ", " + compare + " >";
-
-    const string keyCompareParams = string("< ") + keyTypeS + ", " + keyCodec + ", " + compare + " >";
-
-    vector<string> capitalizedMembers;
-
-    for(size_t i = 0; i < dict.indices.size(); ++i)
-    {
-        const string& member = dict.indices[i].member;
-        if(!member.empty())
-        {
-            string capitalizedMember = member;
-            capitalizedMember[0] = toupper(static_cast<unsigned char>(capitalizedMember[0]));
-            capitalizedMembers.push_back(capitalizedMember);
-        }
-        else
-        {
-            capitalizedMembers.push_back("Value");
-        }
-    }
-
-    //
-    // Nested index classes
-    //
-    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
-    {
-        string className = capitalizedMembers[i] + "Index";
-
-        string indexCompare = getCompare(dict.indices[i], typeToString(indexTypes[i].type, indexTypes[i].metaData));
-
-        string indexCompareParams = string("< ") + typeToString(indexTypes[i].type, indexTypes[i].metaData) + ", "
-            + className + ", " + indexCompare + " >";
-
-        C << sp << nl << absolute << "::" << className << "::" << className
-          << "(const std::string& __name, "
-          << "const " << indexCompare << "& __compare)";
-
-        C.inc();
-        C << nl << ": Freeze::MapIndex" << indexCompareParams << "(__name, __compare)";
-        C.dec();
-        C << sb;
-        C << eb;
-
-        C << sp << nl << "void"
-          << nl << absolute << "::" << className << "::"
-          << "marshalKey(const Freeze::Value& __v, Freeze::Key& __k) const";
-        C << sb;
-
-        bool optimize = false;
-
-        if(dict.indices[i].member.empty() && dict.indices[i].caseSensitive)
-        {
-            optimize = true;
-            C << nl << "__k = __v;";
-        }
-        else
-        {
-            //
-            // Can't optimize
-            //
-            C << nl << valueTypeS << " __x;";
-            C << nl << valueCodec << "::read(__x, __v, _communicator, _encoding);";
-            string param = "__x";
-
-            if(!dict.indices[i].member.empty())
-            {
-                if(ClassDeclPtr::dynamicCast(valueType) != 0)
-                {
-                    param += "->" + dict.indices[i].member;
-                }
-                else
-                {
-                    param += "." + dict.indices[i].member;
-                }
-            }
-            C << nl << "write(" << param << ", __k, _communicator, _encoding);";
-        }
-        C << eb;
-
-        C << sp << nl << "void"
-          << nl << absolute << "::" << className << "::"
-          << "write(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData)
-          << " __index, Freeze::Key& __bytes, const Ice::CommunicatorPtr& __communicator, "
-          << "const Ice::EncodingVersion& __encoding)";
-        C << sb;
-
-        if(optimize)
-        {
-            C << nl << valueCodec << "::write(__index, __bytes, __communicator, __encoding);";
-        }
-        else
-        {
-            assert(!indexTypes[i].type->usesClasses());
-
-            C << nl << "IceInternal::InstancePtr __instance = IceInternal::getInstance(__communicator);";
-            C << nl << "IceInternal::BasicStream __stream(__instance.get(), __encoding);";
-
-            string valueS;
-            if(dict.indices[i].caseSensitive)
-            {
-                valueS = "__index";
-            }
-            else
-            {
-                C << nl << typeToString(indexTypes[i].type, indexTypes[i].metaData)
-                  << " __lowerCaseIndex = IceUtilInternal::toLower(__index);";
-                valueS = "__lowerCaseIndex";
-            }
-
-            writeMarshalUnmarshalCode(C, indexTypes[i].type, false, 0, valueS, true, indexTypes[i].metaData, 0,
-                                      "__stream", false);
-            C << nl << "::std::vector<Ice::Byte>(__stream.b.begin(), __stream.b.end()).swap(__bytes);";
-        }
-        C << eb;
-
-        C << sp << nl << "void"
-          << nl << absolute << "::" << className << "::"
-          << "read(" << typeToString(indexTypes[i].type, indexTypes[i].metaData)
-          << "& __index, const Freeze::Key& __bytes, const Ice::CommunicatorPtr& __communicator, "
-          << "const Ice::EncodingVersion& __encoding)";
-        C << sb;
-
-        if(optimize)
-        {
-            C << nl << valueCodec << "::read(__index, __bytes, __communicator, __encoding);";
-        }
-        else
-        {
-            C << nl << "IceInternal::InstancePtr __instance = IceInternal::getInstance(__communicator);";
-            C << nl << "IceInternal::BasicStream __stream(__instance.get(), __encoding, ";
-            C << "&__bytes[0], &__bytes[0] + __bytes.size());";
-
-            writeMarshalUnmarshalCode(C, indexTypes[i].type, false, 0, "__index", false, indexTypes[i].metaData, 0,
-                                      "__stream", false);
-        }
-        C << eb;
-    }
-
-    //
-    // Constructor
-    //
-    C << sp << nl << absolute << "::" << name
-      << "(const Freeze::ConnectionPtr& __connection, const std::string& __dbName ,"
-      << "bool __createDb, const " << compare << "& __compare)";
-    if(capitalizedMembers.empty())
-    {
-        C.inc();
-        C << nl << ": Freeze::Map" << templateParams
-          <<"(__connection, __dbName, keyTypeId(), valueTypeId(), __createDb, __compare)";
-        C.dec();
-        C << sb;
-        C << eb;
-    }
-    else
-    {
-        C.inc();
-        C << nl << ": Freeze::Map" << templateParams <<"(__connection->getCommunicator(), __connection->getEncoding())";
-        C.dec();
-        C << sb;
-        C << nl << "Freeze::KeyCompareBasePtr __keyCompare = "
-          << "new Freeze::KeyCompare" << keyCompareParams << "(__compare, _communicator, _encoding);";
-        C << nl << "std::vector<Freeze::MapIndexBasePtr> __indices;";
-        for(size_t i = 0; i < capitalizedMembers.size(); ++i)
-        {
-            string indexName = dict.indices[i].member;
-            if(indexName.empty())
-            {
-                indexName = "index";
-            }
-            indexName = string("\"") + indexName + "\"";
-
-            C << nl << "__indices.push_back(new " << capitalizedMembers[i] << "Index(" << indexName << "));";
-        }
-        C << nl << "_helper.reset(Freeze::MapHelper::create(__connection, __dbName, keyTypeId(), valueTypeId(), "
-          << "__keyCompare, __indices, __createDb));";
-        C << eb;
-
-        //
-        // Recreate
-        //
-        C << sp << nl << "void"
-          << nl << absolute
-          << "::recreate(const Freeze::ConnectionPtr& __connection, const std::string& __dbName ,"
-          << " const " << compare << "& __compare)";
-        C << sb;
-        C << nl << "Freeze::KeyCompareBasePtr __keyCompare = "
-          << "new Freeze::KeyCompare" << keyCompareParams << "(__compare, __connection->getCommunicator()"
-          <<", __connection->getEncoding());";
-        C << nl << "std::vector<Freeze::MapIndexBasePtr> __indices;";
-        for(size_t i = 0; i < capitalizedMembers.size(); ++i)
-        {
-            string indexName = dict.indices[i].member;
-            if(indexName.empty())
-            {
-                indexName = "index";
-            }
-            indexName = string("\"") + indexName + "\"";
-
-            C << nl << "__indices.push_back(new " << capitalizedMembers[i] << "Index(" << indexName << "));";
-        }
-        C << nl << "Freeze::MapHelper::recreate(__connection, __dbName, keyTypeId(), valueTypeId(), __keyCompare, "
-          << "__indices);";
-        C << eb;
-    }
-
-    C << sp << nl << "std::string"
-      << nl << absolute << "::keyTypeId()";
-    C << sb;
-    C << nl << "return \"" << getTypeId(keyType, keyMetaData) << "\";";
-    C << eb;
-    C << sp << nl << "std::string"
-      << nl << absolute << "::valueTypeId()";
-    C << sb;
-    C << nl << "return \"" << getTypeId(valueType, valueMetaData) << "\";";
-    C << eb;
-
-    //
-    // Find and count functions
-    //
-    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
-    {
-        string indexClassName = capitalizedMembers[i] + "Index";
-
-        string indexName = dict.indices[i].member;
-        if(indexName.empty())
-        {
-            indexName = "index";
-        }
-        indexName = string("\"") + indexName + "\"";
-
-        C << sp << nl << absolute << "::iterator"
-          << nl << absolute << "::" << "findBy" << capitalizedMembers[i]
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData)
-          << " __index, bool __onlyDups)";
-        C << sb;
-        C << nl << "Freeze::Key __bytes;";
-        C << nl << indexClassName << "::" << "write(__index, __bytes, _communicator, _encoding);";
-        C << nl << "return iterator(_helper->index(" << indexName
-          << ")->untypedFind(__bytes, false, __onlyDups), _communicator, _encoding);";
-        C << eb;
-
-        C << sp << nl << absolute << "::const_iterator"
-          << nl << absolute << "::" << "findBy" << capitalizedMembers[i]
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData)
-          << " __index, bool __onlyDups) const";
-        C << sb;
-        C << nl << "Freeze::Key __bytes;";
-        C << nl << indexClassName << "::" << "write(__index, __bytes, _communicator, _encoding);";
-        C << nl << "return const_iterator(_helper->index(" << indexName
-          << ")->untypedFind(__bytes, true, __onlyDups), _communicator, _encoding);";
-        C << eb;
-
-        C << sp << nl << absolute << "::iterator"
-          << nl << absolute << "::" << "beginFor" << capitalizedMembers[i] << "()";
-        C << sb;
-        C << nl << "return iterator(_helper->index(" << indexName << ")->begin(false), _communicator, _encoding);";
-        C << eb;
-
-        C << sp << nl << absolute << "::const_iterator"
-          << nl << absolute << "::" << "beginFor" << capitalizedMembers[i] << "() const";
-        C << sb;
-        C << nl << "return const_iterator(_helper->index(" << indexName << ")->begin(true), _communicator, _encoding);";
-        C << eb;
-
-        C << sp << nl << absolute << "::iterator"
-          << nl << absolute << "::" << "endFor" << capitalizedMembers[i] << "()";
-        C << sb;
-        C << nl << "return iterator();";
-        C << eb;
-
-        C << sp << nl << absolute << "::const_iterator"
-          << nl << absolute << "::" << "endFor" << capitalizedMembers[i] << "() const";
-        C << sb;
-        C << nl << "return const_iterator();";
-        C << eb;
-
-        C << sp << nl << absolute << "::iterator"
-          << nl << absolute << "::" << "lowerBoundFor" << capitalizedMembers[i]
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << " __index)";
-        C << sb;
-        C << nl << "Freeze::Key __bytes;";
-        C << nl << indexClassName << "::" << "write(__index, __bytes, _communicator, _encoding);";
-        C << nl << "return iterator(_helper->index(" << indexName
-          << ")->untypedLowerBound(__bytes, false), _communicator, _encoding);";
-        C << eb;
-
-        C << sp << nl << absolute << "::const_iterator"
-          << nl << absolute << "::" << "lowerBoundFor" << capitalizedMembers[i]
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << " __index) const";
-        C << sb;
-        C << nl << "Freeze::Key __bytes;";
-        C << nl << indexClassName << "::" << "write(__index, __bytes, _communicator, _encoding);";
-        C << nl << "return const_iterator(_helper->index(" << indexName
-          << ")->untypedLowerBound(__bytes, true), _communicator, _encoding);";
-        C << eb;
-
-        C << sp << nl << absolute << "::iterator"
-          << nl << absolute << "::" << "upperBoundFor" << capitalizedMembers[i]
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << " __index)";
-        C << sb;
-        C << nl << "Freeze::Key __bytes;";
-        C << nl << indexClassName << "::" << "write(__index, __bytes, _communicator, _encoding);";
-        C << nl << "return iterator(_helper->index(" << indexName
-          << ")->untypedUpperBound(__bytes, false), _communicator, _encoding);";
-        C << eb;
-
-        C << sp << nl << absolute << "::const_iterator"
-          << nl << absolute << "::" << "upperBoundFor" << capitalizedMembers[i]
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << " __index) const";
-        C << sb;
-        C << nl << "Freeze::Key __bytes;";
-        C << nl << indexClassName << "::" << "write(__index, __bytes, _communicator, _encoding);";
-        C << nl << "return const_iterator(_helper->index(" << indexName
-          << ")->untypedUpperBound(__bytes, true), _communicator, _encoding);";
-        C << eb;
-
-        C << sp << nl << "std::pair<" << absolute << "::iterator, "
-          << absolute << "::iterator>"
-          << nl << absolute << "::" << "equalRangeFor" << capitalizedMembers[i]
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << " __index)";
-        C << sb;
-        C << nl << "return std::make_pair(lowerBoundFor" << capitalizedMembers[i]
-          << "(__index), upperBoundFor" << capitalizedMembers[i] << "(__index));";
-        C << eb;
-
-        C << sp << nl << "std::pair<" << absolute << "::const_iterator, "
-          << absolute << "::const_iterator>"
-          << nl << absolute << "::" << "equalRangeFor" << capitalizedMembers[i]
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << " __index) const";
-        C << sb;
-        C << nl << "return std::make_pair(lowerBoundFor" << capitalizedMembers[i]
-          << "(__index), upperBoundFor" << capitalizedMembers[i] << "(__index));";
-        C << eb;
-
-        string countFunction = dict.indices[i].member.empty() ? string("valueCount")
-            : dict.indices[i].member + "Count";
-
-        C << sp << nl << "int"
-          << nl << absolute << "::" << countFunction
-          << "(" << inputTypeToString(indexTypes[i].type, false, indexTypes[i].metaData) << " __index) const";
-        C << sb;
-        C << nl << "Freeze::Key __bytes;";
-        C << nl << indexClassName << "::" << "write(__index, __bytes, _communicator, _encoding);";
-        C << nl << "return _helper->index(" << indexName
-          << ")->untypedCount(__bytes);";
-        C << eb;
-    }
-}
-
-void
-writeDict(const string& n, const UnitPtr& u, const Dict& dict, Output& H, Output& C, const string& dllExport)
-{
-    string absolute = dict.name;
-    if(absolute.find("::") == 0)
-    {
-        absolute.erase(0, 2);
-    }
-    string name = absolute;
-    vector<string> scope;
-    string::size_type pos;
-    while((pos = name.find("::")) != string::npos)
-    {
-        string s = name.substr(0, pos);
-        name.erase(0, pos + 2);
-
-        checkIdentifier(absolute, s);
-
-        scope.push_back(s);
-    }
-
-    checkIdentifier(absolute, name);
-
-    TypeList keyTypes = u->lookupType(dict.key, false);
-    if(keyTypes.empty())
-    {
-        ostringstream os;
-        os << "`" << dict.key << "' is not a valid type";
-        throw os.str();
-    }
-    TypePtr keyType = keyTypes.front();
-
-    TypeList valueTypes = u->lookupType(dict.value, false);
-    if(valueTypes.empty())
-    {
-        ostringstream os;
-        os << "`" << dict.value << "' is not a valid type";
-        throw os.str();
-    }
-    TypePtr valueType = valueTypes.front();
-
-    for(vector<string>::const_iterator q = scope.begin(); q != scope.end(); ++q)
-    {
-        H << sp;
-        H << nl << "namespace " << *q << nl << '{';
-    }
-
-    vector<IndexType> indexTypes;
-
-    for(vector<DictIndex>::const_iterator p = dict.indices.begin(); p != dict.indices.end(); ++p)
-    {
-        const DictIndex& index = *p;
-        if(index.member.empty())
-        {
-            if(dict.indices.size() > 1)
-            {
-                ostringstream os;
-                os << "bad index for dictionary `" << dict.name << "'";
-                throw os.str();
-            }
-
-            bool containsSequence = false;
-            if(!Dictionary::legalKeyType(valueType, containsSequence))
-            {
-                ostringstream os;
-                os << "`" << dict.value << "' is not a valid index type";
-                throw os.str();
-            }
-            if(containsSequence)
-            {
-                getErrorStream() << n << ": warning: use of sequences in dictionary keys has been deprecated";
-            }
-
-            if(index.caseSensitive == false)
-            {
-                //
-                // Let's check value is a string
-                //
-
-                BuiltinPtr builtInType = BuiltinPtr::dynamicCast(valueType);
-
-                if(builtInType == 0 || builtInType->kind() != Builtin::KindString)
-                {
-                    ostringstream os;
-                    os << "VALUE is a `" << dict.value << "', not a string";
-                    throw os.str();
-                }
-            }
-            IndexType iType;
-            iType.type = valueType;
-            iType.metaData = dict.valueMetaData;
-            indexTypes.push_back(iType);
-        }
-        else
-        {
-            DataMemberPtr dataMember = 0;
-            DataMemberList dataMembers;
-
-            ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(valueType);
-            if(classDecl != 0)
-            {
-                dataMembers = classDecl->definition()->allDataMembers();
-            }
-            else
-            {
-                StructPtr structDecl = StructPtr::dynamicCast(valueType);
-                if(structDecl == 0)
-                {
-                    ostringstream os;
-                    os << "`" << dict.value << "' is neither a class nor a struct.";
-                    throw os.str();
-                }
-                dataMembers = structDecl->dataMembers();
-            }
-            DataMemberList::const_iterator d = dataMembers.begin();
-            while(d != dataMembers.end() && dataMember == 0)
-            {
-                if((*d)->name() == index.member)
-                {
-                    dataMember = *d;
-                }
-                else
-                {
-                    ++d;
-                }
-            }
-
-            if(dataMember == 0)
-            {
-                ostringstream os;
-                os << "The value of `" << dict.name
-                   << "' has no data member named `" << index.member << "'";
-                throw os.str();
-            }
-
-            TypePtr dataMemberType = dataMember->type();
-
-            bool containsSequence = false;
-            if(!Dictionary::legalKeyType(dataMemberType, containsSequence))
-            {
-                ostringstream os;
-                os << "`" << index.member << "' cannot be used as an index";
-                throw os.str();
-            }
-            if(containsSequence)
-            {
-                getErrorStream() << n << ": warning: use of sequences in dictionary keys has been deprecated";
-            }
-
-            if(index.caseSensitive == false)
-            {
-                //
-                // Let's check member is a string
-                //
-                BuiltinPtr memberType = BuiltinPtr::dynamicCast(dataMemberType);
-                if(memberType == 0 || memberType->kind() != Builtin::KindString)
-                {
-                    ostringstream os;
-                    os << "`" << index.member << "' is not a string ";
-                    throw os.str();
-                }
-            }
-            IndexType iType;
-            iType.type = dataMemberType;
-            iType.metaData = dataMember->getMetaData();
-            indexTypes.push_back(iType);
-        }
-    }
-
-    writeDictH(name, dict, indexTypes, keyType, dict.keyMetaData, valueType, dict.valueMetaData, H, dllExport);
-
-    for(vector<string>::const_iterator q = scope.begin(); q != scope.end(); ++q)
-    {
-        H << sp;
-        H << nl << '}';
-    }
-
-    writeDictC(name, absolute, dict, indexTypes, keyType, dict.keyMetaData, valueType, dict.valueMetaData, C);
-}
-
-void
-writeIndexH(const string& memberTypeString, const string& name, Output& H, const string& dllExport)
-{
-    H << sp << nl << "class " << dllExport << name
-      << " : public Freeze::Index";
-    H << sb;
-    H.dec();
-    H << sp << nl << "public:";
-    H << sp;
-    H.inc();
-
-    H << nl << name << "(const std::string&, const std::string& = \"\");";
-    H << sp << nl << "std::vector<Ice::Identity>";
-    H << nl << "findFirst(" << memberTypeString << ", Ice::Int) const;";
-
-    H << sp << nl << "std::vector<Ice::Identity>";
-    H << nl << "find(" << memberTypeString << ") const;";
-
-    H << sp << nl << "Ice::Int";
-    H << nl << "count(" << memberTypeString << ") const;";
-    H.dec();
-    H << sp << nl << "private:";
-    H << sp;
-    H.inc();
-
-    H << nl << "virtual bool";
-    H << nl << "marshalKey(const Ice::ObjectPtr&, Freeze::Key&) const;";
-
-    H << sp << nl << "void";
-    H << nl << "marshalKey(" << memberTypeString << ", Freeze::Key&) const;";
-
-    H << eb << ';';
-    H << sp;
-    H << nl << "typedef IceUtil::Handle<" << name << "> " << name << "Ptr;";
-}
-
-void
-writeIndexC(const TypePtr& type, const TypePtr& memberType, const string& memberName,
-            bool caseSensitive, const string& fullName, const string& name, Output& C)
-{
-    string inputType = inputTypeToString(memberType, false);
-
-    C << sp << nl << fullName << "::" << name
-      << "(const ::std::string& __name, const ::std::string& __facet)";
-    C.inc();
-    C << nl << ": Freeze::Index(__name, __facet)";
-    C.dec();
-    C << sb;
-    C << eb;
-
-    C << sp << nl << "std::vector<Ice::Identity>";
-    C << nl << fullName << "::" << "findFirst(" << inputType << " __index, ::Ice::Int __firstN) const";
-    C << sb;
-    C << nl << "Freeze::Key __bytes;";
-    C << nl << "marshalKey(__index, __bytes);";
-    C << nl << "return untypedFindFirst(__bytes, __firstN);";
-    C << eb;
-
-    C << sp << nl << "std::vector<Ice::Identity>";
-    C << nl << fullName << "::" << "find(" << inputType << " __index) const";
-    C << sb;
-    C << nl << "Freeze::Key __bytes;";
-    C << nl << "marshalKey(__index, __bytes);";
-    C << nl << "return untypedFind(__bytes);";
-    C << eb;
-
-    C << sp << nl << "Ice::Int";
-    C << nl << fullName << "::" << "count(" << inputType << " __index) const";
-    C << sb;
-    C << nl << "Freeze::Key __bytes;";
-    C << nl << "marshalKey(__index, __bytes);";
-    C << nl << "return untypedCount(__bytes);";
-    C << eb;
-
-    string typeString = typeToString(type);
-
-    C << sp << nl << "bool";
-    C << nl << fullName << "::" << "marshalKey(const Ice::ObjectPtr& __servant, Freeze::Key& __bytes) const";
-    C << sb;
-    C << nl << typeString << " __s = " << typeString << "::dynamicCast(__servant);";
-    C << nl << "if(__s != 0)";
-    C << sb;
-    C << nl << "marshalKey(__s->" << memberName << ", __bytes);";
-    C << nl << "return true;";
-    C << eb;
-    C << nl << "else";
-    C << sb;
-    C << nl << "return false;";
-    C << eb;
-    C << eb;
-
-    C << sp << nl << "void";
-    C << nl << fullName << "::" << "marshalKey(" << inputType << " __index, Freeze::Key& __bytes) const";
-    C << sb;
-    C << nl << "IceInternal::InstancePtr __instance = IceInternal::getInstance(_communicator);";
-    C << nl << "IceInternal::BasicStream __stream(__instance.get(), _encoding);";
-
-    string valueS;
-    if(caseSensitive)
-    {
-        valueS = "__index";
-    }
-    else
-    {
-        C << nl << typeToString(memberType) << " __lowerCaseIndex = IceUtilInternal::toLower(__index);";
-        valueS = "__lowerCaseIndex";
-    }
-
-    writeMarshalUnmarshalCode(C, memberType, false, 0, valueS, true, StringList(), 0, "__stream", false);
-    if(memberType->usesClasses())
-    {
-        C << nl << "__stream.writePendingObjects();";
-    }
-    C << nl << "::std::vector<Ice::Byte>(__stream.b.begin(), __stream.b.end()).swap(__bytes);";
-    C << eb;
-}
-
-void
-writeIndex(const string& /*n*/, const UnitPtr& u, const Index& index, Output& H, Output& C, const string& dllExport)
-{
-    string absolute = index.name;
-    if(absolute.find("::") == 0)
-    {
-        absolute.erase(0, 2);
-    }
-    string name = absolute;
-    vector<string> scope;
-    string::size_type pos;
-    while((pos = name.find("::")) != string::npos)
-    {
-        string s = name.substr(0, pos);
-        name.erase(0, pos + 2);
-
-        checkIdentifier(absolute, s);
-
-        scope.push_back(s);
-    }
-
-    checkIdentifier(absolute, name);
-
-    TypeList types = u->lookupType(index.type, false);
-    if(types.empty())
-    {
-        ostringstream os;
-        os << "`" << index.type << "' is not a valid type";
-        throw os.str();
-    }
-    TypePtr type = types.front();
-
-    ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(type);
-    if(classDecl == 0)
-    {
-        ostringstream os;
-        os << "`" << index.type << "' is not a class";
-        throw os.str();
-    }
-
-    DataMemberList dataMembers = classDecl->definition()->allDataMembers();
-    DataMemberPtr dataMember = 0;
-    DataMemberList::const_iterator p = dataMembers.begin();
-    while(p != dataMembers.end() && dataMember == 0)
-    {
-        if((*p)->name() == index.member)
-        {
-            dataMember = *p;
-        }
-        else
-        {
-            ++p;
-        }
-    }
-
-    if(dataMember == 0)
-    {
-        ostringstream os;
-        os << "`" << index.type << "' has no data member named `" << index.member << "'";
-        throw os.str();
-    }
-
-    if(index.caseSensitive == false)
-    {
-        //
-        // Let's check member is a string
-        //
-        BuiltinPtr memberType = BuiltinPtr::dynamicCast(dataMember->type());
-        if(memberType == 0 || memberType->kind() != Builtin::KindString)
-        {
-            ostringstream os;
-            os << "`" << index.member << "'is not a string";
-            throw os.str();
-        }
-    }
-
-    for(vector<string>::const_iterator q = scope.begin(); q != scope.end(); ++q)
-    {
-        H << sp;
-        H << nl << "namespace " << *q << nl << '{';
-    }
-
-    writeIndexH(inputTypeToString(dataMember->type(), false), name, H, dllExport);
-
-    for(vector<string>::const_iterator q = scope.begin(); q != scope.end(); ++q)
-    {
-        H << sp;
-        H << nl << '}';
-    }
-
-    writeIndexC(type, dataMember->type(), index.member, index.caseSensitive, absolute, name, C);
-}
-
-void
-gen(const string& name, const UnitPtr& u, const vector<string>& includePaths, const vector<string>& extraHeaders,
-    const vector<Dict>& dicts, const vector<Index>& indices, const string& include, const string& headerExtension,
-    const string& sourceExtension, string dllExport, const StringList& includes, const vector<string>& args,
-    const string& output)
-{
-    string fileH = args[0];
-    fileH += "." + headerExtension;
-    string includeH = fileH;
-    string fileC = args[0];
-    fileC += "." + sourceExtension;
-
-    if(!output.empty())
-    {
-        fileH = output + '/' + fileH;
-        fileC = output + '/' + fileC;
-    }
-
-    u->mergeModules();
-    u->sort();
-
-    IceUtilInternal::Output H;
-    H.open(fileH.c_str());
-    if(!H)
-    {
-        ostringstream os;
-        os << "cannot open `" << fileH << "': " << strerror(errno);
-        throw FileException(__FILE__, __LINE__, os.str());
-    }
-
-    FileTracker::instance()->addFile(fileH);
-
-    printHeader(H);
-    printGeneratedHeader(H, string(args[0]) + ".ice");
-
-
-    printFreezeTypes(H, dicts, indices);
-
-    IceUtilInternal::Output CPP;
-    CPP.open(fileC.c_str());
-    if(!CPP)
-    {
-        ostringstream os;
-        os << "cannot open `" << fileC << "': " << strerror(errno);
-        throw FileException(__FILE__, __LINE__, os.str());
-    }
-    FileTracker::instance()->addFile(fileC);
-
-    printHeader(CPP);
-    printGeneratedHeader(CPP, string(args[0]) + ".ice");
-
-    printFreezeTypes(CPP, dicts, indices);
-
-    for(vector<string>::const_iterator i = extraHeaders.begin(); i != extraHeaders.end(); ++i)
-    {
-        string hdr = *i;
-        string guard;
-        string::size_type pos = hdr.rfind(',');
-        if(pos != string::npos)
-        {
-            hdr = i->substr(0, pos);
-            guard = i->substr(pos + 1);
-        }
-        if(!guard.empty())
-        {
-            CPP << "\n#ifndef " << guard;
-            CPP << "\n#define " << guard;
-        }
-        CPP << "\n#include <";
-        if(!include.empty())
-        {
-            CPP << include << '/';
-        }
-        CPP << hdr << '>';
-        if(!guard.empty())
-        {
-            CPP << "\n#endif";
-        }
-    }
-
-    string s = fileH;
-    transform(s.begin(), s.end(), s.begin(), ToIfdef());
-    H << "\n#ifndef __" << s << "__";
-    H << "\n#define __" << s << "__";
-    H << '\n';
-
-    H << "\n#include <IceUtil/PushDisableWarnings.h>";
-
-    if(dicts.size() > 0)
-    {
-        H << "\n#include <Freeze/Map.h>";
-    }
-
-    if(indices.size() > 0)
-    {
-        H << "\n#include <Freeze/Index.h>";
-    }
-
-    for(StringList::const_iterator p = includes.begin(); p != includes.end(); ++p)
-    {
-        H << "\n#include <" << changeInclude(*p, includePaths) << "." + headerExtension + ">";
-    }
-
-
-    CPP << "\n#include <IceUtil/PushDisableWarnings.h>";
-    CPP << "\n#include <Ice/BasicStream.h>";
-    CPP << "\n#include <IceUtil/StringUtil.h>";
-    CPP << "\n#include <IceUtil/PopDisableWarnings.h>";
-    CPP << "\n#include <";
-    if(include.size())
-    {
-        CPP << include << '/';
-    }
-    CPP << includeH << '>';
-
-    printVersionCheck(H);
-    printVersionCheck(CPP);
-
-    printDllExportStuff(H, dllExport);
-    if(dllExport.size())
-    {
-        dllExport += " ";
-    }
-
-    for(vector<Dict>::const_iterator p = dicts.begin(); p != dicts.end(); ++p)
-    {
-        writeDict(name, u, *p, H, CPP, dllExport);
-    }
-
-    for(vector<Index>::const_iterator q = indices.begin(); q != indices.end(); ++q)
-    {
-        writeIndex(name, u, *q, H, CPP, dllExport);
-    }
-
-    H << "\n\n#include <IceUtil/PopDisableWarnings.h>";
-    H << "\n#endif\n";
-    CPP << '\n';
-
-    H.close();
-    CPP.close();
-}
-
-int
-compile(int argc, char* argv[])
-{
-    IceUtilInternal::Options opts;
-    opts.addOpt("h", "help");
-    opts.addOpt("v", "version");
-    opts.addOpt("", "validate");
-    opts.addOpt("", "header-ext", IceUtilInternal::Options::NeedArg, "h");
-    opts.addOpt("", "source-ext", IceUtilInternal::Options::NeedArg, "cpp");
-    opts.addOpt("", "add-header", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("D", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("U", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("I", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("E");
-    opts.addOpt("", "include-dir", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "dll-export", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "dict", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("", "index", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("", "dict-index", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("", "output-dir", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "depend");
-    opts.addOpt("", "depend-xml");
-    opts.addOpt("", "depend-file", IceUtilInternal::Options::NeedArg, "");
-    opts.addOpt("d", "debug");
-    opts.addOpt("", "ice");
-    opts.addOpt("", "underscore");
-
-    bool validate = false;
-    for(int i = 0; i < argc; ++i)
-    {
-        if(string(argv[i]) == "--validate")
-        {
-            validate = true;
-            break;
-        }
-    }
-
-    vector<string> args;
-    try
-    {
-        args = opts.parse(argc, const_cast<const char**>(argv));
-    }
-    catch(const IceUtilInternal::BadOptException& e)
-    {
-        getErrorStream() << argv[0] << ": error: " << e.reason << endl;
-        if(!validate)
-        {
-            usage(argv[0]);
-        }
-        return EXIT_FAILURE;
-    }
-
-    if(opts.isSet("help"))
-    {
-        usage(argv[0]);
-        return EXIT_SUCCESS;
-    }
-
-    if(opts.isSet("version"))
-    {
-        getErrorStream() << ICE_STRING_VERSION << endl;
-        return EXIT_SUCCESS;
-    }
-
-    string headerExtension = opts.optArg("header-ext");
-    string sourceExtension = opts.optArg("source-ext");
-
-    vector<string> cppArgs;
-    vector<string> extraHeaders = opts.argVec("add-header");
-    vector<string> optargs = opts.argVec("D");
-
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-    {
-        cppArgs.push_back("-D" + *i);
-    }
-
-    optargs = opts.argVec("U");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-    {
-        cppArgs.push_back("-U" + *i);
-    }
-
-    vector<string> includePaths = opts.argVec("I");
-    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
-    {
-        cppArgs.push_back("-I" + Preprocessor::normalizeIncludePath(*i));
-    }
-
-    // Convert include paths to full paths.
-    for(vector<string>::iterator p = includePaths.begin(); p != includePaths.end(); ++p)
-    {
-        *p = fullPath(*p);
-    }
-
-    bool preprocess= opts.isSet("E");
-
-    string include = opts.optArg("include-dir");
-
-    string dllExport = opts.optArg("dll-export");
-
-    vector<Dict> dicts;
-    optargs = opts.argVec("dict");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-    {
-        string s = IceUtilInternal::removeWhitespace(*i);
-
-        Dict dict;
-
-        string::size_type pos;
-        pos = s.find(',');
-        if(pos != string::npos)
-        {
-            dict.name = s.substr(0, pos);
-            s.erase(0, pos + 1);
-        }
-        pos = s.find(',');
-        if(pos != string::npos)
-        {
-            if(s.find("[\"") == 0)
-            {
-                string::size_type end = s.find("\"]");
-                if(end != string::npos && end < pos)
-                {
-                    dict.key = s.substr(end + 2, pos - end - 2);
-                    dict.keyMetaData.push_back(s.substr(2, end - 2));
-                }
-                else
-                {
-                    dict.key = s.substr(0, pos);
-                }
-            }
-            else
-            {
-                dict.key = s.substr(0, pos);
-            }
-            s.erase(0, pos + 1);
-        }
-        pos = s.find(',');
-        if(pos == string::npos)
-        {
-            if(s.find("[\"") == 0)
-            {
-                string::size_type end = s.find("\"]");
-                if(end != string::npos)
-                {
-                    dict.value = s.substr(end + 2);
-                    dict.valueMetaData.push_back(s.substr(2, end - 2));
-                }
-                else
-                {
-                    dict.value = s;
-                }
-            }
-            else
-            {
-                dict.value = s;
-            }
-            dict.sort = false;
-        }
-        else
-        {
-            if(s.find("[\"") == 0)
-            {
-                string::size_type end = s.find("\"]");
-                if(end != string::npos && end < pos)
-                {
-                    dict.value = s.substr(end + 2, pos - end - 2);
-                    dict.valueMetaData.push_back(s.substr(2, end - 2));
-                }
-                else
-                {
-                    dict.value = s.substr(0, pos);
-                }
-            }
-            else
-            {
-                dict.value = s.substr(0, pos);
-            }
-            s.erase(0, pos + 1);
-
-            pos = s.find(',');
-            if(pos == string::npos)
-            {
-                if(s != "sort")
-                {
-                    getErrorStream() << argv[0] << ": error: " << *i << ": nothing or ',sort' expected after value-type"
-                                     << endl;
-                    if(!validate)
-                    {
-                        usage(argv[0]);
-                    }
-                    return EXIT_FAILURE;
-                }
-                dict.sort = true;
-            }
-            else
-            {
-                string sort = s.substr(0, pos);
-                s.erase(0, pos + 1);
-                if(sort != "sort")
-                {
-                    getErrorStream() << argv[0] << ": error: " << *i << ": nothing or ',sort' expected after value-type"
-                                     << endl;
-                    if(!validate)
-                    {
-                        usage(argv[0]);
-                    }
-                    return EXIT_FAILURE;
-                }
-                dict.sort = true;
-                dict.userCompare = s;
-            }
-        }
-
-        if(dict.name.empty())
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": no name specified" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-
-        if(dict.key.empty())
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": no key specified" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-
-        if(dict.value.empty())
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": no value specified" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-
-        dicts.push_back(dict);
-    }
-
-    vector<Index> indices;
-    optargs = opts.argVec("index");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-    {
-        string s = IceUtilInternal::removeWhitespace(*i);
-
-        Index index;
-
-        string::size_type pos;
-        pos = s.find(',');
-        if(pos != string::npos)
-        {
-            index.name = s.substr(0, pos);
-            s.erase(0, pos + 1);
-        }
-        pos = s.find(',');
-        if(pos != string::npos)
-        {
-            index.type = s.substr(0, pos);
-            s.erase(0, pos + 1);
-        }
-        pos = s.find(',');
-        string caseString;
-        if(pos != string::npos)
-        {
-            index.member = s.substr(0, pos);
-            s.erase(0, pos + 1);
-            caseString = s;
-        }
-        else
-        {
-            index.member = s;
-            caseString = "case-sensitive";
-        }
-
-        if(index.name.empty())
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": no name specified" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-
-        if(index.type.empty())
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": no type specified" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-
-        if(index.member.empty())
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": no member specified" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-
-        if(caseString != "case-sensitive" && caseString != "case-insensitive")
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": the case can be `case-sensitive' or "
-                             << "`case-insensitive'" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-        index.caseSensitive = (caseString == "case-sensitive");
-
-        indices.push_back(index);
-    }
-
-    optargs = opts.argVec("dict-index");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-    {
-        string s = IceUtilInternal::removeWhitespace(*i);
-
-        string dictName;
-        DictIndex index;
-        index.sort = false;
-        index.caseSensitive = true;
-
-        string::size_type pos = s.find(',');
-        if(pos == string::npos)
-        {
-            dictName = s;
-        }
-        else
-        {
-            dictName = s.substr(0, pos);
-            s.erase(0, pos + 1);
-
-            bool done = false;
-            while(!done)
-            {
-                pos = s.find(',');
-                if(pos == string::npos)
-                {
-                    if(s == "sort")
-                    {
-                        index.sort = true;
-                    }
-                    else if(s == "case-sensitive")
-                    {
-                        index.caseSensitive = true;
-                    }
-                    else if(s == "case-insensitive")
-                    {
-                        index.caseSensitive = false;
-                    }
-                    else if(index.member.empty())
-                    {
-                        if(s == "\\sort")
-                        {
-                            index.member = "sort";
-                        }
-                        else
-                        {
-                            index.member = s;
-                        }
-                    }
-                    else
-                    {
-                        getErrorStream() << argv[0] << ": error: " << *i << ": syntax error" << endl;
-                        if(!validate)
-                        {
-                            usage(argv[0]);
-                        }
-                        return EXIT_FAILURE;
-                    }
-                    done = true;
-                }
-                else
-                {
-                    string subs = s.substr(0, pos);
-                    s.erase(0, pos + 1);
-
-                    if(subs == "sort")
-                    {
-                        index.sort = true;
-                        index.userCompare = s;
-                        done = true;
-                    }
-                    else if(subs == "case-sensitive")
-                    {
-                        index.caseSensitive = true;
-                    }
-                    else if(subs == "case-insensitive")
-                    {
-                        index.caseSensitive = false;
-                    }
-                    else if(index.member.empty())
-                    {
-                        if(subs == "\\sort")
-                        {
-                            index.member = "sort";
-                        }
-                        else
-                        {
-                            index.member = subs;
-                        }
-                    }
-                    else
-                    {
-                        getErrorStream() << argv[0] << ": error: " << *i << ": syntax error" << endl;
-                        if(!validate)
-                        {
-                            usage(argv[0]);
-                        }
-                        return EXIT_FAILURE;
-                    }
-                }
-            }
-        }
-
-        if(dictName.empty())
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": no dictionary specified" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-
-        bool found = false;
-        for(vector<Dict>::iterator p = dicts.begin(); p != dicts.end(); ++p)
-        {
-            if(p->name == dictName)
-            {
-                if(find(p->indices.begin(), p->indices.end(), index) != p->indices.end())
-                {
-                    getErrorStream() << argv[0] << ": error: --dict-index " << *i
-                         << ": this dict-index is defined twice" << endl;
-                    return EXIT_FAILURE;
-                }
-                p->indices.push_back(index);
-                found = true;
-                break;
-            }
-        }
-        if(!found)
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": unknown dictionary" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-    }
-
-    string output = opts.optArg("output-dir");
-
-    bool depend = opts.isSet("depend");
-    bool dependxml = opts.isSet("depend-xml");
-
-    string dependFile = opts.optArg("depend-file");
-
-    bool debug = opts.isSet("debug");
-
-    bool ice = opts.isSet("ice");
-
-    bool underscore = opts.isSet("underscore");
-
-    if(dicts.empty() && indices.empty() && !(depend || dependxml))
-    {
-        getErrorStream() << argv[0] << ": error: no Freeze types specified" << endl;
-        if(!validate)
-        {
-            usage(argv[0]);
-        }
-        return EXIT_FAILURE;
-    }
-
-    if(args.empty())
-    {
-        getErrorStream() << argv[0] << ": error: no file name base specified" << endl;
-        if(!validate)
-        {
-            usage(argv[0]);
-        }
-        return EXIT_FAILURE;
-    }
-
-    if(depend && dependxml)
-    {
-        getErrorStream() << argv[0] << ": error: cannot specify both --depend and --depend-xml" << endl;
-        if(!validate)
-        {
-            usage(argv[0]);
-        }
-        return EXIT_FAILURE;
-    }
-
-    if(validate)
-    {
-        return EXIT_SUCCESS;
-    }
-
-    UnitPtr u = Unit::createUnit(true, false, ice, underscore);
-
-    StringList includes;
-
-    int status = EXIT_SUCCESS;
-
-    IceUtil::CtrlCHandler ctrlCHandler;
-    ctrlCHandler.setCallback(interruptedCallback);
-
-    DependOutputUtil out(dependFile);
-    if(dependxml)
-    {
-        out.os() << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<dependencies>" << endl;
-    }
-
-    for(vector<string>::size_type idx = 1; idx < args.size(); ++idx)
-    {
-        if(depend || dependxml)
-        {
-            PreprocessorPtr icecpp = Preprocessor::create(argv[0], args[idx], cppArgs);
-            FILE* cppHandle = icecpp->preprocess(false, "-D__SLICE2FREEZE__");
-
-            if(cppHandle == 0)
-            {
-                out.cleanup();
-                u->destroy();
-                return EXIT_FAILURE;
-            }
-
-            status = u->parse(args[idx], cppHandle, debug);
-
-            if(status == EXIT_FAILURE)
-            {
-                out.cleanup();
-                u->destroy();
-                return EXIT_FAILURE;
-            }
-
-            if(!icecpp->printMakefileDependencies(out.os(), depend ? Preprocessor::CPlusPlus : Preprocessor::SliceXML, includePaths,
-                                                  "-D__SLICE2FREEZE__",  sourceExtension, headerExtension))
-            {
-                out.cleanup();
-                u->destroy();
-                return EXIT_FAILURE;
-            }
-
-            if(!icecpp->close())
-            {
-                out.cleanup();
-                u->destroy();
-                return EXIT_FAILURE;
-            }
-        }
-        else
-        {
-            PreprocessorPtr icecpp = Preprocessor::create(argv[0], args[idx], cppArgs);
-
-            //
-            // Add an include file for each Slice file. Note that the .h extension
-            // is replaced with headerExtension later.
-            //
-            includes.push_back(icecpp->getBaseName() + ".h");
-
-            FILE* cppHandle = icecpp->preprocess(false, "-D__SLICE2FREEZE__");
-
-            if(cppHandle == 0)
-            {
-                u->destroy();
-                return EXIT_FAILURE;
-            }
-
-            if(preprocess)
-            {
-                char buf[4096];
-                while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL)
-                {
-                    if(fputs(buf, stdout) == EOF)
-                    {
-                        u->destroy();
-                        return EXIT_FAILURE;
-                    }
-                }
-            }
-            else
-            {
-                status = u->parse(args[idx], cppHandle, debug);
-
-                MetaDataVisitor visitor;
-                u->visit(&visitor, false);
-            }
-
-            if(!icecpp->close())
-            {
-                u->destroy();
-                return EXIT_FAILURE;
-            }
-        }
-
-        {
-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex);
-
-            if(interrupted)
-            {
-                return EXIT_FAILURE;
-            }
-        }
-    }
-
-    if(dependxml)
-    {
-        out.os() << "</dependencies>\n";
-    }
-
-    if(depend || dependxml)
-    {
-        u->destroy();
-        return EXIT_SUCCESS;
-    }
-
-    if(status == EXIT_SUCCESS && !preprocess)
-    {
-        try
-        {
-            gen(argv[0], u, includePaths, extraHeaders, dicts, indices, include, headerExtension,
-                sourceExtension, dllExport, includes, args, output);
-        }
-        catch(const string& ex)
-        {
-            // If a file could not be created, then cleanup any
-            // created files.
-            FileTracker::instance()->cleanup();
-            u->destroy();
-            getErrorStream() << argv[0] << ": error: " << ex << endl;
-            return EXIT_FAILURE;
-        }
-        catch(const Slice::FileException& ex)
-        {
-            // If a file could not be created, then cleanup any
-            // created files.
-            FileTracker::instance()->cleanup();
-            u->destroy();
-            getErrorStream() << argv[0] << ": error: " << ex.reason() << endl;
-            return EXIT_FAILURE;
-        }
-        catch(...)
-        {
-            getErrorStream() << argv[0] << ": error: unknown exception" << endl;
-            FileTracker::instance()->cleanup();
-            u->destroy();
-            return EXIT_FAILURE;
-        }
-    }
-
-    u->destroy();
-
-    {
-        IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex);
-
-        if(interrupted)
-        {
-            FileTracker::instance()->cleanup();
-            return EXIT_FAILURE;
-        }
-    }
-
-    return status;
-}
-
-int
-main(int argc, char* argv[])
-{
-    try
-    {
-        return compile(argc, argv);
-    }
-    catch(const std::exception& ex)
-    {
-        getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const std::string& msg)
-    {
-        getErrorStream() << argv[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        getErrorStream() << argv[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(...)
-    {
-        getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
-        return EXIT_FAILURE;
-    }
-}
diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile
deleted file mode 100644
index 83842afb8ab..00000000000
--- a/cpp/src/slice2freeze/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-NAME		= $(bindir)/slice2freeze
-
-TARGETS		= $(NAME)
-
-OBJS		= Main.o
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. $(CPPFLAGS)
-
-$(NAME): $(OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK)
-
-install:: all
-	$(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/slice2freeze.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/slice2freeze/Makefile.mak b/cpp/src/slice2freeze/Makefile.mak
deleted file mode 100644
index 9655e3517aa..00000000000
--- a/cpp/src/slice2freeze/Makefile.mak
+++ /dev/null
@@ -1,49 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2freeze.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= .\Main.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-RES_FILE        = Slice2Freeze.res
-
-$(NAME): $(OBJS) Slice2Freeze.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \
-		$(BASELIBS) $(RES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Freeze.res
-
-install:: all
-	copy $(NAME) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(NAME:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/slice2freeze/Slice2Freeze.rc b/cpp/src/slice2freeze/Slice2Freeze.rc
deleted file mode 100644
index d90e354140f..00000000000
--- a/cpp/src/slice2freeze/Slice2Freeze.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "Slice to Freeze for C++ Translator\0"
-            VALUE "FileVersion", "3.6.3\0"
-            VALUE "InternalName", "slice2freeze\0"
-            VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
-            VALUE "OriginalFilename", "slice2freeze.exe\0"
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
diff --git a/cpp/src/slice2freezej/.depend.mak b/cpp/src/slice2freezej/.depend.mak
deleted file mode 100755
index 0092c15b6fe..00000000000
--- a/cpp/src/slice2freezej/.depend.mak
+++ /dev/null
@@ -1,24 +0,0 @@
-
-Main.obj: \
-	Main.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Slice\Preprocessor.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\Slice\JavaUtil.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\Slice\Util.h" \
diff --git a/cpp/src/slice2freezej/.gitignore b/cpp/src/slice2freezej/.gitignore
deleted file mode 100644
index 720f44c7047..00000000000
--- a/cpp/src/slice2freezej/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
deleted file mode 100644
index 09202986834..00000000000
--- a/cpp/src/slice2freezej/Main.cpp
+++ /dev/null
@@ -1,2039 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <IceUtil/Options.h>
-#include <IceUtil/StringUtil.h>
-#include <IceUtil/CtrlCHandler.h>
-#include <IceUtil/Mutex.h>
-#include <IceUtil/MutexPtrLock.h>
-#include <Slice/Preprocessor.h>
-#include <Slice/FileTracker.h>
-#include <Slice/JavaUtil.h>
-#include <Slice/Util.h>
-#include <iterator>
-
-using namespace std;
-using namespace Slice;
-using namespace IceUtil;
-using namespace IceUtilInternal;
-
-namespace
-{
-
-IceUtil::Mutex* globalMutex = 0;
-bool interrupted = false;
-
-class Init
-{
-public:
-
-    Init()
-    {
-        globalMutex = new IceUtil::Mutex;
-    }
-
-    ~Init()
-    {
-        delete globalMutex;
-        globalMutex = 0;
-    }
-};
-
-Init init;
-
-}
-
-void
-interruptedCallback(int /*signal*/)
-{
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
-
-    interrupted = true;
-}
-
-struct DictIndex
-{
-    string member;
-    bool caseSensitive;
-
-    bool operator==(const DictIndex& rhs) const
-    {
-        return member == rhs.member;
-    }
-
-    bool operator!=(const DictIndex& rhs) const
-    {
-        return member != rhs.member;
-    }
-};
-
-struct Dict
-{
-    string name;
-    string key;
-    string value;
-
-    vector<DictIndex> indices;
-};
-
-struct Index
-{
-    string name;
-    string type;
-    string member;
-    bool caseSensitive;
-};
-
-class FreezeGenerator : public JavaGenerator
-{
-public:
-    FreezeGenerator(const string&, const string&);
-    virtual ~FreezeGenerator();
-
-    void generate(UnitPtr&, const Dict&);
-
-    void generate(UnitPtr&, const Index&);
-
-#ifdef __SUNPRO_CC
-protected:
-    using JavaGenerator::typeToObjectString;
-#endif
-
-private:
-
-    string typeToObjectString(const TypePtr&);
-    string varToObject(const TypePtr&, const string&);
-    string objectToVar(const TypePtr&, const string&);
-
-    const string _prog;
-};
-
-FreezeGenerator::FreezeGenerator(const string& prog, const string& dir)
-    : JavaGenerator(dir),
-      _prog(prog)
-{
-}
-
-FreezeGenerator::~FreezeGenerator()
-{
-}
-
-string
-FreezeGenerator::typeToObjectString(const TypePtr& type)
-{
-    static const char* builtinTable[] =
-    {
-        "java.lang.Byte",
-        "java.lang.Boolean",
-        "java.lang.Short",
-        "java.lang.Integer",
-        "java.lang.Long",
-        "java.lang.Float",
-        "java.lang.Double",
-        "java.lang.String",
-        "Ice.Object",
-        "Ice.ObjectPrx",
-        "Ice.LocalObject"
-    };
-
-    BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-    if(b)
-    {
-        return builtinTable[b->kind()];
-    }
-    else
-    {
-        return typeToString(type, TypeModeIn);
-    }
-}
-
-string
-FreezeGenerator::varToObject(const TypePtr& type, const string& param)
-{
-    string result = param;
-
-    BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-    if(b != 0)
-    {
-        switch(b->kind())
-        {
-            case Builtin::KindByte:
-            {
-                result = string("java.lang.Byte.valueOf(") + param + ")";
-                break;
-            }
-            case Builtin::KindBool:
-            {
-                result = string("java.lang.Boolean.valueOf(") + param + ")";
-                break;
-            }
-            case Builtin::KindShort:
-            {
-                result = string("java.lang.Short.valueOf(") + param + ")";
-                break;
-            }
-            case Builtin::KindInt:
-            {
-                result = string("java.lang.Integer.valueOf(") + param + ")";
-                break;
-            }
-            case Builtin::KindLong:
-            {
-                result = string("java.lang.Long.valueOf(") + param + ")";
-                break;
-            }
-            case Builtin::KindFloat:
-            {
-                result = string("java.lang.Float.valueOf(") + param + ")";
-                break;
-            }
-            case Builtin::KindDouble:
-            {
-                result = string("java.lang.Double.valueOf(") + param + ")";
-                break;
-            }
-            case Builtin::KindString:
-            case Builtin::KindObject:
-            case Builtin::KindObjectProxy:
-            case Builtin::KindLocalObject:
-                break;
-        }
-    }
-    return result;
-}
-
-string
-FreezeGenerator::objectToVar(const TypePtr& type, const string& param)
-{
-    string result = param;
-
-    BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-    if(b != 0)
-    {
-        switch(b->kind())
-        {
-            case Builtin::KindByte:
-            {
-                result = param + ".byteValue()";
-                break;
-            }
-            case Builtin::KindBool:
-            {
-                result = param + ".booleanValue()";
-                break;
-            }
-            case Builtin::KindShort:
-            {
-                result = param + ".shortValue()";
-                break;
-            }
-            case Builtin::KindInt:
-            {
-                result = param + ".intValue()";
-                break;
-            }
-            case Builtin::KindLong:
-            {
-                result = param + ".longValue()";
-                break;
-            }
-            case Builtin::KindFloat:
-            {
-                result = param + ".floatValue()";
-                break;
-            }
-            case Builtin::KindDouble:
-            {
-                result = param + ".doubleValue()";
-                break;
-            }
-            case Builtin::KindString:
-            case Builtin::KindObject:
-            case Builtin::KindObjectProxy:
-            case Builtin::KindLocalObject:
-                break;
-        }
-    }
-    return result;
-}
-
-void
-FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
-{
-    //
-    // The dictionary name may include a package.
-    //
-    string name;
-    string::size_type pos = dict.name.rfind('.');
-    if(pos == string::npos)
-    {
-        name = dict.name;
-    }
-    else
-    {
-        name = dict.name.substr(pos + 1);
-    }
-
-    TypeList keyTypes = u->lookupType(dict.key, false);
-    if(keyTypes.empty())
-    {
-        ostringstream os;
-        os << "`" << dict.key << "' is not a valid type" << endl;
-        throw os.str();
-    }
-    TypePtr keyType = keyTypes.front();
-
-    TypeList valueTypes = u->lookupType(dict.value, false);
-    if(valueTypes.empty())
-    {
-        ostringstream os;
-        os << "`" << dict.value << "' is not a valid type" << endl;
-        throw os.str();
-    }
-    TypePtr valueType = valueTypes.front();
-
-    vector<TypePtr> indexTypes;
-    vector<string> members;
-    vector<string> capitalizedMembers;
-    vector<string> indexNames;
-
-    for(size_t i = 0; i < dict.indices.size(); ++i)
-    {
-        const DictIndex& index = dict.indices[i];
-        const string& member = index.member;
-
-        if(index.member.empty())
-        {
-            //
-            // No member was specified, which means we use the map's value type as the index key.
-            //
-
-            if(dict.indices.size() > 1)
-            {
-                ostringstream os;
-                os << "bad index for dictionary `" << dict.name << "'" << endl;
-                throw os.str();
-            }
-
-            bool containsSequence = false;
-            if(!Dictionary::legalKeyType(valueType, containsSequence))
-            {
-                ostringstream os;
-                os << "`" << dict.value << "' is not a valid index type" << endl;
-                throw os.str();
-            }
-            if(containsSequence)
-            {
-                getErrorStream() << _prog << ": warning: use of sequences in dictionary keys has been deprecated"
-                                 << endl;
-            }
-
-            if(index.caseSensitive == false)
-            {
-                //
-                // Verify that value type is a string.
-                //
-                BuiltinPtr b = BuiltinPtr::dynamicCast(valueType);
-                if(b == 0 || b->kind() != Builtin::KindString)
-                {
-                    ostringstream os;
-                    os << "VALUE is a `" << dict.value << "', not a string" << endl;
-                    throw os.str();
-                }
-            }
-            indexTypes.push_back(valueType);
-            members.push_back("value");
-            capitalizedMembers.push_back("Value");
-            indexNames.push_back("index");
-        }
-        else
-        {
-            DataMemberPtr dataMember = 0;
-            DataMemberList dataMembers;
-
-            ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(valueType);
-            if(classDecl != 0)
-            {
-                dataMembers = classDecl->definition()->allDataMembers();
-            }
-            else
-            {
-                StructPtr structDecl = StructPtr::dynamicCast(valueType);
-                if(structDecl == 0)
-                {
-                    ostringstream os;
-                    os << "`" << dict.value << "' is neither a class nor a struct" << endl;
-                    throw os.str();
-                }
-                dataMembers = structDecl->dataMembers();
-            }
-
-            DataMemberList::const_iterator q = dataMembers.begin();
-            while(q != dataMembers.end() && dataMember == 0)
-            {
-                if((*q)->name() == index.member)
-                {
-                    dataMember = *q;
-                }
-                else
-                {
-                    ++q;
-                }
-            }
-
-            if(dataMember == 0)
-            {
-                ostringstream os;
-                os << "The value of `" << dict.name << "' has no data member named `" << index.member << "'" << endl;
-                throw os.str();
-            }
-
-            TypePtr dataMemberType = dataMember->type();
-
-            bool containsSequence = false;
-            if(!Dictionary::legalKeyType(dataMemberType, containsSequence))
-            {
-                ostringstream os;
-                os << "`" << index.member << "' cannot be used as an index key" << endl;
-                throw os.str();
-            }
-            if(containsSequence)
-            {
-                getErrorStream() << _prog << ": warning: use of sequences in dictionary keys has been deprecated"
-                                 << endl;
-            }
-
-            if(index.caseSensitive == false)
-            {
-                //
-                // Verify that member type is a string.
-                //
-                BuiltinPtr b = BuiltinPtr::dynamicCast(dataMemberType);
-                if(b == 0 || b->kind() != Builtin::KindString)
-                {
-                    ostringstream os;
-                    os << "`" << index.member << "' is not a string" << endl;
-                    throw os.str();
-                }
-            }
-            indexTypes.push_back(dataMemberType);
-
-            members.push_back(member);
-            string capitalizedMember = member;
-            capitalizedMember[0] = toupper(static_cast<unsigned char>(capitalizedMember[0]));
-            capitalizedMembers.push_back(capitalizedMember);
-            indexNames.push_back(member);
-        }
-    }
-
-    open(dict.name, u->currentFile());
-
-    Output& out = output();
-
-    string keyTypeS = typeToObjectString(keyType);
-    string valueTypeS = typeToObjectString(valueType);
-
-    out << sp << nl << "public class " << name << " extends Freeze.MapInternal.MapI<" << keyTypeS << ", "
-        << valueTypeS << ">";
-    out << sb;
-
-    if(dict.indices.size() > 0)
-    {
-        out << sp;
-        out << nl << "/**"
-            << nl << " * Supplies a comparator for each index key."
-            << nl << " */";
-        out << nl << "public static class IndexComparators";
-        out << sb;
-        out << sp;
-        out << nl << "/**"
-            << nl << " * Default constructor assigns null to the comparator for each index key."
-            << nl << " */";
-        out << nl << "public" << nl << "IndexComparators()";
-        out << sb;
-        out << eb;
-
-        out << sp;
-        out << nl << "/**"
-            << nl << " * This constructor accepts a comparator for each index key.";
-        for(size_t i = 0; i < dict.indices.size(); ++i)
-        {
-            out << nl << " * @param " << members[i] << "Comparator Comparator for <code>" << members[i] << "</code>.";
-        }
-        out << nl << " */";
-        out << nl << "public" << nl << "IndexComparators(";
-        for(size_t i = 0; i < dict.indices.size(); ++i)
-        {
-            if(i > 0)
-            {
-                out << ", ";
-            }
-            out << "java.util.Comparator<" << typeToObjectString(indexTypes[i]) << "> " << members[i]
-                << "Comparator";
-        }
-        out << ")";
-        out << sb;
-        for(size_t i = 0; i < dict.indices.size(); ++i)
-        {
-            out << nl << "this." << members[i] << "Comparator = " << members[i] << "Comparator;";
-        }
-        out << eb;
-
-        out << sp;
-        for(size_t i = 0; i < dict.indices.size(); ++i)
-        {
-            out << nl << "/** Comparator for <code>" << members[i] << "</code>. */";
-            out << nl << "public java.util.Comparator<" << typeToObjectString(indexTypes[i]) << "> " << members[i]
-                << "Comparator;";
-        }
-        out << eb;
-    }
-
-    //
-    // Constructors
-    //
-
-    out << sp << nl << "private" << nl << name
-        << "(Freeze.Connection __connection, String __dbName, java.util.Comparator<" << keyTypeS << "> __comparator";
-    if(dict.indices.size() > 0)
-    {
-        out << ", IndexComparators __indexComparators";
-    }
-    out << ")";
-    out << sb;
-
-    out << nl << "super(__connection, __dbName, __comparator);";
-    if(dict.indices.size() > 0)
-    {
-        out << nl << "_indices = new Freeze.MapIndex[" << dict.indices.size() << "];";
-        for(size_t i = 0; i < dict.indices.size(); ++i)
-        {
-            out << nl << "_" << members[i] << "Index = new " << capitalizedMembers[i] << "Index(\"" << indexNames[i]
-                << "\", __indexComparators == null ? null : __indexComparators." << members[i] << "Comparator);";
-            out << nl << "_indices[" << i << "] = _" << members[i] << "Index;";
-        }
-    }
-    out << eb;
-
-    if(dict.indices.size() > 0)
-    {
-        out << sp;
-        out << nl << "/**"
-            << nl << " * Instantiates a Freeze map using the given connection. If the database"
-            << nl << " * named in <code>__dbName</code> does not exist and <code>__createDb</code>"
-            << nl << " * is true, the database is created automatically, otherwise this constructor"
-            << nl << " * raises <code>DatabaseException</code>."
-            << nl << " * @param __connection The Freeze connection associated with this map."
-            << nl << " * @param __dbName The name of the Berkeley DB database."
-            << nl << " * @param __createDb True if the database should be created if it does not"
-            << nl << " *   already exist, false otherwise."
-            << nl << " * @param __comparator A comparator for the map's main key, or null to use the"
-            << nl << " *   default key comparison strategy."
-            << nl << " * @param __indexComparators A map of string to comparator, representing the"
-            << nl << " *   key comparator for each of the map's indices. The map uses the default"
-            << nl << " *   key comparison strategy for an index if <code>__indexComparators</code>"
-            << nl << " *   is null, or if no entry can be found in the comparators map for an index."
-            << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-            << nl << " */"
-            << nl << "public" << nl << name
-            << "(Freeze.Connection __connection, String __dbName, boolean __createDb, "
-            << "java.util.Comparator<" << keyTypeS  << "> __comparator, "
-            << "IndexComparators __indexComparators)";
-        out << sb;
-        out << nl << "this(__connection, __dbName, __comparator, __indexComparators);";
-        out << nl << "init(_indices, __dbName, \"" << keyType->typeId() << "\", \"" << valueType->typeId()
-            << "\", __createDb);";
-        out << eb;
-    }
-
-    out << sp;
-    out << nl << "/**"
-        << nl << " * Instantiates a Freeze map using the given connection. If the database"
-        << nl << " * named in <code>__dbName</code> does not exist and <code>__createDb</code>"
-        << nl << " * is true, the database is created automatically, otherwise this constructor"
-        << nl << " * raises <code>DatabaseException</code>."
-        << nl << " * @param __connection The Freeze connection associated with this map."
-        << nl << " * @param __dbName The name of the Berkeley DB database."
-        << nl << " * @param __createDb True if the database should be created if it does not"
-        << nl << " *   already exist, false otherwise."
-        << nl << " * @param __comparator A comparator for the map's main key, or null to use the"
-        << nl << " *   default key comparison strategy."
-        << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-        << nl << " */";
-    out << nl << "public" << nl << name
-        << "(Freeze.Connection __connection, String __dbName, boolean __createDb, "
-        << "java.util.Comparator<" << keyTypeS << "> __comparator)";
-    out << sb;
-    if(dict.indices.size() > 0)
-    {
-        out << nl << "this(__connection, __dbName, __createDb, __comparator, null);";
-    }
-    else
-    {
-        out << nl << "super(__connection,  __dbName, \"" << keyType->typeId() << "\", \""
-            << valueType->typeId() << "\", __createDb, __comparator);";
-    }
-    out << eb;
-
-    out << sp;
-    out << nl << "/**"
-        << nl << " * Instantiates a Freeze map using the given connection. If the database"
-        << nl << " * named in <code>__dbName</code> does not exist and <code>__createDb</code>"
-        << nl << " * is true, the database is created automatically, otherwise this constructor"
-        << nl << " * raises <code>DatabaseException</code>. The map uses the default key"
-        << nl << " * comparison strategy."
-        << nl << " * @param __connection The Freeze connection associated with this map."
-        << nl << " * @param __dbName The name of the Berkeley DB database."
-        << nl << " * @param __createDb True if the database should be created if it does not"
-        << nl << " *   already exist, false otherwise."
-        << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-        << nl << " */";
-    out << nl << "public" << nl << name
-        << "(Freeze.Connection __connection, String __dbName, boolean __createDb)";
-    out << sb;
-    out << nl << "this(__connection, __dbName, __createDb, null);";
-    out << eb;
-
-    out << sp;
-    out << nl << "/**"
-        << nl << " * Instantiates a Freeze map using the given connection. If the database"
-        << nl << " * named in <code>__dbName</code> does not exist, it is created automatically."
-        << nl << " * The map uses the default key comparison strategy."
-        << nl << " * @param __connection The Freeze connection associated with this map."
-        << nl << " * @param __dbName The name of the Berkeley DB database."
-        << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-        << nl << " */";
-    out << nl << "public" << nl << name << "(Freeze.Connection __connection, String __dbName)";
-    out << sb;
-    out << nl << "this(__connection, __dbName, true);";
-    out << eb;
-
-    //
-    // recreate
-    //
-    if(dict.indices.size() > 0)
-    {
-        out << sp;
-        out << nl << "/**"
-            << nl << " * Copies an existing database. The new database has the name given in"
-            << nl << " * <code>__dbName</code>, and the old database is renamed with a UUID"
-            << nl << " * suffix."
-            << nl << " * @param __connection The Freeze connection associated with this map."
-            << nl << " * @param __dbName The name of the Berkeley DB database."
-            << nl << " * @param __comparator A comparator for the map's main key, or null to use the"
-            << nl << " *   default key comparison strategy."
-            << nl << " * @param __indexComparators A map of string to comparator, representing the"
-            << nl << " *   key comparator for each of the map's indices. The map uses the default"
-            << nl << " *   key comparison strategy for an index if <code>__indexComparators</code>"
-            << nl << " *   is null, or if no entry can be found in the comparators map for an index."
-            << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-            << nl << " */";
-        out << nl << "public static void" << nl
-            << "recreate(Freeze.Connection __connection, String __dbName, "
-            << "java.util.Comparator<" << keyTypeS  << "> __comparator, "
-            << "IndexComparators __indexComparators)";
-        out << sb;
-        out << nl << name << " __tmpMap = new " << name
-            << "(__connection, __dbName, __comparator, __indexComparators);";
-        out << nl << "recreate(__tmpMap, __dbName, \"" << keyType->typeId() << "\", \""
-            << valueType->typeId() << "\", __tmpMap._indices);";
-        out << eb;
-    }
-
-    out << sp;
-    out << nl << "/**"
-        << nl << " * Copies an existing database. The new database has the name given in"
-        << nl << " * <code>__dbName</code>, and the old database is renamed with a UUID"
-        << nl << " * suffix."
-        << nl << " * @param __connection The Freeze connection associated with this map."
-        << nl << " * @param __dbName The name of the Berkeley DB database."
-        << nl << " * @param __comparator A comparator for the map's main key, or null to use the"
-        << nl << " *   default key comparison strategy."
-        << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-        << nl << " */";
-    out << nl << "public static void" << nl
-        << "recreate(Freeze.Connection __connection, String __dbName, "
-        << "java.util.Comparator<" << keyTypeS  << "> __comparator)";
-    out << sb;
-    if(dict.indices.size() > 0)
-    {
-        out << nl << "recreate(__connection, __dbName, __comparator, null);";
-    }
-    else
-    {
-        out << nl << name << " __tmpMap = new " << name << "(__connection, __dbName, __comparator);";
-        out << nl << "recreate(__tmpMap, __dbName, \"" << keyType->typeId() << "\", \""
-            << valueType->typeId() << "\", null);";
-    }
-    out << eb;
-
-    //
-    // Index methods
-    //
-    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
-    {
-        string indexClassName = capitalizedMembers[i] + "Index";
-        string indexTypeS = typeToString(indexTypes[i], TypeModeIn);
-        string indexObjTypeS = typeToObjectString(indexTypes[i]);
-        string indexObj = varToObject(indexTypes[i], "__key");
-
-        out << sp;
-        out << nl << "/**"
-            << nl << " * Obtains an iterator ordered using the index value."
-            << nl << " * The iterator's initial position is an element whose key matches <code>__key</code>; if"
-            << nl << " * no such element exists, the returned iterator is empty (<code>hasNext</code> returns"
-            << nl << " * false). If <code>__onlyDups</code> is true, the iterator only returns elements whose"
-            << nl << " * key exactly matches <code>__key</code>; otherwise, the iterator continues to iterate over"
-            << nl << " * the remaining elements in the map."
-            << nl << " * @param __key The value at which the iterator begins."
-            << nl << " * @param __onlyDups True if the iterator should be limited to elements whose key"
-            << nl << " *   exactly matches <code>__key</code>, false otherwise."
-            << nl << " * @return A new iterator."
-            << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-            << nl << " */";
-        out << nl << "public Freeze.Map.EntryIterator<java.util.Map.Entry<" << keyTypeS << ", " << valueTypeS
-            << ">>";
-        out << nl << "findBy" << capitalizedMembers[i] << "(" << indexTypeS << " __key, boolean __onlyDups)";
-        out << sb;
-        out << nl << "return _" << members[i] << "Index.find(" << indexObj << ", __onlyDups);";
-        out << eb;
-
-        out << sp;
-        out << nl << "/**"
-            << nl << " * Obtains an iterator ordered using the values of member <code>" << members[i] << "</code>."
-            << nl << " * The iterator's initial position is an element whose key matches <code>__key</code>; if"
-            << nl << " * no such element exists, the returned iterator is empty (<code>hasNext</code> returns"
-            << nl << " * false). This iterator only returns elements whose key exactly matches <code>__key</code>."
-            << nl << " * @param __key The value at which the iterator begins."
-            << nl << " * @return A new iterator."
-            << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-            << nl << " */";
-        out << nl << "public Freeze.Map.EntryIterator<java.util.Map.Entry<" << keyTypeS << ", " << valueTypeS
-            << ">>";
-        out << nl << "findBy" << capitalizedMembers[i] << "(" << indexTypeS << " __key)";
-        out << sb;
-        out << nl << "return _" << members[i] << "Index.find(" << indexObj << ", true);";
-        out << eb;
-
-        out << sp;
-        out << nl << "/**"
-            << nl << " * Determines the number of elements whose index values match <code>__key</code>."
-            << nl << " * @return The number of matching elements."
-            << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-            << nl << " */";
-        string countMethod = dict.indices[i].member.empty() ?  string("valueCount") : dict.indices[i].member + "Count";
-        out << nl << "public int";
-        out << nl << countMethod << "(" << indexTypeS << " __key)";
-        out << sb;
-        out << nl << "return _" << members[i] << "Index.count(" << indexObj << ");";
-        out << eb;
-
-        string subMap = "Freeze.NavigableMap<" + indexObjTypeS + ", java.util.Set<java.util.Map.Entry<" + keyTypeS +
-            ", " + valueTypeS + ">>>";
-
-        out << sp;
-        out << nl << "/**"
-            << nl << " * Returns a view of the portion of this map whose keys are strictly less than"
-            << nl << " * <code>__toKey</code>, or less than or equal to <code>__toKey</code> if"
-            << nl << " * <code>__inclusive</code> is true. Insertions and removals via this map are"
-            << nl << " * not supported."
-            << nl << " * @param __toKey High endpoint of the keys in the returned map."
-            << nl << " * @param __inclusive If true, the endpoint is included in the returned map;"
-            << nl << " *   otherwise, the endpoint is excluded."
-            << nl << " * @return A view of the portion of this map whose keys are strictly less than"
-            << nl << " *   <code>__toKey</code>, or less than or equal to <code>__toKey</code> if"
-            << nl << " *   <code>__inclusive</code> is true."
-            << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-            << nl << " */";
-        out << nl << "public " + subMap;
-        out << nl << "headMapFor" << capitalizedMembers[i] << "(" << indexTypeS << " __toKey, boolean __inclusive)";
-        out << sb;
-        out << nl << "return _" << members[i] << "Index.createHeadMap(" << varToObject(indexTypes[i], "__toKey")
-            << ", __inclusive);";
-        out << eb;
-
-        out << sp;
-        out << nl << "/**"
-            << nl << " * Returns a view of the portion of this map whose keys are strictly less than"
-            << nl << " * <code>__toKey</code>. Insertions and removals via this map are not supported."
-            << nl << " * @param __toKey High endpoint of the keys in the returned map."
-            << nl << " * @return A view of the portion of this map whose keys are strictly less than"
-            << nl << " *   <code>__toKey</code>>"
-            << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-            << nl << " */";
-        out << nl << "public " + subMap;
-        out << nl << "headMapFor" << capitalizedMembers[i] << "(" << indexTypeS << " __toKey)";
-        out << sb;
-        out << nl << "return headMapFor" << capitalizedMembers[i] << "(__toKey, false);";
-        out << eb;
-
-        out << sp;
-        out << nl << "/**"
-            << nl << " * Returns a view of the portion of this map whose keys are strictly greater than"
-            << nl << " * <code>__fromKey</code>, or greater than or equal to <code>__fromKey</code> if"
-            << nl << " * <code>__inclusive</code> is true. Insertions and removals via this map are"
-            << nl << " * not supported."
-            << nl << " * @param __fromKey Low endpoint of the keys in the returned map."
-            << nl << " * @param __inclusive If true, the endpoint is included in the returned map;"
-            << nl << " *   otherwise, the endpoint is excluded."
-            << nl << " * @return A view of the portion of this map whose keys are strictly greater than"
-            << nl << " *   <code>__fromKey</code>, or greater than or equal to <code>__fromKey</code> if"
-            << nl << " *   <code>__inclusive</code> is true."
-            << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-            << nl << " */";
-        out << nl << "public " + subMap;
-        out << nl << "tailMapFor" << capitalizedMembers[i] << "(" << indexTypeS << " __fromKey, boolean __inclusive)";
-        out << sb;
-        out << nl << "return _" << members[i] << "Index.createTailMap(" << varToObject(indexTypes[i], "__fromKey")
-            << ", __inclusive);";
-        out << eb;
-
-        out << sp;
-        out << nl << "/**"
-            << nl << " * Returns a view of the portion of this map whose keys are greater than or equal"
-            << nl << " * to <code>__fromKey</code>. Insertions and removals via this map are not supported."
-            << nl << " * @param __fromKey Low endpoint of the keys in the returned map."
-            << nl << " * @return A view of the portion of this map whose keys are greater than or equal"
-            << nl << " *   to <code>__fromKey</code>."
-            << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-            << nl << " */";
-        out << nl << "public " + subMap;
-        out << nl << "tailMapFor" << capitalizedMembers[i] << "(" << indexTypeS << " __fromKey)";
-        out << sb;
-        out << nl << "return tailMapFor" << capitalizedMembers[i] << "(__fromKey, true);";
-        out << eb;
-
-        out << sp;
-        out << nl << "/**"
-            << nl << " * Returns a view of the portion of this map whose keys range from"
-            << nl << " * <code>__fromKey</code> to <code>__toKey</code>. If <code>__fromKey</code>"
-            << nl << " * and <code>__toKey</code> are equal, the returned map is empty unless"
-            << nl << " * <code>__fromInclusive</code> and <code>__toInclusive</code> are both true."
-            << nl << " * Insertions and removals via this map are not supported."
-            << nl << " * @param __fromKey Low endpoint of the keys in the returned map."
-            << nl << " * @param __fromInclusive If true, the low endpoint is included in the returned map;"
-            << nl << " *   otherwise, the endpoint is excluded."
-            << nl << " * @param __toKey High endpoint of the keys in the returned map."
-            << nl << " * @param __toInclusive If true, the high endpoint is included in the returned map;"
-            << nl << " *   otherwise, the endpoint is excluded."
-            << nl << " * @return A view of the portion of this map whose keys range from"
-            << nl << " *   <code>__fromKey</code> to <code>__toKey</code>."
-            << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-            << nl << " */";
-        out << nl << "public " + subMap;
-        out << nl << "subMapFor" << capitalizedMembers[i] << "(" << indexTypeS
-            << " __fromKey, boolean __fromInclusive, " << indexTypeS << " __toKey, boolean __toInclusive)";
-        out << sb;
-        out << nl << "return _" << members[i] << "Index.createSubMap(" << varToObject(indexTypes[i], "__fromKey")
-            << ", __fromInclusive, " << varToObject(indexTypes[i], "__toKey") << ", __toInclusive);";
-        out << eb;
-
-        out << sp;
-        out << nl << "/**"
-            << nl << " * Returns a view of the portion of this map whose keys are greater than"
-            << nl << " * or equal to <code>__fromKey</code> and strictly less than <code>__toKey</code>."
-            << nl << " * Insertions and removals via this map are not supported."
-            << nl << " * @param __fromKey Low endpoint of the keys in the returned map."
-            << nl << " * @param __toKey High endpoint of the keys in the returned map."
-            << nl << " * @return A view of the portion of this map whose keys range from"
-            << nl << " *   <code>__fromKey</code> to <code>__toKey</code>."
-            << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-            << nl << " */";
-        out << nl << "public " + subMap;
-        out << nl << "subMapFor" << capitalizedMembers[i] << "(" << indexTypeS << " __fromKey, " << indexTypeS
-            << " __toKey)";
-        out << sb;
-        out << nl << "return subMapFor" << capitalizedMembers[i] << "(__fromKey, true, __toKey, false);";
-        out << eb;
-
-        out << sp;
-        out << nl << "/**"
-            << nl << " * Returns a view of this map whose keys are ordered by the index value."
-            << nl << " * Insertions and removals via this map are not supported."
-            << nl << " * @return A view of this map whose keys range are ordered by the index value."
-            << nl << " * @throws Freeze.DatabaseException If an error occurs during database operations."
-            << nl << " */";
-        out << nl << "public " + subMap;
-        out << nl << "mapFor" << capitalizedMembers[i] << "()";
-        out << sb;
-        out << nl << "return _" << members[i] << "Index.createMap();";
-        out << eb;
-    }
-
-    //
-    // Top-level encode/decode
-    //
-    for(size_t i = 0; i < 2; i++)
-    {
-        string keyValue;
-        TypePtr type;
-        bool encaps;
-        string typeS;
-
-        if(i == 0)
-        {
-            keyValue = "Key";
-            type = keyType;
-            typeS = keyTypeS;
-            encaps = false; // Do not encapsulate keys.
-        }
-        else
-        {
-            keyValue = "Value";
-            type = valueType;
-            typeS = valueTypeS;
-            encaps = true;
-        }
-
-        string valS = objectToVar(type, "v");
-
-        int iter;
-
-        //
-        // encode
-        //
-        out << sp << nl << "public void" << nl << "encode" << keyValue << "(" << typeS
-            << " v, IceInternal.BasicStream __os)";
-        out << sb;
-        if(encaps)
-        {
-            out << nl << "__os.startWriteEncaps();";
-        }
-        iter = 0;
-        writeMarshalUnmarshalCode(out, "", type, OptionalNone, false, 0, valS, true, iter, false);
-        if(type->usesClasses())
-        {
-            out << nl << "__os.writePendingObjects();";
-        }
-        if(encaps)
-        {
-            out << nl << "__os.endWriteEncaps();";
-        }
-        out << eb;
-
-        //
-        // decode
-        //
-        out << sp << nl << "public " << typeS << nl << "decode" << keyValue << "(IceInternal.BasicStream __is)";
-        out << sb;
-        if(type->usesClasses())
-        {
-            out << nl << "__is.sliceObjects(false);";
-        }
-        if(encaps)
-        {
-            out << nl << "__is.startReadEncaps();";
-        }
-        iter = 0;
-        list<string> metaData;
-        string patchParams;
-        BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-        if((b && b->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(type))
-        {
-            out << nl << "Patcher __p = new Patcher();";
-            patchParams = "__p";
-        }
-        else if(StructPtr::dynamicCast(type))
-        {
-            out << nl << typeS << " __r = null;";
-        }
-        else
-        {
-            out << nl << typeS << " __r;";
-        }
-        if(b)
-        {
-            switch(b->kind())
-            {
-            case Builtin::KindByte:
-            {
-                out << nl << "__r = java.lang.Byte.valueOf(__is.readByte());";
-                break;
-            }
-            case Builtin::KindBool:
-            {
-                out << nl << "__r = java.lang.Boolean.valueOf(__is.readBool());";
-                break;
-            }
-            case Builtin::KindShort:
-            {
-                out << nl << "__r = java.lang.Short.valueOf(__is.readShort());";
-                break;
-            }
-            case Builtin::KindInt:
-            {
-                out << nl << "__r = java.lang.Integer.valueOf(__is.readInt());";
-                break;
-            }
-            case Builtin::KindLong:
-            {
-                out << nl << "__r = java.lang.Long.valueOf(__is.readLong());";
-                break;
-            }
-            case Builtin::KindFloat:
-            {
-                out << nl << "__r = java.lang.Float.valueOf(__is.readFloat());";
-                break;
-            }
-            case Builtin::KindDouble:
-            {
-                out << nl << "__r = java.lang.Double.valueOf(__is.readDouble());";
-                break;
-            }
-            case Builtin::KindString:
-            case Builtin::KindObject:
-            case Builtin::KindObjectProxy:
-            case Builtin::KindLocalObject:
-            {
-                writeMarshalUnmarshalCode(out, "", type, OptionalNone, false, 0, "__r", false, iter, false, metaData,
-                                          patchParams);
-                break;
-            }
-            }
-        }
-        else
-        {
-            writeMarshalUnmarshalCode(out, "", type, OptionalNone, false, 0, "__r", false, iter, false, metaData,
-                                      patchParams);
-        }
-        if(type->usesClasses())
-        {
-            out << nl << "__is.readPendingObjects();";
-        }
-        if(encaps)
-        {
-            out << nl << "__is.endReadEncaps();";
-        }
-        if((b && b->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(type))
-        {
-            out << nl << "return __p.value;";
-        }
-        else
-        {
-            out << nl << "return __r;";
-        }
-        out << eb;
-    }
-
-    //
-    // Inner index classes
-    //
-    for(size_t i = 0; i < capitalizedMembers.size(); ++i)
-    {
-        string indexClassName = capitalizedMembers[i] + "Index";
-        string indexKeyTypeS = typeToObjectString(indexTypes[i]);
-
-        out << sp << nl << "private class " << indexClassName << " extends Freeze.MapInternal.Index<" << keyTypeS
-            << ", " << valueTypeS << ", " << indexKeyTypeS << ">";
-        out << sb;
-
-        //
-        // encodeKey
-        //
-        out << sp << nl << "public void";
-        out << nl << "encodeKey(" << indexKeyTypeS << " key, IceInternal.BasicStream __os)";
-        out << sb;
-        if(dict.indices[i].member.empty())
-        {
-            //
-            // Encode the full value (with an encaps!)
-            //
-            string keyS = "key";
-            if(!dict.indices[i].caseSensitive)
-            {
-                keyS = "key.toLowerCase()";
-            }
-
-            out << nl << "encodeValue(" << keyS << ", __os);";
-        }
-        else
-        {
-            //
-            // No encaps
-            //
-            string keyS = dict.indices[i].caseSensitive ?  "key" : "key.toLowerCase()";
-
-            keyS = objectToVar(indexTypes[i], keyS);
-
-            int iter = 0;
-            writeMarshalUnmarshalCode(out, "", indexTypes[i], OptionalNone, false, 0, keyS, true, iter, false);
-            assert(!indexTypes[i]->usesClasses());
-        }
-        out << eb;
-
-        //
-        // decodeKey
-        //
-        out << sp << nl << "public " << indexKeyTypeS;
-        out << nl << "decodeKey(IceInternal.BasicStream __is)";
-        out << sb;
-        if(dict.indices[i].member.empty())
-        {
-            //
-            // Decode the full value (with an encaps!)
-            //
-            out << nl << "return decodeValue(__is);";
-        }
-        else
-        {
-            int iter = 0;
-            list<string> metaData;
-            string patchParams;
-
-            if(StructPtr::dynamicCast(indexTypes[i]))
-            {
-                out << nl << indexKeyTypeS << " r = null;";
-            }
-            else
-            {
-                out << nl << indexKeyTypeS << " r;";
-            }
-
-            BuiltinPtr b = BuiltinPtr::dynamicCast(indexTypes[i]);
-            if(b != 0)
-            {
-                switch(b->kind())
-                {
-                case Builtin::KindByte:
-                {
-                    out << nl << "r = java.lang.Byte.valueOf(__is.readByte());";
-                    break;
-                }
-                case Builtin::KindBool:
-                {
-                    out << nl << "r = java.lang.Boolean.valueOf(__is.readBool());";
-                    break;
-                }
-                case Builtin::KindShort:
-                {
-                    out << nl << "r = java.lang.Short.valueOf(__is.readShort());";
-                    break;
-                }
-                case Builtin::KindInt:
-                {
-                    out << nl << "r = java.lang.Integer.valueOf(__is.readInt());";
-                    break;
-                }
-                case Builtin::KindLong:
-                {
-                    out << nl << "r = java.lang.Long.valueOf(__is.readLong());";
-                    break;
-                }
-                case Builtin::KindFloat:
-                {
-                    out << nl << "r = java.lang.Float.valueOf(__is.readFloat());";
-                    break;
-                }
-                case Builtin::KindDouble:
-                {
-                    out << nl << "r = java.lang.Double.valueOf(__is.readDouble());";
-                    break;
-                }
-                case Builtin::KindString:
-                case Builtin::KindObject:
-                case Builtin::KindObjectProxy:
-                case Builtin::KindLocalObject:
-                {
-                    writeMarshalUnmarshalCode(out, "", indexTypes[i], OptionalNone, false, 0, "r", false, iter, false,
-                                              metaData, patchParams);
-                    break;
-                }
-                }
-            }
-            else
-            {
-                writeMarshalUnmarshalCode(out, "", indexTypes[i], OptionalNone, false, 0, "r", false, iter, false,
-                                          metaData, patchParams);
-            }
-            out << nl << "return r;";
-        }
-        out << eb;
-
-        //
-        // extractKey
-        //
-        out << sp << nl << "protected " << indexKeyTypeS;
-        out << nl << "extractKey(" << valueTypeS << " value)";
-        out << sb;
-        if(dict.indices[i].member.empty())
-        {
-            if(dict.indices[i].caseSensitive)
-            {
-                out << nl << "return value;";
-            }
-            else
-            {
-                out << nl << "return value.toLowerCase();";
-            }
-        }
-        else
-        {
-            string member = "value." + dict.indices[i].member;
-            if(!dict.indices[i].caseSensitive)
-            {
-                member += ".toLowerCase()";
-            }
-            out << nl << "return " << varToObject(indexTypes[i], member) << ";";
-        }
-        out << eb;
-
-        //
-        // marshalKey optimization
-        //
-        if(dict.indices[i].member.empty() && dict.indices[i].caseSensitive)
-        {
-            out << sp << nl << "protected java.nio.ByteBuffer";
-            out << nl << "marshalKey(java.nio.ByteBuffer value)";
-            out << sb;
-            out << nl << "return value;";
-            out << eb;
-        }
-
-        //
-        // Constructor
-        //
-        out << sp << nl << "private" << nl << indexClassName << "(String name, java.util.Comparator<" << indexKeyTypeS
-            << "> comparator)";
-        out << sb;
-        out << nl << "super(" << name << ".this, name, comparator);";
-        out << eb;
-        out << eb;
-    }
-
-    //
-    // Patcher class.
-    //
-    BuiltinPtr b = BuiltinPtr::dynamicCast(valueType);
-    if((b && b->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(valueType))
-    {
-        string typeS = typeToString(valueType, TypeModeIn);
-        out << sp << nl << "private static class Patcher implements IceInternal.Patcher";
-        out << sb;
-        out << sp << nl << "public void" << nl << "patch(Ice.Object v)";
-        out << sb;
-        if(b)
-        {
-            out << nl << "value = v;";
-        }
-        else
-        {
-            out << nl << "value = (" << typeS << ")v;";
-        }
-        out << eb;
-        out << sp << nl << "public String" << nl << "type()";
-        out << sb;
-        if(b)
-        {
-            out << nl << "return \"::Ice::Object\";";
-        }
-        else
-        {
-            ClassDeclPtr decl = ClassDeclPtr::dynamicCast(valueType);
-            out << nl << "return \"" << decl->scoped() << "\";";
-        }
-        out << eb;
-        out << sp << nl << typeS << " value;";
-        out << eb;
-    }
-
-    //
-    // Fields
-    //
-    if(!dict.indices.empty())
-    {
-        out << sp << nl << "private Freeze.MapIndex[] _indices;";
-    }
-    for(size_t i = 0; i < dict.indices.size(); ++i)
-    {
-        out << nl << "private " << capitalizedMembers[i] << "Index _" << members[i] << "Index;";
-    }
-
-    out << eb;
-
-    close();
-}
-
-void
-FreezeGenerator::generate(UnitPtr& u, const Index& index)
-{
-    string name;
-    string::size_type pos = index.name.rfind('.');
-    if(pos == string::npos)
-    {
-        name = index.name;
-    }
-    else
-    {
-        name = index.name.substr(pos + 1);
-    }
-
-    TypeList types = u->lookupType(index.type, false);
-    if(types.empty())
-    {
-        ostringstream os;
-        os << "`" << index.type << "' is not a valid type" << endl;
-        throw os.str();
-    }
-    TypePtr type = types.front();
-
-    ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(type);
-    if(classDecl == 0)
-    {
-        ostringstream os;
-        os << "`" << index.type << "' is not a class" << endl;
-        throw os.str();
-    }
-
-    DataMemberList dataMembers = classDecl->definition()->allDataMembers();
-    DataMemberPtr dataMember = 0;
-    DataMemberList::const_iterator p = dataMembers.begin();
-    while(p != dataMembers.end() && dataMember == 0)
-    {
-        if((*p)->name() == index.member)
-        {
-            dataMember = *p;
-        }
-        else
-        {
-            ++p;
-        }
-    }
-
-    if(dataMember == 0)
-    {
-        ostringstream os;
-        os << "`" << index.type << "' has no data member named `" << index.member << "'" << endl;
-        throw os.str();
-    }
-
-    if(index.caseSensitive == false)
-    {
-        //
-        // Let's check member is a string
-        //
-        BuiltinPtr memberType = BuiltinPtr::dynamicCast(dataMember->type());
-        if(memberType == 0 || memberType->kind() != Builtin::KindString)
-        {
-            ostringstream os;
-            os << "`" << index.member << "'is not a string " << endl;
-            throw os.str();
-        }
-    }
-
-    string memberTypeString = typeToString(dataMember->type(), TypeModeIn);
-
-    open(index.name, u->currentFile());
-
-    Output& out = output();
-
-    out << sp << nl << "public class " << name << " extends Freeze.Index";
-    out << sb;
-
-    //
-    // Constructors
-    //
-    out << sp << nl << "public" << nl << name << "(String __indexName, String __facet)";
-    out << sb;
-    out << nl << "super(__indexName, __facet);";
-    out << eb;
-
-    out << sp << nl << "public" << nl << name << "(String __indexName)";
-    out << sb;
-    out << nl << "super(__indexName, \"\");";
-    out << eb;
-
-    //
-    // find and count
-    //
-    out << sp << nl << "public Ice.Identity[]" << nl
-        << "findFirst(" << memberTypeString << " __index, int __firstN)";
-    out << sb;
-    out << nl << "return untypedFindFirst(marshalKey(__index), __firstN);";
-    out << eb;
-
-    out << sp << nl << "public Ice.Identity[]" << nl
-        << "find(" << memberTypeString << " __index)";
-    out << sb;
-    out << nl << "return untypedFind(marshalKey(__index));";
-    out << eb;
-
-    out << sp << nl << "public int" << nl
-        << "count(" << memberTypeString << " __index)";
-    out << sb;
-    out << nl << "return untypedCount(marshalKey(__index));";
-    out << eb;
-
-    //
-    // Key marshalling
-    //
-    string typeString = typeToString(type, TypeModeIn);
-
-    out << sp << nl << "protected java.nio.ByteBuffer" << nl
-        << "marshalKey(Ice.Object __servant)";
-    out << sb;
-    out << nl << "if(__servant instanceof " << typeString << ")";
-    out << sb;
-    out << nl <<  memberTypeString << " __key = ((" << typeString << ")__servant)." << index.member << ";";
-    out << nl << "return marshalKey(__key);";
-    out << eb;
-    out << nl << "else";
-    out << sb;
-    out << nl << "return null;";
-    out << eb;
-    out << eb;
-
-    string valueS = index.caseSensitive ? "__key" : "__key.toLowerCase()";
-
-    out << sp << nl << "private java.nio.ByteBuffer" << nl
-        << "marshalKey(" << memberTypeString << " __key)";
-    out << sb;
-    out << nl << "IceInternal.BasicStream __os = "
-        << "new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator()), encoding(), false);";
-    int iter = 0;
-    writeMarshalUnmarshalCode(out, "", dataMember->type(), OptionalNone, false, 0, valueS, true, iter, false);
-    if(dataMember->type()->usesClasses())
-    {
-        out << nl << "__os.writePendingObjects();";
-    }
-    out << nl << "return __os.prepareWrite().b;";
-    out << eb;
-
-    out << eb;
-
-    close();
-}
-
-void
-usage(const char* n)
-{
-    getErrorStream() << "Usage: " << n << " [options] [slice-files...]\n";
-    getErrorStream() <<
-        "Options:\n"
-        "-h, --help                Show this message.\n"
-        "-v, --version             Display the Ice version.\n"
-        "--validate               Validate command line options.\n"
-        "-DNAME                    Define NAME as 1.\n"
-        "-DNAME=DEF                Define NAME as DEF.\n"
-        "-UNAME                    Remove any definition for NAME.\n"
-        "-IDIR                     Put DIR in the include file search path.\n"
-        "-E                        Print preprocessor output on stdout.\n"
-        "--include-dir DIR         Use DIR as the header include directory.\n"
-        "--dict NAME,KEY,VALUE     Create a Freeze dictionary with the name NAME,\n"
-        "                          using KEY as key, and VALUE as value. This\n"
-        "                          option may be specified multiple times for\n"
-        "                          different names. NAME may be a scoped name.\n"
-        "--index NAME,TYPE,MEMBER[,{case-sensitive|case-insensitive}]\n"
-        "                          Create a Freeze evictor index with the name\n"
-        "                          NAME for member MEMBER of class TYPE. This\n"
-        "                          option may be specified multiple times for\n"
-        "                          different names. NAME may be a scoped name.\n"
-        "                          When member is a string, the case can be\n"
-        "                          sensitive or insensitive (default is sensitive).\n"
-        "--dict-index DICT[,MEMBER][,{case-sensitive|case-insensitive}] \n"
-        "                          Add an index to dictionary DICT. If MEMBER is \n"
-        "                          specified, then DICT's VALUE must be a class or\n"
-        "                          a struct, and MEMBER must designate a member of\n"
-        "                          VALUE. Otherwise, the entire VALUE is used for \n"
-        "                          indexing. When the secondary key is a string, \n"
-        "                          the case can be sensitive or insensitive (default\n"
-        "                          is sensitive).\n"
-        "--output-dir DIR          Create files in the directory DIR.\n"
-        "--depend                  Generate Makefile dependencies.\n"
-        "--depend-xml              Generate dependencies in XML format.\n"
-        "--depend-file FILE        Write dependencies to FILE instead of standard output.\n"
-        "-d, --debug               Print debug messages.\n"
-        "--ice                     Allow reserved Ice prefix in Slice identifiers.\n"
-        "--underscore              Allow underscores in Slice identifiers.\n"
-        "--meta META               Define global metadata directive META.\n"
-        ;
-}
-
-int
-compile(int argc, char* argv[])
-{
-    IceUtilInternal::Options opts;
-    opts.addOpt("h", "help");
-    opts.addOpt("v", "version");
-    opts.addOpt("", "validate");
-    opts.addOpt("D", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("U", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("I", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("E");
-    opts.addOpt("", "include-dir", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "dict", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("", "index", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("", "dict-index", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-    opts.addOpt("", "output-dir", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "depend");
-    opts.addOpt("", "depend-xml");
-    opts.addOpt("", "depend-file", IceUtilInternal::Options::NeedArg, "");
-    opts.addOpt("d", "debug");
-    opts.addOpt("", "ice");
-    opts.addOpt("", "underscore");
-    opts.addOpt("", "meta", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
-
-    bool validate = false;
-    for(int i = 0; i < argc; ++i)
-    {
-        if(string(argv[i]) == "--validate")
-        {
-            validate = true;
-            break;
-        }
-    }
-
-    vector<string> args;
-    try
-    {
-        args = opts.parse(argc, const_cast<const char**>(argv));
-    }
-    catch(const IceUtilInternal::BadOptException& e)
-    {
-        getErrorStream() << argv[0] << ": error: " << e.reason << endl;
-        if(!validate)
-        {
-            usage(argv[0]);
-        }
-        return EXIT_FAILURE;
-    }
-
-    if(opts.isSet("help"))
-    {
-        usage(argv[0]);
-        return EXIT_SUCCESS;
-    }
-
-    if(opts.isSet("version"))
-    {
-        getErrorStream() << ICE_STRING_VERSION << endl;
-        return EXIT_SUCCESS;
-    }
-
-    vector<string> cppArgs;
-    vector<string> optargs = opts.argVec("D");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-    {
-        cppArgs.push_back("-D" + *i);
-    }
-
-    optargs = opts.argVec("U");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-    {
-        cppArgs.push_back("-U" + *i);
-    }
-
-    vector<string> includePaths = opts.argVec("I");
-    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
-    {
-        cppArgs.push_back("-I" + Preprocessor::normalizeIncludePath(*i));
-    }
-
-    bool preprocess = opts.isSet("E");
-
-    string include = opts.optArg("include-dir");
-
-    vector<Dict> dicts;
-    optargs = opts.argVec("dict");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-    {
-        string s = IceUtilInternal::removeWhitespace(*i);
-
-        Dict dict;
-
-        string::size_type pos;
-        pos = s.find(',');
-        if(pos != string::npos)
-        {
-            dict.name = s.substr(0, pos);
-            s.erase(0, pos + 1);
-        }
-        pos = s.find(',');
-        if(pos != string::npos)
-        {
-            dict.key = s.substr(0, pos);
-            s.erase(0, pos + 1);
-        }
-        dict.value = s;
-
-        if(dict.name.empty())
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": no name specified" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-
-        if(dict.key.empty())
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": no key specified" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-
-        if(dict.value.empty())
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": no value specified" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-
-        dicts.push_back(dict);
-    }
-
-    vector<Index> indices;
-    optargs = opts.argVec("index");
-    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-    {
-        string s = IceUtilInternal::removeWhitespace(*i);
-
-        Index index;
-
-        string::size_type pos;
-        pos = s.find(',');
-        if(pos != string::npos)
-        {
-            index.name = s.substr(0, pos);
-            s.erase(0, pos + 1);
-        }
-        pos = s.find(',');
-        if(pos != string::npos)
-        {
-            index.type = s.substr(0, pos);
-            s.erase(0, pos + 1);
-        }
-        pos = s.find(',');
-        string caseString;
-        if(pos != string::npos)
-        {
-            index.member = s.substr(0, pos);
-            s.erase(0, pos + 1);
-            caseString = s;
-        }
-        else
-        {
-            index.member = s;
-            caseString = "case-sensitive";
-        }
-
-        if(index.name.empty())
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": no name specified" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-
-        if(index.type.empty())
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": no type specified" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-
-        if(index.member.empty())
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": no member specified" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-
-        if(caseString != "case-sensitive" && caseString != "case-insensitive")
-        {
-            getErrorStream() << argv[0] << ": error: " << *i << ": the case can be `case-sensitive' or "
-                             << "`case-insensitive'" << endl;
-            if(!validate)
-            {
-                usage(argv[0]);
-            }
-            return EXIT_FAILURE;
-        }
-        index.caseSensitive = (caseString == "case-sensitive");
-
-        indices.push_back(index);
-    }
-
-    if(opts.isSet("dict-index"))
-    {
-        vector<string> optargs = opts.argVec("dict-index");
-        for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-        {
-            string s = IceUtilInternal::removeWhitespace(*i);
-
-            string dictName;
-            DictIndex index;
-            string::size_type pos;
-
-            string caseString = "case-sensitive";
-            pos = s.find(',');
-            if(pos != string::npos)
-            {
-                dictName = s.substr(0, pos);
-                s.erase(0, pos + 1);
-
-                pos = s.find(',');
-                if(pos != string::npos)
-                {
-                    index.member = s.substr(0, pos);
-                    s.erase(0, pos + 1);
-                    caseString = s;
-                }
-                else
-                {
-                    if(s == "case-sensitive" || s == "case-insensitive")
-                    {
-                        caseString = s;
-                    }
-                    else
-                    {
-                        index.member = s;
-                    }
-                }
-            }
-            else
-            {
-                dictName = s;
-            }
-
-            if(dictName.empty())
-            {
-                getErrorStream() << argv[0] << ": error: " << *i << ": no dictionary specified" << endl;
-                if(!validate)
-                {
-                    usage(argv[0]);
-                }
-                return EXIT_FAILURE;
-            }
-
-            if(caseString != "case-sensitive" && caseString != "case-insensitive")
-            {
-                getErrorStream() << argv[0] << ": error: " << *i << ": the case can be `case-sensitive' or "
-                                 << "`case-insensitive'" << endl;
-                if(!validate)
-                {
-                    usage(argv[0]);
-                }
-                return EXIT_FAILURE;
-            }
-            index.caseSensitive = (caseString == "case-sensitive");
-
-            bool found = false;
-            for(vector<Dict>::iterator p = dicts.begin(); p != dicts.end(); ++p)
-            {
-                if(p->name == dictName)
-                {
-                    if(find(p->indices.begin(), p->indices.end(), index) != p->indices.end())
-                    {
-                        getErrorStream() << argv[0] << ": error: --dict-index " << *i
-                                         << ": this dict-index is defined twice" << endl;
-                        return EXIT_FAILURE;
-                    }
-
-                    p->indices.push_back(index);
-                    found = true;
-                    break;
-                }
-            }
-            if(!found)
-            {
-                getErrorStream() << argv[0] << ": error: " << *i << ": unknown dictionary" << endl;
-                if(!validate)
-                {
-                    usage(argv[0]);
-                }
-                return EXIT_FAILURE;
-            }
-        }
-    }
-
-    string output = opts.optArg("output-dir");
-
-    bool depend = opts.isSet("depend");
-    bool dependxml = opts.isSet("depend-xml");
-
-    string dependFile = opts.optArg("depend-file");
-
-    bool debug = opts.isSet("debug");
-
-    bool ice = opts.isSet("ice");
-
-    bool underscore = opts.isSet("underscore");
-
-    StringList globalMetadata;
-    vector<string> v = opts.argVec("meta");
-    copy(v.begin(), v.end(), back_inserter(globalMetadata));
-
-    if(dicts.empty() && indices.empty() && !(depend || dependxml))
-    {
-        getErrorStream() << argv[0] << ": error: no Freeze types specified" << endl;
-        if(!validate)
-        {
-            usage(argv[0]);
-        }
-        return EXIT_FAILURE;
-    }
-
-    if(depend && dependxml)
-    {
-        getErrorStream() << argv[0] << ": error: cannot specify both --depend and --depend-xml" << endl;
-        if(!validate)
-        {
-            usage(argv[0]);
-        }
-        return EXIT_FAILURE;
-    }
-
-    if(validate)
-    {
-        return EXIT_SUCCESS;
-    }
-
-    UnitPtr u = Unit::createUnit(true, false, ice, underscore, globalMetadata);
-
-    int status = EXIT_SUCCESS;
-
-    IceUtil::CtrlCHandler ctrlCHandler;
-    ctrlCHandler.setCallback(interruptedCallback);
-
-    DependOutputUtil out(dependFile);
-    if(dependxml)
-    {
-        out.os() << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<dependencies>" << endl;
-    }
-
-    for(vector<string>::size_type idx = 0; idx < args.size(); ++idx)
-    {
-        if(depend || dependxml)
-        {
-            PreprocessorPtr icecpp = Preprocessor::create(argv[0], args[idx], cppArgs);
-            FILE* cppHandle = icecpp->preprocess(false, "-D__SLICE2FREEZEJ__");
-
-            if(cppHandle == 0)
-            {
-                out.cleanup();
-                u->destroy();
-                return EXIT_FAILURE;
-            }
-
-            status = u->parse(args[idx], cppHandle, debug);
-
-            if(status == EXIT_FAILURE)
-            {
-                out.cleanup();
-                u->destroy();
-                return EXIT_FAILURE;
-            }
-
-            if(!icecpp->printMakefileDependencies(out.os(), depend ? Preprocessor::Java : Preprocessor::SliceXML, includePaths,
-                                                  "-D__SLICE2FREEZEJ__"))
-            {
-                out.cleanup();
-                u->destroy();
-                return EXIT_FAILURE;
-            }
-
-            if(!icecpp->close())
-            {
-                out.cleanup();
-                u->destroy();
-                return EXIT_FAILURE;
-            }
-        }
-        else
-        {
-            PreprocessorPtr icecpp = Preprocessor::create(argv[0], args[idx], cppArgs);
-            FILE* cppHandle = icecpp->preprocess(false, "-DICE_COMPILER=ICE_SLICE2FREEZEJ");
-
-            if(cppHandle == 0)
-            {
-                u->destroy();
-                return EXIT_FAILURE;
-            }
-
-            if(preprocess)
-            {
-                char buf[4096];
-                while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL)
-                {
-                    if(fputs(buf, stdout) == EOF)
-                    {
-                        u->destroy();
-                        return EXIT_FAILURE;
-                    }
-                }
-            }
-            else
-            {
-                status = u->parse(args[idx], cppHandle, debug);
-            }
-
-            if(!icecpp->close())
-            {
-                u->destroy();
-                return EXIT_FAILURE;
-            }
-        }
-
-        {
-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex);
-
-            if(interrupted)
-            {
-                out.cleanup();
-                return EXIT_FAILURE;
-            }
-        }
-    }
-
-    if(dependxml)
-    {
-        out.os() << "</dependencies>\n";
-    }
-
-    if(depend || dependxml)
-    {
-        u->destroy();
-        return EXIT_SUCCESS;
-    }
-
-    if(status == EXIT_SUCCESS && !preprocess)
-    {
-        u->mergeModules();
-        u->sort();
-
-        FreezeGenerator gen(argv[0], output);
-
-        JavaGenerator::validateMetaData(u);
-
-        for(vector<Dict>::const_iterator p = dicts.begin(); p != dicts.end(); ++p)
-        {
-            try
-            {
-                gen.generate(u, *p);
-            }
-            catch(const string& ex)
-            {
-                // If a file could not be created, then cleanup any
-                // created files.
-                FileTracker::instance()->cleanup();
-                u->destroy();
-                getErrorStream() << argv[0] << ": error: " << ex << endl;
-                return EXIT_FAILURE;
-            }
-            catch(const Slice::FileException& ex)
-            {
-                // If a file could not be created, then cleanup any
-                // created files.
-                FileTracker::instance()->cleanup();
-                u->destroy();
-                getErrorStream() << argv[0] << ": error: " << ex.reason() << endl;
-                return EXIT_FAILURE;
-            }
-            catch(...)
-            {
-                FileTracker::instance()->cleanup();
-                getErrorStream() << argv[0] << ": error: unknown exception" << endl;
-                u->destroy();
-                return EXIT_FAILURE;
-            }
-        }
-
-        for(vector<Index>::const_iterator q = indices.begin(); q != indices.end(); ++q)
-        {
-            try
-            {
-                gen.generate(u, *q);
-            }
-            catch(const string& ex)
-            {
-                // If a file could not be created, then cleanup any
-                // created files.
-                FileTracker::instance()->cleanup();
-                u->destroy();
-                getErrorStream() << argv[0] << ": error: " << ex << endl;
-                return EXIT_FAILURE;
-            }
-            catch(const Slice::FileException& ex)
-            {
-                // If a file could not be created, then cleanup any
-                // created files.
-                FileTracker::instance()->cleanup();
-                u->destroy();
-                getErrorStream() << argv[0] << ": error: " << ex.reason() << endl;
-                return EXIT_FAILURE;
-            }
-            catch(...)
-            {
-                getErrorStream() << argv[0] << ": error: unknown exception" << endl;
-                FileTracker::instance()->cleanup();
-                u->destroy();
-                return EXIT_FAILURE;
-            }
-        }
-
-    }
-
-    u->destroy();
-
-    {
-        IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex);
-
-        if(interrupted)
-        {
-            FileTracker::instance()->cleanup();
-            return EXIT_FAILURE;
-        }
-    }
-
-    return status;
-}
-
-int
-main(int argc, char* argv[])
-{
-    try
-    {
-        return compile(argc, argv);
-    }
-    catch(const std::exception& ex)
-    {
-        getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const std::string& msg)
-    {
-        getErrorStream() << argv[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        getErrorStream() << argv[0] << ": error:" << msg << endl;
-        return EXIT_FAILURE;
-    }
-    catch(...)
-    {
-        getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
-        return EXIT_FAILURE;
-    }
-}
diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile
deleted file mode 100644
index cf973967d87..00000000000
--- a/cpp/src/slice2freezej/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-NAME		= $(bindir)/slice2freezej
-
-TARGETS		= $(NAME)
-
-OBJS		= Main.o
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. $(CPPFLAGS)
-
-$(NAME): $(OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK)
-
-install:: all
-	$(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/slice2freezej.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/slice2freezej/Makefile.mak b/cpp/src/slice2freezej/Makefile.mak
deleted file mode 100644
index 33430cdae41..00000000000
--- a/cpp/src/slice2freezej/Makefile.mak
+++ /dev/null
@@ -1,48 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2freezej.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= .\Main.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-RES_FILE        = Slice2FreezeJ.res
-
-$(NAME): $(OBJS) Slice2FreezeJ.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \
-		$(BASELIBS) $(RES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2FreezeJ.res
-
-install:: all
-	copy $(NAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(NAME:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/slice2freezej/Slice2FreezeJ.rc b/cpp/src/slice2freezej/Slice2FreezeJ.rc
deleted file mode 100644
index 8140ddb772b..00000000000
--- a/cpp/src/slice2freezej/Slice2FreezeJ.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "Slice to Freeze for Java Translator\0"
-            VALUE "FileVersion", "3.6.3\0"
-            VALUE "InternalName", "slice2freezej\0"
-            VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
-            VALUE "OriginalFilename", "slice2freezej.exe\0"
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
diff --git a/cpp/src/slice2html/.depend.mak b/cpp/src/slice2html/.depend.mak
deleted file mode 100755
index b43685c9438..00000000000
--- a/cpp/src/slice2html/.depend.mak
+++ /dev/null
@@ -1,38 +0,0 @@
-
-Gen.obj: \
-	Gen.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "Gen.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-
-Main.obj: \
-	Main.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Slice\Preprocessor.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "Gen.h" \
diff --git a/cpp/src/slice2html/.gitignore b/cpp/src/slice2html/.gitignore
deleted file mode 100644
index 720f44c7047..00000000000
--- a/cpp/src/slice2html/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
diff --git a/cpp/src/slice2html/Makefile b/cpp/src/slice2html/Makefile
deleted file mode 100644
index 8b8b40307a5..00000000000
--- a/cpp/src/slice2html/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-NAME		= $(bindir)/slice2html
-
-TARGETS		= $(NAME)
-
-OBJS		= Gen.o \
-		  Main.o
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. $(CPPFLAGS)
-
-$(NAME): $(OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK)
-
-install:: all
-	$(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/slice2html.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/slice2html/Makefile.mak b/cpp/src/slice2html/Makefile.mak
deleted file mode 100644
index de9113f1c90..00000000000
--- a/cpp/src/slice2html/Makefile.mak
+++ /dev/null
@@ -1,50 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2html.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= .\Gen.obj \
-		  .\Main.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-RES_FILE        = Slice2Html.res
-
-$(NAME): $(OBJS) Slice2Html.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \
-		$(BASELIBS) $(RES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Html.res
-
-install:: all
-	copy $(NAME) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(NAME:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/slice2html/Slice2Html.rc b/cpp/src/slice2html/Slice2Html.rc
index 2e833c2e8ab..6c40ef9f06c 100644
--- a/cpp/src/slice2html/Slice2Html.rc
+++ b/cpp/src/slice2html/Slice2Html.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to HTML Translator\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "slice2html\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2html.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2html/msbuild/packages.config b/cpp/src/slice2html/msbuild/packages.config
new file mode 100644
index 00000000000..88735dc0077
--- /dev/null
+++ b/cpp/src/slice2html/msbuild/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" />
+  <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/cpp/src/slice2html/msbuild/slice2html.vcxproj b/cpp/src/slice2html/msbuild/slice2html.vcxproj
new file mode 100644
index 00000000000..3e833916756
--- /dev/null
+++ b/cpp/src/slice2html/msbuild/slice2html.vcxproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B8E063CB-1481-42CA-92F3-E96770EDD70E}</ProjectGuid>
+    <RootNamespace>slice2html</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Gen.cpp" />
+    <ClCompile Include="..\Main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Slice2Html.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Gen.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj">
+      <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj">
+      <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" />
+    <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/slice2html/msbuild/slice2html.vcxproj.filters b/cpp/src/slice2html/msbuild/slice2html.vcxproj.filters
new file mode 100644
index 00000000000..d600de331c4
--- /dev/null
+++ b/cpp/src/slice2html/msbuild/slice2html.vcxproj.filters
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{F6FF7CE4-9FEF-459C-BABE-FE527CA3005E}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{C6A888C4-61DC-4326-A831-EDEFF0777A11}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{F329DD73-60C7-4809-A77C-2D505D8674EE}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Gen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Slice2Html.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Gen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/slice2java/.depend.mak b/cpp/src/slice2java/.depend.mak
deleted file mode 100755
index b5c1e55c3f5..00000000000
--- a/cpp/src/slice2java/.depend.mak
+++ /dev/null
@@ -1,43 +0,0 @@
-
-Gen.obj: \
-	Gen.cpp \
-    "Gen.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Slice\JavaUtil.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\Slice\Checksum.h" \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
-
-Main.obj: \
-	Main.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Slice\Preprocessor.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "Gen.h" \
-    "$(includedir)\Slice\JavaUtil.h" \
-    "$(includedir)\Slice\Checksum.h" \
diff --git a/cpp/src/slice2java/.gitignore b/cpp/src/slice2java/.gitignore
deleted file mode 100644
index 720f44c7047..00000000000
--- a/cpp/src/slice2java/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index e0e4df2aba7..3e526d761ff 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -14,7 +14,7 @@
 #include <IceUtil/Iterator.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/InputUtil.h>
-#include <IceUtil/Unicode.h>
+#include <IceUtil/StringConverter.h>
 #include <cstring>
 
 #include <limits>
@@ -39,22 +39,7 @@ u16CodePoint(unsigned short value)
 void
 writeU8Buffer(const vector<unsigned char>& u8buffer, ::IceUtilInternal::Output& out)
 {
-    vector<unsigned short> u16buffer;
-    IceUtilInternal::ConversionResult result = convertUTF8ToUTF16(u8buffer, u16buffer, IceUtil::lenientConversion);
-    switch(result)
-    {
-        case conversionOK:
-            break;
-        case sourceExhausted:
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source exhausted");
-        case sourceIllegal:
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source illegal");
-        default:
-        {
-            assert(0);
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
-        }
-    }
+    vector<unsigned short> u16buffer = toUTF16(u8buffer);
 
     for(vector<unsigned short>::const_iterator c = u16buffer.begin(); c != u16buffer.end(); ++c)
     {
@@ -163,6 +148,7 @@ initValue(const TypePtr& p)
         case Builtin::KindObject:
         case Builtin::KindObjectProxy:
         case Builtin::KindLocalObject:
+        case Builtin::KindValue:
         {
             return "null";
         }
@@ -799,7 +785,7 @@ Slice::JavaVisitor::writeMarshalDataMember(Output& out, const string& package, c
     }
     else
     {
-        out << nl << "if(__has_" << member->name() << " && __os.writeOpt(" << member->tag() << ", "
+        out << nl << "if(__has_" << member->name() << " && __os.writeOptional(" << member->tag() << ", "
             << getOptionalFormat(member->type()) << "))";
         out << sb;
         writeMarshalUnmarshalCode(out, package, member->type(), OptionalMember, false, 0, fixKwd(member->name()), true,
@@ -831,7 +817,7 @@ Slice::JavaVisitor::writeUnmarshalDataMember(Output& out, const string& package,
     }
     else
     {
-        out << nl << "if(__has_" << member->name() << " = __is.readOpt(" << member->tag() << ", "
+        out << nl << "if(__has_" << member->name() << " = __is.readOptional(" << member->tag() << ", "
             << getOptionalFormat(member->type()) << "))";
         out << sb;
         writeMarshalUnmarshalCode(out, package, member->type(), OptionalMember, false, 0, fixKwd(member->name()), false,
@@ -841,66 +827,10 @@ Slice::JavaVisitor::writeUnmarshalDataMember(Output& out, const string& package,
 }
 
 void
-Slice::JavaVisitor::writeStreamMarshalDataMember(Output& out, const string& package, const DataMemberPtr& member,
-                                                 int& iter)
-{
-    if(!member->optional())
-    {
-        writeStreamMarshalUnmarshalCode(out, package, member->type(), false, 0, fixKwd(member->name()), true,
-                                        iter, false, member->getMetaData());
-    }
-    else
-    {
-        out << nl << "if(__has_" << member->name() << " && __outS.writeOptional(" << member->tag() << ", "
-            << getOptionalFormat(member->type()) << "))";
-        out << sb;
-        writeStreamMarshalUnmarshalCode(out, package, member->type(), true, member->tag(), fixKwd(member->name()),
-                                        true, iter, false, member->getMetaData());
-        out << eb;
-    }
-}
-
-void
-Slice::JavaVisitor::writeStreamUnmarshalDataMember(Output& out, const string& package, const DataMemberPtr& member,
-                                                   int& iter, bool needPatcher, int& patchIter)
-{
-    string patchParams;
-    if(needPatcher)
-    {
-        BuiltinPtr builtin = BuiltinPtr::dynamicCast(member->type());
-        if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(member->type()))
-        {
-            ostringstream ostr;
-            ostr << "new Patcher(" << patchIter++ << ')';
-            patchParams = ostr.str();
-        }
-    }
-
-    if(!member->optional())
-    {
-        writeStreamMarshalUnmarshalCode(out, package, member->type(), false, 0, fixKwd(member->name()), false,
-                                        iter, false, member->getMetaData(), patchParams);
-    }
-    else
-    {
-        out << nl << "if(__has_" << member->name() << " = __inS.readOptional(" << member->tag() << ", "
-            << getOptionalFormat(member->type()) << "))";
-        out << sb;
-        writeStreamMarshalUnmarshalCode(out, package, member->type(), true, member->tag(), fixKwd(member->name()),
-                                        false, iter, false, member->getMetaData(), patchParams);
-        out << eb;
-    }
-}
-
-void
 Slice::JavaVisitor::writePatcher(Output& out, const string& package, const DataMemberList& classMembers,
-                                 const DataMemberList& optionalMembers, bool stream)
+                                 const DataMemberList& optionalMembers)
 {
-    out << sp << nl << "private class Patcher implements IceInternal.Patcher";
-    if(stream)
-    {
-        out << ", Ice.ReadObjectCallback";
-    }
+    out << sp << nl << "private class Patcher implements Ice.ReadValueCallback";
     out << sb;
     if(classMembers.size() > 1)
     {
@@ -910,7 +840,7 @@ Slice::JavaVisitor::writePatcher(Output& out, const string& package, const DataM
         out << eb;
     }
 
-    out << sp << nl << "public void" << nl << "patch(Ice.Object v)";
+    out << sp << nl << "public void" << nl << "valueReady(Ice.Object v)";
     out << sb;
     if(classMembers.size() > 1)
     {
@@ -1047,14 +977,6 @@ Slice::JavaVisitor::writePatcher(Output& out, const string& package, const DataM
     }
     out << eb;
 
-    if(stream)
-    {
-        out << sp << nl << "public void" << nl << "invoke(Ice.Object v)";
-        out << sb;
-        out << nl << "patch(v);";
-        out << eb;
-    }
-
     if(classMembers.size() > 1)
     {
         out << sp << nl << "private int __member;";
@@ -1065,7 +987,7 @@ Slice::JavaVisitor::writePatcher(Output& out, const string& package, const DataM
 }
 
 void
-Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr& p, bool stream)
+Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr& p)
 {
     string name = fixKwd(p->name());
     string package = getPackage(p);
@@ -1333,7 +1255,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
                 //
                 // Unmarshal 'in' parameters.
                 //
-                out << nl << "IceInternal.BasicStream __is = __inS.startReadParams();";
+                out << nl << "Ice.InputStream __is = __inS.startReadParams();";
                 for(ParamDeclList::const_iterator pli = inParams.begin(); pli != inParams.end(); ++pli)
                 {
                     TypePtr paramType = (*pli)->type();
@@ -1365,7 +1287,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
                 writeMarshalUnmarshalParams(out, package, inParams, 0, iter, false, true, true);
                 if(op->sendsClasses(false))
                 {
-                    out << nl << "__is.readPendingObjects();";
+                    out << nl << "__is.readPendingValues();";
                 }
                 out << nl << "__inS.endReadParams();";
             }
@@ -1425,12 +1347,12 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
             //
             if(!outParams.empty() || ret)
             {
-                out << nl << "IceInternal.BasicStream __os = __inS.__startWriteParams("
+                out << nl << "Ice.OutputStream __os = __inS.__startWriteParams("
                     << opFormatTypeToString(op) << ");";
                 writeMarshalUnmarshalParams(out, package, outParams, op, iter, true, optionalMapping, true);
                 if(op->returnsClasses(false))
                 {
-                    out << nl << "__os.writePendingObjects();";
+                    out << nl << "__os.writePendingValues();";
                 }
                 out << nl << "__inS.__endWriteParams(true);";
             }
@@ -1480,7 +1402,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
                 //
                 // Unmarshal 'in' parameters.
                 //
-                out << nl << "IceInternal.BasicStream __is = __inS.startReadParams();";
+                out << nl << "Ice.InputStream __is = __inS.startReadParams();";
                 iter = 0;
                 for(ParamDeclList::const_iterator pli = inParams.begin(); pli != inParams.end(); ++pli)
                 {
@@ -1512,7 +1434,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
                 writeMarshalUnmarshalParams(out, package, inParams, 0, iter, false, true, true);
                 if(op->sendsClasses(false))
                 {
-                    out << nl << "__is.readPendingObjects();";
+                    out << nl << "__is.readPendingValues();";
                 }
                 out << nl << "__inS.endReadParams();";
             }
@@ -1725,48 +1647,24 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
 
     if(preserved && !basePreserved)
     {
-        out << sp << nl << "public void __write(IceInternal.BasicStream __os)";
+        out << sp << nl << "public void __write(Ice.OutputStream __os)";
         out << sb;
-        out << nl << "__os.startWriteObject(__slicedData);";
+        out << nl << "__os.startValue(__slicedData);";
         out << nl << "__writeImpl(__os);";
-        out << nl << "__os.endWriteObject();";
+        out << nl << "__os.endValue();";
         out << eb;
 
-        out << sp << nl << "public void __read(IceInternal.BasicStream __is)";
+        out << sp << nl << "public void __read(Ice.InputStream __is)";
         out << sb;
-        out << nl << "__is.startReadObject();";
+        out << nl << "__is.startValue();";
         out << nl << "__readImpl(__is);";
-        out << nl << "__slicedData = __is.endReadObject(true);";
+        out << nl << "__slicedData = __is.endValue(true);";
         out << eb;
-
-        if(stream)
-        {
-            out << sp << nl << "public void __write(Ice.OutputStream __outS)";
-            out << sb;
-            if(preserved)
-            {
-                out << nl << "__outS.startObject(__slicedData);";
-            }
-            else
-            {
-                out << nl << "__outS.startObject(null);";
-            }
-            out << nl << "__writeImpl(__outS);";
-            out << nl << "__outS.endObject();";
-            out << eb;
-
-            out << sp << nl << "public void __read(Ice.InputStream __inS)";
-            out << sb;
-            out << nl << "__inS.startObject();";
-            out << nl << "__readImpl(__inS);";
-            out << nl << "__slicedData = __inS.endObject(true);";
-            out << eb;
-        }
     }
 
-    out << sp << nl << "protected void __writeImpl(IceInternal.BasicStream __os)";
+    out << sp << nl << "protected void __writeImpl(Ice.OutputStream __os)";
     out << sb;
-    out << nl << "__os.startWriteSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");";
+    out << nl << "__os.startSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");";
     iter = 0;
     for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
     {
@@ -1779,7 +1677,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
     {
         writeMarshalDataMember(out, package, *d, iter);
     }
-    out << nl << "__os.endWriteSlice();";
+    out << nl << "__os.endSlice();";
     if(base)
     {
         out << nl << "super.__writeImpl(__os);";
@@ -1791,12 +1689,12 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
 
     if(classMembers.size() != 0)
     {
-        writePatcher(out, package, classMembers, optionalMembers, stream);
+        writePatcher(out, package, classMembers, optionalMembers);
     }
 
-    out << sp << nl << "protected void __readImpl(IceInternal.BasicStream __is)";
+    out << sp << nl << "protected void __readImpl(Ice.InputStream __is)";
     out << sb;
-    out << nl << "__is.startReadSlice();";
+    out << nl << "__is.startSlice();";
 
     int patchIter = 0;
     const bool needCustomPatcher = classMembers.size() > 1;
@@ -1812,61 +1710,13 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
     {
         writeUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, patchIter);
     }
-    out << nl << "__is.endReadSlice();";
+    out << nl << "__is.endSlice();";
     if(base)
     {
         out << nl << "super.__readImpl(__is);";
     }
     out << eb;
 
-    if(stream)
-    {
-        out << sp << nl << "protected void __writeImpl(Ice.OutputStream __outS)";
-        out << sb;
-        out << nl << "__outS.startSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");";
-        iter = 0;
-        for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
-        {
-            if(!(*d)->optional())
-            {
-                writeStreamMarshalDataMember(out, package, *d, iter);
-            }
-        }
-        for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
-        {
-            writeStreamMarshalDataMember(out, package, *d, iter);
-        }
-        out << nl << "__outS.endSlice();";
-        if(base)
-        {
-            out << nl << "super.__writeImpl(__outS);";
-        }
-        out << eb;
-
-        out << sp << nl << "protected void __readImpl(Ice.InputStream __inS)";
-        out << sb;
-        out << nl << "__inS.startSlice();";
-        iter = 0;
-        patchIter = 0;
-        for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
-        {
-            if(!(*d)->optional())
-            {
-                writeStreamUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, patchIter);
-            }
-        }
-        for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
-        {
-            writeStreamUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, patchIter);
-        }
-        out << nl << "__inS.endSlice();";
-        if(base)
-        {
-            out << nl << "super.__readImpl(__inS);";
-        }
-        out << eb;
-    }
-
     if(preserved && !basePreserved)
     {
         out << sp << nl << "protected Ice.SlicedData __slicedData;";
@@ -2076,6 +1926,7 @@ Slice::JavaVisitor::writeConstantValue(Output& out, const TypePtr& type, const S
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     out << value;
                     break;
@@ -2569,7 +2420,7 @@ Slice::Gen::~Gen()
 }
 
 void
-Slice::Gen::generate(const UnitPtr& p, bool stream)
+Slice::Gen::generate(const UnitPtr& p)
 {
     JavaGenerator::validateMetaData(p);
 
@@ -2579,7 +2430,7 @@ Slice::Gen::generate(const UnitPtr& p, bool stream)
     PackageVisitor packageVisitor(_dir);
     p->visit(&packageVisitor, false);
 
-    TypesVisitor typesVisitor(_dir, stream);
+    TypesVisitor typesVisitor(_dir);
     p->visit(&typesVisitor, false);
 
     CompactIdVisitor compactIdVisitor(_dir);
@@ -2588,13 +2439,13 @@ Slice::Gen::generate(const UnitPtr& p, bool stream)
     HolderVisitor holderVisitor(_dir);
     p->visit(&holderVisitor, false);
 
-    HelperVisitor helperVisitor(_dir, stream);
+    HelperVisitor helperVisitor(_dir);
     p->visit(&helperVisitor, false);
 
     ProxyVisitor proxyVisitor(_dir);
     p->visit(&proxyVisitor, false);
 
-    DispatcherVisitor dispatcherVisitor(_dir, stream);
+    DispatcherVisitor dispatcherVisitor(_dir);
     p->visit(&dispatcherVisitor, false);
 
     AsyncVisitor asyncVisitor(_dir);
@@ -3056,8 +2907,8 @@ Slice::Gen::PackageVisitor::visitModuleStart(const ModulePtr& p)
     return false;
 }
 
-Slice::Gen::TypesVisitor::TypesVisitor(const string& dir, bool stream) :
-    JavaVisitor(dir), _stream(stream)
+Slice::Gen::TypesVisitor::TypesVisitor(const string& dir) :
+    JavaVisitor(dir)
 {
 }
 
@@ -3128,7 +2979,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
         out << "class " << fixKwd(name);
         out.useCurrentPosAsIndent();
 
-	StringList implements;
+        StringList implements;
         bool implementsOnNewLine = true;
 
         if(bases.empty() || bases.front()->isInterface())
@@ -3136,7 +2987,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
             if(p->isLocal())
             {
                 implementsOnNewLine = false;
-		implements.push_back("java.lang.Cloneable");
+        implements.push_back("java.lang.Cloneable");
             }
             else
             {
@@ -3245,9 +3096,9 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
             out << ';';
 
             //
-            // Generate asynchronous API for local operations marked with "async" metadata.
+            // Generate asynchronous API for local operations marked with "async-oneway" metadata.
             //
-            if(p->hasMetaData("async") || op->hasMetaData("async"))
+            if(p->hasMetaData("async-oneway") || op->hasMetaData("async-oneway"))
             {
                 vector<string> inParams = getInOutParams(op, package, InParam, true, true);
 
@@ -3449,20 +3300,17 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
     if(!p->isInterface() && p->allOperations().size() == 0 && !p->isLocal())
     {
         out << sp;
-        out << nl << "private static class __F implements Ice.ObjectFactory";
+        out << nl << "private static class __F implements Ice.ValueFactory";
         out << sb;
         out << nl << "public Ice.Object create(String type)";
         out << sb;
         out << nl << "assert(type.equals(ice_staticId()));";
         out << nl << "return new " << fixKwd(name) << "();";
         out << eb;
-        out << sp << nl << "public void destroy()";
-        out << sb;
-        out << eb;
         out << eb;
-        out << nl << "private static Ice.ObjectFactory _factory = new __F();";
+        out << nl << "private static Ice.ValueFactory _factory = new __F();";
         out << sp;
-        out << nl << "public static Ice.ObjectFactory" << nl << "ice_factory()";
+        out << nl << "public static Ice.ValueFactory" << nl << "ice_factory()";
         out << sb;
         out << nl << "return _factory;";
         out << eb;
@@ -3473,7 +3321,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
     //
     if(!p->isInterface() && !p->isLocal())
     {
-        writeDispatchAndMarshalling(out, p, _stream);
+        writeDispatchAndMarshalling(out, p);
     }
 
     return true;
@@ -3495,28 +3343,28 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
 
     if(!p->isInterface())
     {
-	out << sp << nl << "public " << name << nl << "clone()";
-	out << sb;
-
-	if(p->isLocal() && !baseClass)
-	{
-	    out << nl << name << " c = null;";
-	    out << nl << "try";
-	    out << sb;
-	    out << nl << "c = (" << name << ")super.clone();";
-	    out << eb;
-	    out << nl << "catch(CloneNotSupportedException ex)";
-	    out << sb;
-	    out << nl << "assert false; // impossible";
-	    out << eb;
-	    out << nl << "return c;";
-
-	}
-	else
-	{
-	    out << nl << "return (" << name << ")super.clone();";
-	}
-	out << eb;
+        out << sp << nl << "public " << name << nl << "clone()";
+        out << sb;
+
+        if(p->isLocal() && !baseClass)
+        {
+            out << nl << name << " c = null;";
+            out << nl << "try";
+            out << sb;
+            out << nl << "c = (" << name << ")super.clone();";
+            out << eb;
+            out << nl << "catch(CloneNotSupportedException ex)";
+            out << sb;
+            out << nl << "assert false; // impossible";
+            out << eb;
+            out << nl << "return c;";
+
+        }
+        else
+        {
+            out << nl << "return (" << name << ")super.clone();";
+        }
+        out << eb;
     }
 
     if(p->isInterface() && !p->isLocal())
@@ -3828,9 +3676,9 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
         }
     }
 
-    out << sp << nl << "public String" << nl << "ice_name()";
+    out << sp << nl << "public String" << nl << "ice_id()";
     out << sb;
-    out << nl << "return \"" << scoped.substr(2) << "\";";
+    out << nl << "return \"" << scoped << "\";";
     out << eb;
 
     return true;
@@ -3857,41 +3705,24 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         if(preserved && !basePreserved)
         {
 
-            out << sp << nl << "public void" << nl << "__write(IceInternal.BasicStream __os)";
+            out << sp << nl << "public void" << nl << "__write(Ice.OutputStream __os)";
             out << sb;
-            out << nl << "__os.startWriteException(__slicedData);";
+            out << nl << "__os.startException(__slicedData);";
             out << nl << "__writeImpl(__os);";
-            out << nl << "__os.endWriteException();";
+            out << nl << "__os.endException();";
             out << eb;
 
-            out << sp << nl << "public void" << nl << "__read(IceInternal.BasicStream __is)";
+            out << sp << nl << "public void" << nl << "__read(Ice.InputStream __is)";
             out << sb;
-            out << nl << "__is.startReadException();";
+            out << nl << "__is.startException();";
             out << nl << "__readImpl(__is);";
-            out << nl << "__slicedData = __is.endReadException(true);";
+            out << nl << "__slicedData = __is.endException(true);";
             out << eb;
-
-            if(_stream)
-            {
-                out << sp << nl << "public void" << nl << "__write(Ice.OutputStream __outS)";
-                out << sb;
-                out << nl << "__outS.startException(__slicedData);";
-                out << nl << "__writeImpl(__outS);";
-                out << nl << "__outS.endException();";
-                out << eb;
-
-                out << sp << nl << "public void" << nl << "__read(Ice.InputStream __inS)";
-                out << sb;
-                out << nl << "__inS.startException();";
-                out << nl << "__readImpl(__inS);";
-                out << nl << "__slicedData = __inS.endException(true);";
-                out << eb;
-            }
         }
 
-        out << sp << nl << "protected void" << nl << "__writeImpl(IceInternal.BasicStream __os)";
+        out << sp << nl << "protected void" << nl << "__writeImpl(Ice.OutputStream __os)";
         out << sb;
-        out << nl << "__os.startWriteSlice(\"" << scoped << "\", -1, " << (!base ? "true" : "false") << ");";
+        out << nl << "__os.startSlice(\"" << scoped << "\", -1, " << (!base ? "true" : "false") << ");";
         iter = 0;
         for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
         {
@@ -3904,7 +3735,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         {
             writeMarshalDataMember(out, package, *d, iter);
         }
-        out << nl << "__os.endWriteSlice();";
+        out << nl << "__os.endSlice();";
         if(base)
         {
             out << nl << "super.__writeImpl(__os);";
@@ -3916,11 +3747,11 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 
         if(classMembers.size() != 0)
         {
-            writePatcher(out, package, classMembers, optionalMembers, _stream);
+            writePatcher(out, package, classMembers, optionalMembers);
         }
-        out << sp << nl << "protected void" << nl << "__readImpl(IceInternal.BasicStream __is)";
+        out << sp << nl << "protected void" << nl << "__readImpl(Ice.InputStream __is)";
         out << sb;
-        out << nl << "__is.startReadSlice();";
+        out << nl << "__is.startSlice();";
         iter = 0;
         int patchIter = 0;
         const bool needCustomPatcher = classMembers.size() > 1;
@@ -3935,64 +3766,16 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         {
             writeUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, patchIter);
         }
-        out << nl << "__is.endReadSlice();";
+        out << nl << "__is.endSlice();";
         if(base)
         {
             out << nl << "super.__readImpl(__is);";
         }
         out << eb;
 
-        if(_stream)
-        {
-            out << sp << nl << "protected void" << nl << "__writeImpl(Ice.OutputStream __outS)";
-            out << sb;
-            out << nl << "__outS.startSlice(\"" << scoped << "\", -1, " << (!base ? "true" : "false") << ");";
-            iter = 0;
-            for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
-            {
-                if(!(*d)->optional())
-                {
-                    writeStreamMarshalDataMember(out, package, *d, iter);
-                }
-            }
-            for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
-            {
-                writeStreamMarshalDataMember(out, package, *d, iter);
-            }
-            out << nl << "__outS.endSlice();";
-            if(base)
-            {
-                out << nl << "super.__writeImpl(__outS);";
-            }
-            out << eb;
-
-            out << sp << nl << "protected void" << nl << "__readImpl(Ice.InputStream __inS)";
-            out << sb;
-            out << nl << "__inS.startSlice();";
-            iter = 0;
-            patchIter = 0;
-            for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
-            {
-                if(!(*d)->optional())
-                {
-                    writeStreamUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, patchIter);
-                }
-            }
-            for(DataMemberList::const_iterator d = optionalMembers.begin(); d != optionalMembers.end(); ++d)
-            {
-                writeStreamUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, patchIter);
-            }
-            out << nl << "__inS.endSlice();";
-            if(base)
-            {
-                out << nl << "super.__readImpl(__inS);";
-            }
-            out << eb;
-        }
-
         if(p->usesClasses(false))
         {
-	    if(!base || (base && !base->usesClasses(false)))
+            if(!base || (base && !base->usesClasses(false)))
             {
                 out << sp << nl << "public boolean" << nl << "__usesClasses()";
                 out << sb;
@@ -4153,6 +3936,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     out << nl << "if(" << memberName << " != _r." << memberName << ')';
                     out << sb;
@@ -4248,7 +4032,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
 
     if(!p->isLocal())
     {
-        out << sp << nl << "public void" << nl << "__write(IceInternal.BasicStream __os)";
+        out << sp << nl << "public void" << nl << "__write(Ice.OutputStream __os)";
         out << sb;
         iter = 0;
         for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
@@ -4261,10 +4045,10 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
 
         if(classMembers.size() != 0)
         {
-            writePatcher(out, package, classMembers, DataMemberList(), _stream);
+            writePatcher(out, package, classMembers, DataMemberList());
         }
 
-        out << sp << nl << "public void" << nl << "__read(IceInternal.BasicStream __is)";
+        out << sp << nl << "public void" << nl << "__read(Ice.InputStream __is)";
         out << sb;
         iter = 0;
         int patchIter = 0;
@@ -4275,29 +4059,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         }
         out << eb;
 
-        if(_stream)
-        {
-            out << sp << nl << "public void" << nl << "ice_write(Ice.OutputStream __outS)";
-            out << sb;
-            iter = 0;
-            for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
-            {
-                writeStreamMarshalDataMember(out, package, *d, iter);
-            }
-            out << eb;
-
-            out << sp << nl << "public void" << nl << "ice_read(Ice.InputStream __inS)";
-            out << sb;
-            iter = 0;
-            patchIter = 0;
-            for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d)
-            {
-                writeStreamUnmarshalDataMember(out, package, *d, iter, needCustomPatcher, patchIter);
-            }
-            out << eb;
-        }
-
-        out << sp << nl << "static public void" << nl << "__write(IceInternal.BasicStream __os, " << name << " __v)";
+        out << sp << nl << "static public void" << nl << "write(Ice.OutputStream __os, " << name << " __v)";
         out << sb;
         out << nl << "if(__v == null)";
         out << sb;
@@ -4309,7 +4071,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         out << eb;
         out << eb;
 
-        out << sp << nl << "static public " << name << nl << "__read(IceInternal.BasicStream __is, " << name << " __v)";
+        out << sp << nl << "static public " << name << nl << "read(Ice.InputStream __is, " << name << " __v)";
         out << sb;
         out << nl << "if(__v == null)";
         out << sb;
@@ -4319,31 +4081,6 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         out << nl << "return __v;";
         out << eb;
 
-        if(_stream)
-        {
-            out << sp << nl << "static public void" << nl << "ice_write(Ice.OutputStream __outS, " << name << " __v)";
-            out << sb;
-            out << nl << "if(__v == null)";
-            out << sb;
-            out << nl << "__nullMarshalValue.ice_write(__outS);";
-            out << eb;
-            out << nl << "else";
-            out << sb;
-            out << nl << "__v.ice_write(__outS);";
-            out << eb;
-            out << eb;
-
-            out << sp << nl << "static public " << name << nl << "ice_read(Ice.InputStream __inS, " << name << " __v)";
-            out << sb;
-            out << nl << "if(__v == null)";
-            out << sb;
-            out << nl << " __v = new " << name << "();";
-            out << eb;
-            out << nl << "__v.ice_read(__inS);";
-            out << nl << "return __v;";
-            out << eb;
-        }
-
         out << nl << nl << "private static final " << name << " __nullMarshalValue = new " << name << "();";
     }
 
@@ -4713,12 +4450,12 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
 
     if(!p->isLocal())
     {
-        out << sp << nl << "public void" << nl << "__write(IceInternal.BasicStream __os)";
+        out << sp << nl << "public void" << nl << "__write(Ice.OutputStream __os)";
         out << sb;
         out << nl << "__os.writeEnum(value(), " << p->maxValue() << ");";
         out << eb;
 
-        out << sp << nl << "public static void" << nl << "__write(IceInternal.BasicStream __os, " << name << " __v)";
+        out << sp << nl << "public static void" << nl << "write(Ice.OutputStream __os, " << name << " __v)";
         out << sb;
         out << nl << "if(__v == null)";
         out << sb;
@@ -4731,38 +4468,12 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
         out << eb;
         out << eb;
 
-        out << sp << nl << "public static " << name << nl << "__read(IceInternal.BasicStream __is)";
+        out << sp << nl << "public static " << name << nl << "read(Ice.InputStream __is)";
         out << sb;
         out << nl << "int __v = __is.readEnum(" << p->maxValue() << ");";
         out << nl << "return __validate(__v);";
         out << eb;
 
-        if(_stream)
-        {
-            out << sp << nl << "public void" << nl << "ice_write(Ice.OutputStream __outS)";
-            out << sb;
-            out << nl << "__outS.writeEnum(value(), " << p->maxValue() << ");";
-            out << eb;
-
-            out << sp << nl << "public static void" << nl << "ice_write(Ice.OutputStream __outS, " << name << " __v)";
-            out << sb;
-            out << nl << "if(__v == null)";
-            out << sb;
-            out << nl << "__outS.writeEnum(" << absolute << '.' << firstEnum << ".value(), " << p->maxValue() << ");";
-            out << eb;
-            out << nl << "else";
-            out << sb;
-            out << nl << "__outS.writeEnum(__v.value(), " << p->maxValue() << ");";
-            out << eb;
-            out << eb;
-
-            out << sp << nl << "public static " << name << nl << "ice_read(Ice.InputStream __inS)";
-            out << sb;
-            out << nl << "int __v = __inS.readEnum(" << p->maxValue() << ");";
-            out << nl << "return __validate(__v);";
-            out << eb;
-        }
-
         out << sp << nl << "private static " << name
             << nl << "__validate(int __v)";
         out << sb;
@@ -4960,7 +4671,7 @@ Slice::Gen::HolderVisitor::writeHolder(const TypePtr& p)
         out << eb;
 
         out << sp << nl << "public void";
-        out << nl << "patch(Ice.Object v)";
+        out << nl << "valueReady(Ice.Object v)";
         out << sb;
         out << nl << "if(v == null || v instanceof " << typeS << ")";
         out << sb;
@@ -5004,8 +4715,8 @@ Slice::Gen::HolderVisitor::writeHolder(const TypePtr& p)
     close();
 }
 
-Slice::Gen::HelperVisitor::HelperVisitor(const string& dir, bool stream) :
-    JavaVisitor(dir), _stream(stream)
+Slice::Gen::HelperVisitor::HelperVisitor(const string& dir) :
+    JavaVisitor(dir)
 {
 }
 
@@ -5117,13 +4828,13 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
             }
             out << nl << "catch(Ice.UserException __ex)";
             out << sb;
-            out << nl << "throw new Ice.UnknownUserException(__ex.ice_name(), __ex);";
+            out << nl << "throw new Ice.UnknownUserException(__ex.ice_id(), __ex);";
             out << eb;
             out << eb;
 
             if(ret || !outParams.empty())
             {
-                out << nl << "IceInternal.BasicStream __is = __result.startReadParams();";
+                out << nl << "Ice.InputStream __is = __result.startReadParams();";
                 const ParamDeclList paramList = op->parameters();
                 ParamDeclList pl;
                 for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
@@ -5136,7 +4847,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
                 writeMarshalUnmarshalParams(out, package, pl, op, iter, false, true);
                 if(op->returnsClasses(false))
                 {
-                    out << nl << "__is.readPendingObjects();";
+                    out << nl << "__is.readPendingValues();";
                 }
                 out << nl << "__result.endReadParams();";
             }
@@ -5374,12 +5085,12 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
     out << nl << "return __ids[" << scopedPos << "];";
     out << eb;
 
-    out << sp << nl << "public static void __write(IceInternal.BasicStream __os, " << name << "Prx v)";
+    out << sp << nl << "public static void write(Ice.OutputStream __os, " << name << "Prx v)";
     out << sb;
     out << nl << "__os.writeProxy(v);";
     out << eb;
 
-    out << sp << nl << "public static " << name << "Prx __read(IceInternal.BasicStream __is)";
+    out << sp << nl << "public static " << name << "Prx read(Ice.InputStream __is)";
     out << sb;
     out << nl << "Ice.ObjectPrx proxy = __is.readProxy();";
     out << nl << "if(proxy != null)";
@@ -5391,45 +5102,6 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
     out << nl << "return null;";
     out << eb;
 
-    if(_stream)
-    {
-        out << sp;
-        writeDocComment(out, "",
-                        "Writes the proxy to the stream.\n"
-                        "@param __outS The output stream.\n"
-                        "@param v The proxy to write. A null value is legal.");
-        out << nl << "public static void write(Ice.OutputStream __outS, " << name << "Prx v)";
-        out << sb;
-        out << nl << "__outS.writeProxy(v);";
-        out << eb;
-
-        out << sp;
-        writeDocComment(out, "",
-                        "Reads a proxy from the stream.\n"
-                        "@param __inS The input stream.\n"
-                        "@return The proxy, which may be null.");
-        out << nl << "public static " << name << "Prx read(Ice.InputStream __inS)";
-        out << sb;
-        out << nl << "Ice.ObjectPrx proxy = __inS.readProxy();";
-        out << nl << "if(proxy != null)";
-        out << sb;
-        out << nl << name << "PrxHelper result = new " << name << "PrxHelper();";
-        out << nl << "result.__copyFrom(proxy);";
-        out << nl << "return result;";
-        out << eb;
-        out << nl << "return null;";
-        out << eb;
-
-        out << sp;
-        writeDocComment(out, "",
-                        "Provides the optional format for a proxy of this type.\n"
-                        "@return The optional format.");
-        out << nl << "public static Ice.OptionalFormat optionalFormat()";
-        out << sb;
-        out << nl << "return Ice.OptionalFormat.FSize;";
-        out << eb;
-    }
-
     //
     // Avoid serialVersionUID warnings for Proxy Helper classes.
     //
@@ -5438,93 +5110,6 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
 
     close();
 
-    if(_stream)
-    {
-        //
-        // Class helper.
-        //
-        open(getAbsolute(p, "", "", "Helper"), p->file());
-
-        Output& out2 = output();
-
-        out2 << sp;
-        writeDocComment(out2, getDeprecateReason(p, 0, p->isInterface() ? "interface" : "class"),
-                        "Provides type-specific helper functions.");
-        out2 << nl << "public final class " << name << "Helper";
-        out2 << sb;
-
-        out2 << sp;
-        writeDocComment(out2, "",
-                        "Writes an instance to the stream.\n"
-                        "@param __outS The output stream.\n"
-                        "@param __v The instance to write. A null value is legal.");
-        out2 << nl << "public static void write(Ice.OutputStream __outS, " << fixKwd(name) << " __v)";
-        out2 << sb;
-        out2 << nl << "__outS.writeObject(__v);";
-        out2 << eb;
-
-        out2 << sp;
-        writeDocComment(out2, "",
-                        "Reads an instance from the stream.\n"
-                        "@param __inS The input stream.\n"
-                        "@param __h A holder to contain the instance when it is eventually unmarshaled.");
-        out2 << nl << "public static void read(Ice.InputStream __inS, " << name << "Holder __h)";
-        out2 << sb;
-        out2 << nl << "__inS.readObject(__h);";
-        out2 << eb;
-
-        out2 << sp;
-        writeDocComment(out2, "",
-                        "Provides the optional format for an instance of this type.\n"
-                        "@return The optional format.");
-        out2 << nl << "public static Ice.OptionalFormat optionalFormat()";
-        out2 << sb;
-        out2 << nl << "return " << getOptionalFormat(p->declaration()) << ';';
-        out2 << eb;
-
-        out2 << eb;
-        close();
-    }
-
-    return false;
-}
-
-bool
-Slice::Gen::HelperVisitor::visitStructStart(const StructPtr& p)
-{
-    if(!p->isLocal() && _stream)
-    {
-        string name = p->name();
-        string fixedName = fixKwd(name);
-
-        open(getAbsolute(p, "", "", "Helper"), p->file());
-
-        Output& out = output();
-
-        out << sp << nl << "public final class " << name << "Helper";
-        out << sb;
-
-        out << sp << nl << "public static void write(Ice.OutputStream __outS, " << fixedName << " __v)";
-        out << sb;
-        out << nl << "__v.ice_write(__outS);";
-        out << eb;
-
-        out << sp << nl << "public static " << fixedName << " read(Ice.InputStream __inS)";
-        out << sb;
-        out << nl << fixedName << " __v = new " << fixedName << "();";
-        out << nl << "__v.ice_read(__inS);";
-        out << nl << "return __v;";
-        out << eb;
-
-        out << sp << nl << "public static Ice.OptionalFormat optionalFormat()";
-        out << sb;
-        out << nl << "return " << getOptionalFormat(p) << ';';
-        out << eb;
-
-        out << eb;
-        close();
-    }
-
     return false;
 }
 
@@ -5618,7 +5203,7 @@ Slice::Gen::HelperVisitor::visitSequence(const SequencePtr& p)
     out << sp << nl << "public final class " << name << "Helper";
     out << sb;
 
-    out << nl << "public static void" << nl << "write(IceInternal.BasicStream __os, " << typeS << " __v)";
+    out << nl << "public static void" << nl << "write(Ice.OutputStream __os, " << typeS << " __v)";
     out << sb;
     iter = 0;
     writeSequenceMarshalUnmarshalCode(out, package, p, "__v", true, iter, false);
@@ -5629,7 +5214,7 @@ Slice::Gen::HelperVisitor::visitSequence(const SequencePtr& p)
     {
         out << nl << "@SuppressWarnings(\"unchecked\")";
     }
-    out << nl << "public static " << typeS << nl << "read(IceInternal.BasicStream __is)";
+    out << nl << "public static " << typeS << nl << "read(Ice.InputStream __is)";
     out << sb;
     out << nl << typeS << " __v;";
     iter = 0;
@@ -5637,33 +5222,6 @@ Slice::Gen::HelperVisitor::visitSequence(const SequencePtr& p)
     out << nl << "return __v;";
     out << eb;
 
-    if(_stream)
-    {
-        out << sp << nl << "public static void write(Ice.OutputStream __outS, " << typeS << " __v)";
-        out << sb;
-        iter = 0;
-        writeStreamSequenceMarshalUnmarshalCode(out, package, p, "__v", true, iter, false);
-        out << eb;
-
-        out << sp;
-        if(suppressUnchecked)
-        {
-            out << nl << "@SuppressWarnings(\"unchecked\")";
-        }
-        out << nl << "public static " << typeS << " read(Ice.InputStream __inS)";
-        out << sb;
-        out << nl << typeS << " __v;";
-        iter = 0;
-        writeStreamSequenceMarshalUnmarshalCode(out, package, p, "__v", false, iter, false);
-        out << nl << "return __v;";
-        out << eb;
-
-        out << sp << nl << "public static Ice.OptionalFormat optionalFormat()";
-        out << sb;
-        out << nl << "return " << getOptionalFormat(p) << ';';
-        out << eb;
-    }
-
     out << eb;
     close();
 }
@@ -5697,14 +5255,14 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
     out << sp << nl << "public final class " << name << "Helper";
     out << sb;
 
-    out << nl << "public static void" << nl << "write(IceInternal.BasicStream __os, " << formalType << " __v)";
+    out << nl << "public static void" << nl << "write(Ice.OutputStream __os, " << formalType << " __v)";
     out << sb;
     iter = 0;
     writeDictionaryMarshalUnmarshalCode(out, package, p, "__v", true, iter, false);
     out << eb;
 
     out << sp << nl << "public static " << formalType
-        << nl << "read(IceInternal.BasicStream __is)";
+        << nl << "read(Ice.InputStream __is)";
     out << sb;
     out << nl << formalType << " __v;";
     iter = 0;
@@ -5712,69 +5270,11 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
     out << nl << "return __v;";
     out << eb;
 
-    if(_stream)
-    {
-        out << sp << nl << "public static void write(Ice.OutputStream __outS, " << formalType
-            << " __v)";
-        out << sb;
-        iter = 0;
-        writeStreamDictionaryMarshalUnmarshalCode(out, package, p, "__v", true, iter, false);
-        out << eb;
-
-        out << sp << nl << "public static " << formalType << " read(Ice.InputStream __inS)";
-        out << sb;
-        out << nl << formalType << " __v;";
-        iter = 0;
-        writeStreamDictionaryMarshalUnmarshalCode(out, package, p, "__v", false, iter, false);
-        out << nl << "return __v;";
-        out << eb;
-
-        out << sp << nl << "public static Ice.OptionalFormat optionalFormat()";
-        out << sb;
-        out << nl << "return " << getOptionalFormat(p) << ';';
-        out << eb;
-    }
-
     out << eb;
     close();
 }
 
 void
-Slice::Gen::HelperVisitor::visitEnum(const EnumPtr& p)
-{
-    if(!p->isLocal() && _stream)
-    {
-        string name = p->name();
-        string fixedName = fixKwd(name);
-
-        open(getAbsolute(p, "", "", "Helper"), p->file());
-
-        Output& out = output();
-
-        out << sp << nl << "public final class " << name << "Helper";
-        out << sb;
-
-        out << sp << nl << "public static void write(Ice.OutputStream __outS, " << fixedName << " __v)";
-        out << sb;
-        out << nl << "__v.ice_write(__outS);";
-        out << eb;
-
-        out << sp << nl << "public static " << fixedName << " read(Ice.InputStream __inS)";
-        out << sb;
-        out << nl << "return " << fixedName << ".ice_read(__inS);";
-        out << eb;
-
-        out << sp << nl << "public static Ice.OptionalFormat optionalFormat()";
-        out << sb;
-        out << nl << "return " << getOptionalFormat(p) << ';';
-        out << eb;
-
-        out << eb;
-        close();
-    }
-}
-
-void
 Slice::Gen::HelperVisitor::writeOperation(const ClassDefPtr& p, const string& package, const OperationPtr& op,
                                           bool optionalMapping)
 {
@@ -6111,7 +5611,7 @@ Slice::Gen::HelperVisitor::writeOperation(const ClassDefPtr& p, const string& pa
         iter = 0;
         if(!inArgs.empty())
         {
-            out << nl << "IceInternal.BasicStream __os = __result.startWriteParams("
+            out << nl << "Ice.OutputStream __os = __result.startWriteParams("
                 << opFormatTypeToString(op) << ");";
             ParamDeclList pl;
             for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
@@ -6124,7 +5624,7 @@ Slice::Gen::HelperVisitor::writeOperation(const ClassDefPtr& p, const string& pa
             writeMarshalUnmarshalParams(out, package, pl, 0, iter, true, optionalMapping);
             if(op->sendsClasses(false))
             {
-                out << nl << "__os.writePendingObjects();";
+                out << nl << "__os.writePendingValues();";
             }
             out << nl << "__result.endWriteParams();";
         }
@@ -6462,8 +5962,8 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     }
 }
 
-Slice::Gen::DispatcherVisitor::DispatcherVisitor(const string& dir, bool stream) :
-    JavaVisitor(dir), _stream(stream)
+Slice::Gen::DispatcherVisitor::DispatcherVisitor(const string& dir) :
+    JavaVisitor(dir)
 {
 }
 
@@ -6496,7 +5996,7 @@ Slice::Gen::DispatcherVisitor::visitClassDefStart(const ClassDefPtr& p)
     out << nl << "throw new java.lang.CloneNotSupportedException();";
     out << eb;
 
-    writeDispatchAndMarshalling(out, p, _stream);
+    writeDispatchAndMarshalling(out, p);
 
     //
     // Avoid serialVersionUID warnings for dispatch classes.
@@ -6570,6 +6070,7 @@ Slice::Gen::BaseImplVisitor::writeDecl(Output& out, const string& package, const
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     out << " = null";
                     break;
@@ -6643,6 +6144,7 @@ Slice::Gen::BaseImplVisitor::writeReturn(Output& out, const TypePtr& type, bool
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     out << nl << "return null;";
                     break;
@@ -7099,12 +6601,12 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
             {
                 out << nl << "try";
                 out << sb;
-                out << nl << "IceInternal.BasicStream __os = this.__startWriteParams("
+                out << nl << "Ice.OutputStream __os = this.__startWriteParams("
                     << opFormatTypeToString(p) << ");";
                 writeMarshalUnmarshalParams(out, classPkg, outParams, p, iter, true, optionalMapping, false);
                 if(p->returnsClasses(false))
                 {
-                    out << nl << "__os.writePendingObjects();";
+                    out << nl << "__os.writePendingValues();";
                 }
                 out << nl << "this.__endWriteParams(true);";
                 out << eb;
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h
index 2c15bede991..bbcd2cb8908 100644
--- a/cpp/src/slice2java/Gen.h
+++ b/cpp/src/slice2java/Gen.h
@@ -86,12 +86,12 @@ protected:
     //
     // Generate a patcher class.
     //
-    void writePatcher(::IceUtilInternal::Output&, const std::string&, const DataMemberList&, const DataMemberList&, bool);
+    void writePatcher(::IceUtilInternal::Output&, const std::string&, const DataMemberList&, const DataMemberList&);
 
     //
     // Generate dispatch and marshalling methods for a class or interface.
     //
-    void writeDispatchAndMarshalling(::IceUtilInternal::Output&, const ClassDefPtr&, bool);
+    void writeDispatchAndMarshalling(::IceUtilInternal::Output&, const ClassDefPtr&);
 
     //
     // Write a constant or default value initializer.
@@ -131,7 +131,7 @@ public:
         const std::string&);
     ~Gen();
 
-    void generate(const UnitPtr&, bool);
+    void generate(const UnitPtr&);
     void generateTie(const UnitPtr&);
     void generateImpl(const UnitPtr&);
     void generateImplTie(const UnitPtr&);
@@ -178,7 +178,7 @@ private:
     {
     public:
 
-        TypesVisitor(const std::string&, bool);
+        TypesVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
         virtual void visitClassDefEnd(const ClassDefPtr&);
@@ -196,8 +196,6 @@ private:
         // Verifies that a data member method does not conflict with an operation.
         //
         bool validateMethod(const OperationList&, const std::string&, int, const std::string&, const std::string&);
-
-        bool _stream;
     };
 
     class CompactIdVisitor : public JavaVisitor
@@ -230,19 +228,15 @@ private:
     {
     public:
 
-        HelperVisitor(const std::string&, bool);
+        HelperVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
-        virtual bool visitStructStart(const StructPtr&);
         virtual void visitSequence(const SequencePtr&);
         virtual void visitDictionary(const DictionaryPtr&);
-        virtual void visitEnum(const EnumPtr&);
 
     private:
 
         void writeOperation(const ClassDefPtr&, const std::string&, const OperationPtr&, bool);
-
-        bool _stream;
     };
 
     class ProxyVisitor : public JavaVisitor
@@ -260,13 +254,9 @@ private:
     {
     public:
 
-        DispatcherVisitor(const std::string&, bool);
+        DispatcherVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
-
-    private:
-
-        bool _stream;
     };
 
     class BaseImplVisitor : public JavaVisitor
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index d71460f58aa..7b9737d98a2 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -80,7 +80,6 @@ usage(const char* n)
         "--ice                   Allow reserved Ice prefix in Slice identifiers.\n"
         "--underscore            Allow underscores in Slice identifiers.\n"
         "--checksum CLASS        Generate checksums for Slice definitions into CLASS.\n"
-        "--stream                Generate marshaling support for public stream API.\n"
         "--meta META             Define global metadata directive META.\n"
         ;
 }
@@ -108,7 +107,6 @@ compile(int argc, char* argv[])
     opts.addOpt("", "ice");
     opts.addOpt("", "underscore");
     opts.addOpt("", "checksum", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "stream");
     opts.addOpt("", "meta", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
 
 
@@ -189,8 +187,6 @@ compile(int argc, char* argv[])
 
     string checksumClass = opts.optArg("checksum");
 
-    bool stream = opts.isSet("stream");
-
     bool listGenerated = opts.isSet("list-generated");
 
     StringList globalMetadata;
@@ -353,7 +349,7 @@ compile(int argc, char* argv[])
                     try
                     {
                         Gen gen(argv[0], icecpp->getBaseName(), includePaths, output);
-                        gen.generate(p, stream);
+                        gen.generate(p);
                         if(tie)
                         {
                             gen.generateTie(p);
diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile
deleted file mode 100644
index e2a882bfb6f..00000000000
--- a/cpp/src/slice2java/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-NAME		= $(bindir)/slice2java
-
-TARGETS		= $(NAME)
-
-OBJS		= Gen.o \
-		  Main.o
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I.. $(CPPFLAGS)
-
-$(NAME): $(OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK)
-
-install:: all
-	$(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/slice2java.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/slice2java/Makefile.mak b/cpp/src/slice2java/Makefile.mak
deleted file mode 100644
index 1d93e22c79d..00000000000
--- a/cpp/src/slice2java/Makefile.mak
+++ /dev/null
@@ -1,50 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2java.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= .\Gen.obj \
-		  .\Main.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-RES_FILE        = Slice2Java.res
-
-$(NAME): $(OBJS) Slice2Java.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \
-		$(BASELIBS) $(RES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Java.res
-
-install:: all
-	copy $(NAME) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(NAME:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc
index 6b1d0209dac..170e6d82655 100644
--- a/cpp/src/slice2java/Slice2Java.rc
+++ b/cpp/src/slice2java/Slice2Java.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to Java Translator\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "slice2java\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2java.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2java/msbuild/packages.config b/cpp/src/slice2java/msbuild/packages.config
new file mode 100644
index 00000000000..88735dc0077
--- /dev/null
+++ b/cpp/src/slice2java/msbuild/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" />
+  <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/cpp/src/slice2java/msbuild/slice2java.vcxproj b/cpp/src/slice2java/msbuild/slice2java.vcxproj
new file mode 100644
index 00000000000..91a6a4f7741
--- /dev/null
+++ b/cpp/src/slice2java/msbuild/slice2java.vcxproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A503D0D4-22BB-4BDB-B996-862D14DA3349}</ProjectGuid>
+    <RootNamespace>slice2java</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Gen.cpp" />
+    <ClCompile Include="..\Main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Slice2Java.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Gen.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj">
+      <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj">
+      <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" />
+    <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/slice2java/msbuild/slice2java.vcxproj.filters b/cpp/src/slice2java/msbuild/slice2java.vcxproj.filters
new file mode 100644
index 00000000000..0651fe8a1f4
--- /dev/null
+++ b/cpp/src/slice2java/msbuild/slice2java.vcxproj.filters
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{A44EC71A-9B0B-424C-8966-3C20C4451E12}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{080E8F6A-9743-430D-AC92-9763481380CE}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{267D903A-EF93-4356-A227-C89396D7B931}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Gen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Slice2Java.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Gen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/slice2js/.depend.mak b/cpp/src/slice2js/.depend.mak
deleted file mode 100755
index 888153164ec..00000000000
--- a/cpp/src/slice2js/.depend.mak
+++ /dev/null
@@ -1,58 +0,0 @@
-
-Gen.obj: \
-	Gen.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
-    "Gen.h" \
-    "JsUtil.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\Slice\Checksum.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\Slice\Util.h" \
-
-JsUtil.obj: \
-	JsUtil.cpp \
-    "JsUtil.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-
-Main.obj: \
-	Main.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\Slice\Preprocessor.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\Slice\Util.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "Gen.h" \
-    "JsUtil.h" \
diff --git a/cpp/src/slice2js/.gitignore b/cpp/src/slice2js/.gitignore
deleted file mode 100644
index 720f44c7047..00000000000
--- a/cpp/src/slice2js/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp
index 9e55b8b65f2..c2d0cb9209c 100644
--- a/cpp/src/slice2js/Gen.cpp
+++ b/cpp/src/slice2js/Gen.cpp
@@ -20,7 +20,7 @@
 #include <direct.h>
 #endif
 #include <IceUtil/Iterator.h>
-#include <IceUtil/Unicode.h>
+#include <IceUtil/StringConverter.h>
 #include <IceUtil/UUID.h>
 #include <Slice/Checksum.h>
 #include <Slice/FileTracker.h>
@@ -50,23 +50,8 @@ u16CodePoint(unsigned short value)
 void
 writeU8Buffer(const vector<unsigned char>& u8buffer, ::IceUtilInternal::Output& out)
 {
-    vector<unsigned short> u16buffer;
-    IceUtilInternal::ConversionResult result = convertUTF8ToUTF16(u8buffer, u16buffer, IceUtil::lenientConversion);
-    switch(result)
-    {
-        case conversionOK:
-            break;
-        case sourceExhausted:
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source exhausted");
-        case sourceIllegal:
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source illegal");
-        default:
-        {
-            assert(0);
-            throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
-        }
-    }
-
+    vector<unsigned short> u16buffer = toUTF16(u8buffer);
+    
     for(vector<unsigned short>::const_iterator c = u16buffer.begin(); c != u16buffer.end(); ++c)
     {
         out << u16CodePoint(*c);
diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp
index ac4cba9ea2f..31648566a64 100644
--- a/cpp/src/slice2js/JsUtil.cpp
+++ b/cpp/src/slice2js/JsUtil.cpp
@@ -192,6 +192,7 @@ Slice::JsGenerator::getOptionalFormat(const TypePtr& type)
             return "Ice.OptionalFormat.VSize";
         }
         case Builtin::KindObject:
+        case Builtin::KindValue:
         {
             return "Ice.OptionalFormat.Class";
         }
@@ -503,6 +504,7 @@ Slice::JsGenerator::writeMarshalUnmarshalCode(Output &out,
                 return;
             }
             case Builtin::KindObject:
+            case Builtin::KindValue:
             {
                 // Handle by isClassType below.
                 break;
@@ -557,11 +559,11 @@ Slice::JsGenerator::writeMarshalUnmarshalCode(Output &out,
     {
         if(marshal)
         {
-            out << nl << stream << ".writeObject(" << param << ");";
+            out << nl << stream << ".writeValue(" << param << ");";
         }
         else
         {
-            out << nl << stream << ".readObject(function(__o){ " << fixSuffix(param) << " = __o; }, "
+            out << nl << stream << ".readValue(function(__o){ " << fixSuffix(param) << " = __o; }, "
                 << typeToString(type) << ");";
         }
         return;
@@ -596,11 +598,11 @@ Slice::JsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
     {
         if(marshal)
         {
-            out << nl << stream << ".writeOptObject(" << tag << ", " << param << ");";
+            out << nl << stream << ".writeOptionalValue(" << tag << ", " << param << ");";
         }
         else
         {
-            out << nl << stream << ".readOptObject(" << tag << ", function(__o){ " << fixSuffix(param)
+            out << nl << stream << ".readOptionalValue(" << tag << ", function(__o){ " << fixSuffix(param)
                 << " = __o; }, " << typeToString(type) << ");";
         }
         return;
@@ -621,11 +623,11 @@ Slice::JsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
 
     if(marshal)
     {
-        out << nl << getHelper(type) <<".writeOpt(" << stream << ", " << tag << ", " << param << ");";
+        out << nl << getHelper(type) <<".writeOptional(" << stream << ", " << tag << ", " << param << ");";
     }
     else
     {
-        out << nl << param << " = " << getHelper(type) << ".readOpt(" << stream << ", " << tag << ");";
+        out << nl << param << " = " << getHelper(type) << ".readOptional(" << stream << ", " << tag << ");";
     }
 }
 
@@ -670,6 +672,7 @@ Slice::JsGenerator::getHelper(const TypePtr& type)
                 return "Ice.StringHelper";
             }
             case Builtin::KindObject:
+            case Builtin::KindValue:
             {
                 return "Ice.ObjectHelper";
             }
diff --git a/cpp/src/slice2js/Makefile b/cpp/src/slice2js/Makefile
deleted file mode 100644
index 0aaf14a7a0d..00000000000
--- a/cpp/src/slice2js/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-NAME		= $(bindir)/slice2js
-
-TARGETS		= $(NAME)
-
-OBJS		= Gen.o \
-		  JsUtil.o \
-		  Main.o
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I.. $(CPPFLAGS)
-
-$(NAME): $(OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK)
-
-install:: all
-	$(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/slice2js.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/slice2js/Makefile.mak b/cpp/src/slice2js/Makefile.mak
deleted file mode 100644
index 79bd9f23cca..00000000000
--- a/cpp/src/slice2js/Makefile.mak
+++ /dev/null
@@ -1,50 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2js.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= .\Gen.obj \
-		  .\JsUtil.obj \
-		  .\Main.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-RES_FILE        = Slice2Js.res
-
-$(NAME): $(OBJS) Slice2Js.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(SLICE_LIBS) 	 \
-		$(BASELIBS) $(RES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Js.res
-
-install:: all
-	copy $(NAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(NAME:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/slice2js/Slice2Js.rc b/cpp/src/slice2js/Slice2Js.rc
index dc1c9b05377..59496cae184 100644
--- a/cpp/src/slice2js/Slice2Js.rc
+++ b/cpp/src/slice2js/Slice2Js.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to JavaScript Translator\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "slice2js\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2js.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2js/msbuild/packages.config b/cpp/src/slice2js/msbuild/packages.config
new file mode 100644
index 00000000000..88735dc0077
--- /dev/null
+++ b/cpp/src/slice2js/msbuild/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" />
+  <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/cpp/src/slice2js/msbuild/slice2js.vcxproj b/cpp/src/slice2js/msbuild/slice2js.vcxproj
new file mode 100644
index 00000000000..c3b44bff5bc
--- /dev/null
+++ b/cpp/src/slice2js/msbuild/slice2js.vcxproj
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8DF85304-2A53-4C36-804F-5C6FA2F75ACF}</ProjectGuid>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Gen.cpp" />
+    <ClCompile Include="..\JsUtil.cpp" />
+    <ClCompile Include="..\Main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Slice2Js.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Gen.h" />
+    <ClInclude Include="..\JsUtil.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj">
+      <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj">
+      <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" />
+    <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/slice2js/msbuild/slice2js.vcxproj.filters b/cpp/src/slice2js/msbuild/slice2js.vcxproj.filters
new file mode 100644
index 00000000000..20badfb10f7
--- /dev/null
+++ b/cpp/src/slice2js/msbuild/slice2js.vcxproj.filters
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{0C9C0450-4DFC-441E-A440-DD94642EE0AC}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{4ABE07FF-1ACC-4CD2-9DF6-873BD17C212E}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{380D5A23-E390-4B11-817F-8F4115971A2A}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Gen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\JsUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Slice2Js.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Gen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\JsUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/slice2objc/.gitignore b/cpp/src/slice2objc/.gitignore
deleted file mode 100644
index 3a412ca89c7..00000000000
--- a/cpp/src/slice2objc/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp
index 1363779f8e9..28c0b04cbe8 100644
--- a/cpp/src/slice2objc/Gen.cpp
+++ b/cpp/src/slice2objc/Gen.cpp
@@ -17,7 +17,7 @@
 #include <direct.h>
 #endif
 #include <IceUtil/Iterator.h>
-#include <IceUtil/Unicode.h>
+#include <IceUtil/StringConverter.h>
 #include <IceUtil/InputUtil.h>
 #include <IceUtil/UUID.h>
 #include <Slice/Checksum.h>
@@ -251,7 +251,7 @@ Slice::ObjCVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p)
         writeMarshalUnmarshalParams(inParams, 0, false);
         if(op->sendsClasses(false))
         {
-            _M << nl << "[is_ readPendingObjects];";
+            _M << nl << "[is_ readPendingValues];";
         }
         _M << nl << "[is_ endEncapsulation];";
         if(!throws.empty())
@@ -290,7 +290,7 @@ Slice::ObjCVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p)
         writeMarshalUnmarshalParams(outParams, op, true);
         if(op->returnsClasses(false))
         {
-            _M << nl << "[os_ writePendingObjects];";
+            _M << nl << "[os_ writePendingValues];";
         }
         if(!throws.empty())
         {
@@ -452,6 +452,32 @@ Slice::ObjCVisitor::getParams(const OperationPtr& op) const
 }
 
 string
+Slice::ObjCVisitor::getBlockParams(const OperationPtr& op) const
+{
+    string result;
+    ParamDeclList paramList = op->parameters();
+    for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
+    {
+        TypePtr type = (*q)->type();
+        string typeString;
+        if((*q)->isOutParam())
+        {
+            typeString = outTypeToString(type, (*q)->optional(), false, true);
+        }
+        else
+        {
+            typeString = inTypeToString(type, (*q)->optional());
+        }
+        if(q != paramList.begin())
+        {
+            result += " " + getParamId(*q);
+        }
+        result += "(" + typeString + ")";
+    }
+    return result;
+}
+
+string
 Slice::ObjCVisitor::getMarshalParams(const OperationPtr& op) const
 {
     ParamDeclList paramList = op->parameters();
@@ -758,10 +784,10 @@ Slice::Gen::generate(const UnitPtr& p)
 
         _H << nl;
         _H << nl << "#ifndef " << _dllExport;
-        _H << nl << "#   ifdef " << _dllExport << "_EXPORTS";
-        _H << nl << "#       define " << _dllExport << " ICE_DECLSPEC_EXPORT";
-        _H << nl << "#   elif defined(ICE_STATIC_LIBS)";
+        _H << nl << "#   if defined(ICE_STATIC_LIBS)";
         _H << nl << "#       define " << _dllExport << " /**/";
+        _H << nl << "#   elif defined(" << _dllExport << "_EXPORTS)";
+        _H << nl << "#       define " << _dllExport << " ICE_DECLSPEC_EXPORT";
         _H << nl << "#   else";
         _H << nl << "#       define " << _dllExport << " ICE_DECLSPEC_IMPORT";
         _H << nl << "#   endif";
@@ -870,6 +896,11 @@ Slice::Gen::ObjectDeclVisitor::ObjectDeclVisitor(Output& H, Output& M, const str
 void
 Slice::Gen::ObjectDeclVisitor::visitClassDecl(const ClassDeclPtr& p)
 {
+    if(p->definition() && p->definition()->isDelegate())
+    {
+        return;
+    }
+
     _H << sp;
     if(!p->isLocal() || !p->isInterface())
     {
@@ -927,7 +958,16 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
     string name = fixName(p);
     ClassList bases = p->bases();
 
+    if(p->isDelegate())
+    {
+        OperationPtr o = p->allOperations().front();
+        _H << sp << nl << "typedef " << typeToString(o->returnType());
+        _H << " (^" << name << ")" << getBlockParams(o) << ";";
+        return false;
+    }
+
     _H << sp << nl << _dllExport << "@protocol " << name;
+
     if(!bases.empty())
     {
         _H << " <";
@@ -1083,16 +1123,16 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
         {
             _M << nl << "-(void) write__:(id<ICEOutputStream>)os";
             _M << sb;
-            _M << nl << "[os startObject:slicedData__];";
+            _M << nl << "[os startValue:slicedData__];";
             _M << nl << "[self writeImpl__:os];";
-            _M << nl << "[os endObject];";
+            _M << nl << "[os endValue];";
             _M << eb;
 
             _M << nl << "-(void) read__:(id<ICEInputStream>)is";
             _M << sb;
-            _M << nl << "[is startObject];";
+            _M << nl << "[is startValue];";
             _M << nl << "[self readImpl__:is];";
-            _M << nl << "slicedData__ = [is endObject:YES];";
+            _M << nl << "slicedData__ = [is endValue:YES];";
             _M << eb;
         }
     }
@@ -1111,6 +1151,7 @@ Slice::Gen::TypesVisitor::visitOperation(const OperationPtr& p)
     TypePtr returnType = p->returnType();
     string retString;
     string params;
+
     if(cl->isLocal())
     {
         retString = outTypeToString(returnType, p->returnIsOptional());
@@ -1136,9 +1177,9 @@ Slice::Gen::TypesVisitor::visitOperation(const OperationPtr& p)
         _H << ";";
     }
 
-    if(cl->isLocal() && (cl->hasMetaData("async") || p->hasMetaData("async")))
+    if(cl->isLocal() && (cl->hasMetaData("async-oneway") || p->hasMetaData("async-oneway")))
     {
-        // TODO: add supports for parameters when needed.
+        // TODO: add support for parameters when needed.
         _H << nl << "-(id<ICEAsyncResult>) begin_" << name << ";";
         _H << nl << "-(id<ICEAsyncResult>) begin_" << name << ":(void(^)(ICEException*))exception;";
         _H << nl << "-(id<ICEAsyncResult>) begin_" << name
@@ -1244,12 +1285,12 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
     }
 
     //
-    // ice_name
+    // ice_id
     //
-    _H << nl << "-(NSString *) ice_name;";
-    _M << sp << nl << "-(NSString *) ice_name";
+    _H << nl << "-(NSString *) ice_id;";
+    _M << sp << nl << "-(NSString *) ice_id";
     _M << sb;
-    _M << nl << "return @\"" << p->scoped().substr(2) << "\";";
+    _M << nl << "return @\"" << p->scoped() << "\";";
     _M << eb;
 
     ContainerType ct = p->isLocal() ? LocalException : Other;
@@ -1548,23 +1589,7 @@ Slice::Gen::TypesVisitor::writeConstantValue(IceUtilInternal::Output& out, const
                             vector<unsigned int> u32buffer;
                             u32buffer.push_back(static_cast<unsigned int>(v));
 
-                            vector<unsigned char> u8buffer;
-
-                            IceUtilInternal::ConversionResult result = convertUTF32ToUTF8(u32buffer, u8buffer, IceUtil::lenientConversion);
-                            switch(result)
-                            {
-                                case conversionOK:
-                                    break;
-                                case sourceExhausted:
-                                    throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source exhausted");
-                                case sourceIllegal:
-                                    throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source illegal");
-                                default:
-                                {
-                                    assert(0);
-                                    throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
-                                }
-                            }
+                            vector<unsigned char> u8buffer = fromUTF32(u32buffer);
 
                             ostringstream s;
                             for(vector<unsigned char>::const_iterator q = u8buffer.begin(); q != u8buffer.end(); ++q)
@@ -1592,7 +1617,7 @@ Slice::Gen::TypesVisitor::writeConstantValue(IceUtilInternal::Output& out, const
                         break;
                     }
                 }
-                
+
                 out << val[i];                              // Print normally if in basic source character set
             }
             ++i;
@@ -2394,7 +2419,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
             _M << sp << nl << "@implementation " << name;
             _M << nl << "+(void) readRetained:(ICEObject*ICE_STRONG_QUALIFIER*)obj stream:(id<ICEInputStream>)stream";
             _M << sb;
-            _M << nl << "[stream newObject:obj expectedType:[" << fixName(p) << " class]];";
+            _M << nl << "[stream newValue:obj expectedType:[" << fixName(p) << " class]];";
             _M << eb;
             _M << nl << "@end";
         }
@@ -2475,7 +2500,7 @@ Slice::Gen::HelperVisitor::visitSequence(const SequencePtr& p)
         _M << sp << nl << "@implementation " << name;
         _M << nl << "+(id) readRetained:(id<ICEInputStream>)stream";
         _M << sb;
-        _M << nl << "return [stream newObjectSeq:[" << fixName(cl) << " class]];";
+        _M << nl << "return [stream newValueSeq:[" << fixName(cl) << " class]];";
         _M << eb;
         _M << nl << "@end";
         return;
@@ -2556,16 +2581,16 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
         if(valueClass && !valueClass->isInterface())
         {
             valueS = fixName(valueClass);
-            _M << nl << "return [stream newObjectDict:[" << keyS << " class] expectedType:[" << valueS << " class]];";
+            _M << nl << "return [stream newValueDict:[" << keyS << " class] expectedType:[" << valueS << " class]];";
         }
         else
         {
-            _M << nl << "return [stream newObjectDict:[" << keyS << " class] expectedType:[ICEObject class]];";
+            _M << nl << "return [stream newValueDict:[" << keyS << " class] expectedType:[ICEObject class]];";
         }
         _M << eb;
         _M << nl << "+(void) write:(id)obj stream:(id<ICEOutputStream>)stream";
         _M << sb;
-        _M << nl << "[stream writeObjectDict:obj helper:[" << keyS << " class]];";
+        _M << nl << "[stream writeValueDict:obj helper:[" << keyS << " class]];";
         _M << eb;
         _M << nl << "@end";
         return;
@@ -3061,7 +3086,7 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
         writeMarshalUnmarshalParams(inParams, 0, true);
         if(p->sendsClasses(false))
         {
-            _M << nl << "[os_ writePendingObjects];";
+            _M << nl << "[os_ writePendingValues];";
         }
         _M << eb;
     }
@@ -3134,7 +3159,7 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
         _M << sb;
         _M << nl << "[is_ endEncapsulation];";
         _M << nl << "@throw [ICEUnknownUserException unknownUserException:__FILE__ line:__LINE__ "
-           << "unknown:[ex_ ice_name]];";
+           << "unknown:[ex_ ice_id]];";
         _M << eb;
         _M << eb;
 
@@ -3146,7 +3171,7 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
             writeMarshalUnmarshalParams(outParams, p, false, true);
             if(p->returnsClasses(false))
             {
-                _M << nl << "[is_ readPendingObjects];";
+                _M << nl << "[is_ readPendingValues];";
             }
             _M << nl << "[is_ endEncapsulation];";
             _M << eb;
diff --git a/cpp/src/slice2objc/Gen.h b/cpp/src/slice2objc/Gen.h
index b9411456202..75d86c78285 100644
--- a/cpp/src/slice2objc/Gen.h
+++ b/cpp/src/slice2objc/Gen.h
@@ -10,7 +10,7 @@
 #ifndef GEN_H
 #define GEN_H
 
-#include <Slice/ObjCUtil.h>
+#include <ObjCUtil.h>
 
 namespace Slice
 {
@@ -30,6 +30,7 @@ protected:
     virtual std::string getName(const OperationPtr&) const;
     virtual std::string getSelector(const OperationPtr&) const;
     virtual std::string getParams(const OperationPtr&) const;
+    virtual std::string getBlockParams(const OperationPtr&) const;
     virtual std::string getMarshalParams(const OperationPtr&) const;
     virtual std::string getUnmarshalParams(const OperationPtr&) const;
     virtual std::string getServerParams(const OperationPtr&) const;
diff --git a/cpp/src/slice2objc/Makefile b/cpp/src/slice2objc/Makefile
deleted file mode 100644
index 6abe0150f36..00000000000
--- a/cpp/src/slice2objc/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-NAME		= $(bindir)/slice2objc$(EXE_EXT)
-
-TARGETS		= $(NAME)
-
-OBJS		= Gen.o \
-		  Main.o
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I.. $(CPPFLAGS)
-
-$(NAME): $(OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK)
-
-install:: all
-	$(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/slice2objc.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/Slice/ObjCUtil.cpp b/cpp/src/slice2objc/ObjCUtil.cpp
index 2985138a41e..8247915d841 100644
--- a/cpp/src/Slice/ObjCUtil.cpp
+++ b/cpp/src/slice2objc/ObjCUtil.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#include <Slice/ObjCUtil.h>
+#include <ObjCUtil.h>
 #include <Slice/Util.h>
 #include <IceUtil/Functional.h>
 #include <IceUtil/StringUtil.h>
@@ -263,7 +263,8 @@ Slice::ObjCGenerator::typeToString(const TypePtr& type)
         "NSString",
         "ICEObject",
         "id<ICEObjectPrx>",
-        "id"            // Dummy--we don't support Slice local Object
+        "id",            // Dummy--we don't support Slice local Object
+        "ICEObject"
     };
 
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
@@ -296,7 +297,11 @@ Slice::ObjCGenerator::typeToString(const TypePtr& type)
     {
         if(cl->isInterface())
         {
-            if(cl->isLocal())
+            if(cl->definition() && cl->definition()->isDelegate())
+            {
+                return fixName(cl);
+            }
+            else if(cl->isLocal())
             {
                 return "id<" + fixName(cl) + ">";
             }
@@ -483,7 +488,7 @@ Slice::ObjCGenerator::mapsToPointerType(const TypePtr& type)
     ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
     if(cl && cl->isInterface())
     {
-        if(cl->isLocal())
+        if(cl->isLocal() || (cl->definition() && cl->definition()->isDelegate()))
         {
             return false;
         }
@@ -633,6 +638,7 @@ Slice::ObjCGenerator::getOptionalFormat(const TypePtr& type)
             return "ICEOptionalFormatVSize";
         }
         case Builtin::KindObject:
+        case Builtin::KindValue:
         {
             return "ICEOptionalFormatClass";
         }
@@ -696,17 +702,17 @@ Slice::ObjCGenerator::writeMarshalUnmarshalCode(Output &out, const TypePtr& type
         {
             if(marshal)
             {
-                out << nl << "[" << stream << " writeObject:" << param << "];";
+                out << nl << "[" << stream << " writeValue:" << param << "];";
             }
             else
             {
                 if(autoreleased)
                 {
-                    out << nl << "[" << stream << " readObject:&" << param << "];";
+                    out << nl << "[" << stream << " readValue:&" << param << "];";
                 }
                 else
                 {
-                    out << nl << "[" << stream << " newObject:&" << param << "];";
+                    out << nl << "[" << stream << " newValue:&" << param << "];";
                 }
             }
         }
@@ -790,17 +796,17 @@ Slice::ObjCGenerator::writeMarshalUnmarshalCode(Output &out, const TypePtr& type
         if(marshal)
         {
             // Cast avoids warning for forward-declared classes.
-            out << nl << "[" << stream << " writeObject:(ICEObject*)" << param << "];";
+            out << nl << "[" << stream << " writeValue:(ICEObject*)" << param << "];";
         }
         else
         {
             if(autoreleased)
             {
-                out << nl << "[" << stream << " " << "readObject:(ICEObject**)&" << param;
+                out << nl << "[" << stream << " " << "readValue:(ICEObject**)&" << param;
             }
             else
             {
-                out << nl << "[" << stream << " " << "newObject:(ICEObject**)&" << param;
+                out << nl << "[" << stream << " " << "newValue:(ICEObject**)&" << param;
             }
 
             if(cl->isInterface())
@@ -1003,11 +1009,11 @@ Slice::ObjCGenerator::writeOptParamMarshalUnmarshalCode(Output &out, const TypeP
         out << nl;
         if(marshal)
         {
-            out << "[" << helper << " writeOpt:" << param << " stream:os_ tag:" << tag << "];";
+            out << "[" << helper << " writeOptional:" << param << " stream:os_ tag:" << tag << "];";
         }
         else
         {
-            out << "[" << helper << " readOpt:&" << param << " stream:is_ tag:" << tag << "];";
+            out << "[" << helper << " readOptional:&" << param << " stream:is_ tag:" << tag << "];";
         }
         return;
     }
@@ -1015,11 +1021,11 @@ Slice::ObjCGenerator::writeOptParamMarshalUnmarshalCode(Output &out, const TypeP
     out << nl;
     if(marshal)
     {
-        out << "[" << helper << " writeOpt:" << param << " stream:os_ tag:" << tag << "];";
+        out << "[" << helper << " writeOptional:" << param << " stream:os_ tag:" << tag << "];";
     }
     else
     {
-        out << param << " = [" << helper << " readOpt:is_ tag:" << tag << "];";
+        out << param << " = [" << helper << " readOptional:is_ tag:" << tag << "];";
     }
 }
 
diff --git a/cpp/src/slice2objc/ObjCUtil.h b/cpp/src/slice2objc/ObjCUtil.h
new file mode 100644
index 00000000000..7c8236ede63
--- /dev/null
+++ b/cpp/src/slice2objc/ObjCUtil.h
@@ -0,0 +1,127 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef OBJC_UTIL_H
+#define OBJC_UTIL_H
+
+#include <Slice/Parser.h>
+#include <IceUtil/OutputUtil.h>
+
+namespace Slice
+{
+
+enum BaseType
+{
+    BaseTypeNone,
+    BaseTypeObject,
+    BaseTypeException
+};
+
+class ObjCGenerator : private ::IceUtil::noncopyable
+{
+public:
+
+    virtual ~ObjCGenerator() {};
+
+    //
+    // Validate all metadata in the unit with an "objc:" prefix.
+    //
+    static void validateMetaData(const UnitPtr&);
+
+protected:
+    struct ModulePrefix
+    {
+        ModulePtr m;
+        std::string name;
+    };
+
+    static bool addModule(const ModulePtr&, const std::string&);
+    static ModulePrefix modulePrefix(const ModulePtr&);
+    static std::string moduleName(const ModulePtr&);
+    static ModulePtr findModule(const ContainedPtr&, int = 0, bool = false);
+    static void modulePrefixError(const ModulePtr&, const std::string&);
+    static std::string fixId(const std::string&, int = 0, bool = false);
+    static std::string fixId(const ContainedPtr&, int = 0, bool = false);
+    static std::string fixName(const ContainedPtr&, int = 0, bool = false);
+    static std::string fixScoped(const ContainedPtr&, int = 0, bool = false);
+    static std::string getParamId(const ContainedPtr&);
+    static std::string getFactoryMethod(const ContainedPtr&, bool);
+    static std::string typeToString(const TypePtr&);
+    static std::string inTypeToString(const TypePtr&, bool, bool = false, bool = false);
+    static std::string outTypeToString(const TypePtr&, bool, bool = false, bool = false);
+    static std::string typeToObjCTypeString(const TypePtr&);
+    static bool isValueType(const TypePtr&);
+    static bool isString(const TypePtr&);
+    static bool isClass(const TypePtr&);
+    static bool mapsToPointerType(const TypePtr&);
+    static std::string getBuiltinName(const BuiltinPtr&);
+    static std::string getBuiltinSelector(const BuiltinPtr&, bool);
+    static std::string getOptionalHelperGetter(const TypePtr&);
+    static std::string getOptionalStreamHelper(const TypePtr&);
+    static StringList splitScopedName(const std::string&);
+    static std::string getOptionalFormat(const TypePtr&);
+
+    //
+    // Generate code to marshal or unmarshal a type
+    //
+    void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool, bool) const;
+    void writeOptMemberMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool) const;
+    void writeOptParamMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, int,
+                                           bool) const;
+
+private:
+
+    class MetaDataVisitor : public ParserVisitor
+    {
+    public:
+        MetaDataVisitor();
+
+        virtual bool visitUnitStart(const UnitPtr&);
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual void visitClassDecl(const ClassDeclPtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual void visitExceptionEnd(const ExceptionPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual void visitStructEnd(const StructPtr&);
+        virtual void visitOperation(const OperationPtr&);
+        virtual void visitParamDecl(const ParamDeclPtr&);
+        virtual void visitDataMember(const DataMemberPtr&);
+        virtual void visitSequence(const SequencePtr&);
+        virtual void visitDictionary(const DictionaryPtr&);
+        virtual void visitEnum(const EnumPtr&);
+        virtual void visitConst(const ConstPtr&);
+
+    private:
+
+        void validate(const ContainedPtr&);
+
+        static Slice::StringList getMetaData(const ContainedPtr&);
+        static void modulePrefixError(const ModulePtr&, const std::string&);
+
+        static const std::string _objcPrefix; // "objc:"
+        static const std::string _msg; // "ignoring invalid metadata"
+
+        StringSet _history;
+    };
+
+
+    //
+    // Map of module scoped name to ModulePtr. Used to verify that objc:prefix metadata directives are consistent.
+    //
+
+    typedef std::map<std::string, ModulePrefix> ModuleMap;
+    static ModuleMap _modules;
+};
+
+}
+
+#endif
diff --git a/cpp/src/slice2php/.depend.mak b/cpp/src/slice2php/.depend.mak
deleted file mode 100755
index d3fe6d6ca23..00000000000
--- a/cpp/src/slice2php/.depend.mak
+++ /dev/null
@@ -1,42 +0,0 @@
-
-Main.obj: \
-	Main.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\IceUtil.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Cache.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Functional.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\IceUtil\InputUtil.h" \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\Slice\Checksum.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\Slice\Preprocessor.h" \
-    "$(includedir)\Slice\FileTracker.h" \
-    "$(includedir)\Slice\PHPUtil.h" \
-    "$(includedir)\Slice\Util.h" \
diff --git a/cpp/src/slice2php/.gitignore b/cpp/src/slice2php/.gitignore
deleted file mode 100644
index 720f44c7047..00000000000
--- a/cpp/src/slice2php/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-.depend
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index 9fcac53342c..a1689dc5c25 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -16,7 +16,7 @@
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
-#include <IceUtil/Unicode.h>
+#include <IceUtil/StringConverter.h>
 #include <Slice/Checksum.h>
 #include <Slice/Preprocessor.h>
 #include <Slice/FileTracker.h>
@@ -393,10 +393,10 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
         _out << nl << "return $proxy->ice_uncheckedCast('" << scoped << "', $facet);";
         _out << eb;
 
-	_out << sp << nl << "public static function ice_staticId()";
-	_out << sb;
-	_out << nl << "return '" << scoped << "';";
-	_out << eb;
+        _out << sp << nl << "public static function ice_staticId()";
+        _out << sb;
+        _out << nl << "return '" << scoped << "';";
+        _out << eb;
 
         _out << eb;
     }
@@ -685,11 +685,11 @@ CodeVisitor::visitExceptionStart(const ExceptionPtr& p)
     _out << eb;
 
     //
-    // ice_name
+    // ice_id
     //
-    _out << sp << nl << "public function ice_name()";
+    _out << sp << nl << "public function ice_id()";
     _out << sb;
-    _out << nl << "return '" << scoped.substr(2) << "';";
+    _out << nl << "return '" << scoped << "';";
     _out << eb;
 
     //
@@ -906,6 +906,7 @@ CodeVisitor::visitDictionary(const DictionaryPtr& p)
         case Slice::Builtin::KindObject:
         case Slice::Builtin::KindObjectProxy:
         case Slice::Builtin::KindLocalObject:
+        case Slice::Builtin::KindValue:
             assert(false);
         }
     }
@@ -1099,6 +1100,7 @@ CodeVisitor::writeType(const TypePtr& p)
                 break;
             }
             case Builtin::KindObject:
+            case Builtin::KindValue:
             {
                 _out << "$Ice__t_Object";
                 break;
@@ -1165,6 +1167,7 @@ CodeVisitor::writeDefaultValue(const DataMemberPtr& m)
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
             case Builtin::KindLocalObject:
+            case Builtin::KindValue:
             {
                 _out << "null";
                 break;
@@ -1324,23 +1327,7 @@ CodeVisitor::writeConstantValue(const TypePtr& type, const SyntaxTreeBasePtr& va
                             vector<unsigned int> u32buffer;
                             u32buffer.push_back(static_cast<unsigned int>(v));
 
-                            vector<unsigned char> u8buffer;
-
-                            IceUtilInternal::ConversionResult result = convertUTF32ToUTF8(u32buffer, u8buffer, IceUtil::lenientConversion);
-                            switch(result)
-                            {
-                                case conversionOK:
-                                    break;
-                                case sourceExhausted:
-                                    throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source exhausted");
-                                case sourceIllegal:
-                                    throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source illegal");
-                                default:
-                                {
-                                    assert(0);
-                                    throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
-                                }
-                            }
+                            vector<unsigned char> u8buffer = fromUTF32(u32buffer);
 
                             ostringstream s;
                             for(vector<unsigned char>::const_iterator q = u8buffer.begin(); q != u8buffer.end(); ++q)
@@ -1411,6 +1398,7 @@ CodeVisitor::writeConstantValue(const TypePtr& type, const SyntaxTreeBasePtr& va
             case Slice::Builtin::KindObject:
             case Slice::Builtin::KindObjectProxy:
             case Slice::Builtin::KindLocalObject:
+            case Slice::Builtin::KindValue:
                 assert(false);
             }
         }
diff --git a/cpp/src/slice2php/Makefile b/cpp/src/slice2php/Makefile
deleted file mode 100644
index 62f82531201..00000000000
--- a/cpp/src/slice2php/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-NAME		= $(bindir)/slice2php
-
-TARGETS		= $(NAME)
-
-OBJS		= Main.o
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I.. $(CPPFLAGS)
-
-$(NAME): $(OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK)
-
-install:: all
-	$(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/slice2php.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/slice2php/Makefile.mak b/cpp/src/slice2php/Makefile.mak
deleted file mode 100644
index 1218590c485..00000000000
--- a/cpp/src/slice2php/Makefile.mak
+++ /dev/null
@@ -1,49 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2php.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= .\Main.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-RES_FILE        = Slice2PHP.res
-
-$(NAME): $(OBJS) Slice2PHP.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \
-		$(BASELIBS) $(RES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2PHP.res
-
-install:: all
-	copy $(NAME) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(NAME:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/slice2php/Slice2PHP.rc b/cpp/src/slice2php/Slice2PHP.rc
index bcbe9d3048e..4a8bc4d206c 100644
--- a/cpp/src/slice2php/Slice2PHP.rc
+++ b/cpp/src/slice2php/Slice2PHP.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice to PHP Translator\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "slice2php\0"
             VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0"
             VALUE "OriginalFilename", "slice2php.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2php/msbuild/packages.config b/cpp/src/slice2php/msbuild/packages.config
new file mode 100644
index 00000000000..88735dc0077
--- /dev/null
+++ b/cpp/src/slice2php/msbuild/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" />
+  <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj b/cpp/src/slice2php/msbuild/slice2php.vcxproj
new file mode 100644
index 00000000000..ea9211ecdea
--- /dev/null
+++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{55A6E595-EFE4-47B9-957C-E4CFF2E75FD6}</ProjectGuid>
+    <RootNamespace>slice2php</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Slice2PHP.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj">
+      <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj">
+      <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" />
+    <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters b/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters
new file mode 100644
index 00000000000..62800ba8a81
--- /dev/null
+++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{6DBB9FCA-8076-4428-8191-6B32639CCE6E}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{27C87EFD-A010-4962-9D17-96608E653759}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{8E78EA1C-1E72-4133-9F98-C03CCB9B2868}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Slice2PHP.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/slice2py/.depend.mak b/cpp/src/slice2py/.depend.mak
deleted file mode 100755
index f3beb849c0f..00000000000
--- a/cpp/src/slice2py/.depend.mak
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Main.obj: \
-	Main.cpp \
-    "$(includedir)\Slice\PythonUtil.h" \
-    "$(includedir)\Slice\Parser.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\Slice\Util.h" \
diff --git a/cpp/src/slice2py/.gitignore b/cpp/src/slice2py/.gitignore
deleted file mode 100644
index 3a412ca89c7..00000000000
--- a/cpp/src/slice2py/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile
deleted file mode 100644
index 17c038be6f1..00000000000
--- a/cpp/src/slice2py/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-NAME		= $(bindir)/slice2py
-
-TARGETS		= $(NAME)
-
-OBJS		= Main.o
-
-RPATH_DIR	= $(LOADER_PATH)/../$(libsubdir)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. $(CPPFLAGS)
-
-$(NAME): $(OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK)
-
-install:: all
-	$(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
-	$(call installdata,$(top_srcdir)/../man/man1/slice2py.1,$(DESTDIR)$(install_mandir))
diff --git a/cpp/src/slice2py/Makefile.mak b/cpp/src/slice2py/Makefile.mak
deleted file mode 100644
index 3c691007f1a..00000000000
--- a/cpp/src/slice2py/Makefile.mak
+++ /dev/null
@@ -1,46 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2py.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= .\Main.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-RES_FILE        = Slice2Py.res
-
-$(NAME): $(OBJS) Slice2Py.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS) \
-		$(BASELIBS) $(RES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Py.res
-
-install:: all
-	copy $(NAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(NAME:.exe=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc
index 8be8601392a..3fd774d79f9 100644
--- a/cpp/src/slice2py/Slice2Py.rc
+++ b/cpp/src/slice2py/Slice2Py.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,3,0
- PRODUCTVERSION 3,6,3,0
+ FILEVERSION 3,7,52,0
+ PRODUCTVERSION 3,7,52,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Python Translator\0"
-            VALUE "FileVersion", "3.6.3\0"
+            VALUE "FileVersion", "3.7a2\0"
             VALUE "InternalName", "slice2py\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2016 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2py.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.3\0"
+            VALUE "ProductVersion", "3.7a2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2py/msbuild/packages.config b/cpp/src/slice2py/msbuild/packages.config
new file mode 100644
index 00000000000..88735dc0077
--- /dev/null
+++ b/cpp/src/slice2py/msbuild/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" />
+  <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj b/cpp/src/slice2py/msbuild/slice2py.vcxproj
new file mode 100644
index 00000000000..40ab0c9e81b
--- /dev/null
+++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{ACAF39D3-B4BD-426B-98DE-D95944B0D3F6}</ProjectGuid>
+    <RootNamespace>slice2py</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Slice2Py.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj">
+      <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj">
+      <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" />
+    <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters b/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters
new file mode 100644
index 00000000000..eb750eda368
--- /dev/null
+++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{47F3A182-A9BF-4F97-9FCA-5E589023804E}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{696A80CE-5F76-4E59-AE7F-FFBFB029D4B9}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{CD1D3DC3-DAD5-45AC-A584-9C90DB426C23}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Slice2Py.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp
new file mode 100644
index 00000000000..8c38a8bd60b
--- /dev/null
+++ b/cpp/src/slice2rb/Main.cpp
@@ -0,0 +1,44 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Slice/RubyUtil.h>
+#include <Slice/Util.h>
+
+using namespace std;
+using namespace Slice;
+using namespace Slice::Ruby;
+
+int
+main(int argc, char* argv[])
+{
+    try
+    {
+        return Slice::Ruby::compile(argc, argv);
+    }
+    catch(const std::exception& ex)
+    {
+        getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
+        return EXIT_FAILURE;
+    }
+    catch(const std::string& msg)
+    {
+        getErrorStream() << argv[0] << ": error:" << msg << endl;
+        return EXIT_FAILURE;
+    }
+    catch(const char* msg)
+    {
+        getErrorStream() << argv[0] << ": error:" << msg << endl;
+        return EXIT_FAILURE;
+    }
+    catch(...)
+    {
+        getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
+        return EXIT_FAILURE;
+    }
+}